1564 files changed, 260 insertions, 204957 deletions

diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml
index 700f0e45729..d9282e0f915 100755
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.papyrus.diagramgen.feature"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="2.0.2">
@@ -19,7 +19,54 @@
       %license
    </license>
 
-   <includes id="org.eclipse.papyrus.gmf.tooling.feature" version="0.0.0"/>
+   <plugin
+         id="org.eclipse.papyrus.gmf.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.gmf.codegen"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.gmf.codegen.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.gmf.codegen.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.gmf.validate"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.gmf.codegen.xtend"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.papyrus.gmf.codegen.xtend.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
    <plugin
          id="org.eclipse.papyrus.codegen"
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/pom.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/pom.xml
index 1a6297639bd..2c1872b370f 100755
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/pom.xml
+++ b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.diagramgen.feature/pom.xml
@@ -8,8 +8,7 @@
 	    <version>0.0.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.papyrus.diagramgen.feature</artifactId>
-	<groupId>org.eclipse.papyrus</groupId>
-	<version>1.1.0-SNAPSHOT</version>
+	<version>1.2.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 
 </project>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/.project b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/.project
deleted file mode 100644
index b3da1714ab9..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.tooling.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/build.properties b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/build.properties
deleted file mode 100644
index 29c24acd26d..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2008 Borland Software Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties,\
-               eclipse_update_120.jpg,\
-               license.html,\
-               epl-v20.html
-root=file:rootfiles/epl-v20.html,file:rootfiles/notice.html
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/eclipse_update_120.jpg b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e0248e6..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/epl-v20.html b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/epl-v20.html
deleted file mode 100644
index 626fd4a626d..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/epl-v20.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    
-    <title>Eclipse Public License - Version 2.0</title>
-    <style type="text/css">
-      body {
-        margin: 1.5em 3em;
-      }
-      h1{
-        font-size:1.5em;
-      }
-      h2{
-        font-size:1em;
-        margin-bottom:0.5em;
-        margin-top:1em;
-      }
-      p {
-        margin-top:  0.5em;
-        margin-bottom: 0.5em;
-      }
-      ul, ol{
-        list-style-type:none;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>Eclipse Public License - v 2.0</h1>
-    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-      PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION
-      OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-    </p>
-    <h2 id="definitions">1. DEFINITIONS</h2>
-    <p>“Contribution” means:</p>
-    <ul>
-      <li>a) in the case of the initial Contributor, the initial content
-        Distributed under this Agreement, and
-      </li>
-      <li>
-        b) in the case of each subsequent Contributor:
-        <ul>
-          <li>i) changes to the Program, and</li>
-          <li>ii) additions to the Program;</li>
-        </ul>
-        where such changes and/or additions to the Program originate from
-        and are Distributed by that particular Contributor. A Contribution
-        “originates” from a Contributor if it was added to the Program by such
-        Contributor itself or anyone acting on such Contributor's behalf.
-        Contributions do not include changes or additions to the Program that
-        are not Modified Works.
-      </li>
-    </ul>
-    <p>“Contributor” means any person or entity that Distributes the Program.</p>
-    <p>“Licensed Patents” mean patent claims licensable by a Contributor which
-      are necessarily infringed by the use or sale of its Contribution alone
-      or when combined with the Program.
-    </p>
-    <p>“Program” means the Contributions Distributed in accordance with this
-      Agreement.
-    </p>
-    <p>“Recipient” means anyone who receives the Program under this Agreement
-      or any Secondary License (as applicable), including Contributors.
-    </p>
-    <p>“Derivative Works” shall mean any work, whether in Source Code or other
-      form, that is based on (or derived from) the Program and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship.
-    </p>
-    <p>“Modified Works” shall mean any work in Source Code or other form that
-      results from an addition to, deletion from, or modification of the
-      contents of the Program, including, for purposes of clarity any new file
-      in Source Code form that contains any contents of the Program. Modified
-      Works shall not include works that contain only declarations, interfaces,
-      types, classes, structures, or files of the Program solely in each case
-      in order to link to, bind by name, or subclass the Program or Modified
-      Works thereof.
-    </p>
-    <p>“Distribute” means the acts of a) distributing or b) making available
-      in any manner that enables the transfer of a copy.
-    </p>
-    <p>“Source Code” means the form of a Program preferred for making
-      modifications, including but not limited to software source code,
-      documentation source, and configuration files.
-    </p>
-    <p>“Secondary License” means either the GNU General Public License,
-      Version 2.0, or any later versions of that license, including any
-      exceptions or additional permissions as identified by the initial
-      Contributor.
-    </p>
-    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
-    <ul>
-      <li>a) Subject to the terms of this Agreement, each Contributor hereby
-        grants Recipient a non-exclusive, worldwide, royalty-free copyright
-        license to reproduce, prepare Derivative Works of, publicly display,
-        publicly perform, Distribute and sublicense the Contribution of such
-        Contributor, if any, and such Derivative Works.
-      </li>
-      <li>b) Subject to the terms of this Agreement, each Contributor hereby
-        grants Recipient a non-exclusive, worldwide, royalty-free patent
-        license under Licensed Patents to make, use, sell, offer to sell,
-        import and otherwise transfer the Contribution of such Contributor,
-        if any, in Source Code or other form. This patent license shall
-        apply to the combination of the Contribution and the Program if,
-        at the time the Contribution is added by the Contributor, such
-        addition of the Contribution causes such combination to be covered
-        by the Licensed Patents. The patent license shall not apply to any
-        other combinations which include the Contribution. No hardware per
-        se is licensed hereunder.
-      </li>
-      <li>c) Recipient understands that although each Contributor grants the
-        licenses to its Contributions set forth herein, no assurances are
-        provided by any Contributor that the Program does not infringe the
-        patent or other intellectual property rights of any other entity.
-        Each Contributor disclaims any liability to Recipient for claims
-        brought by any other entity based on infringement of intellectual
-        property rights or otherwise. As a condition to exercising the rights
-        and licenses granted hereunder, each Recipient hereby assumes sole
-        responsibility to secure any other intellectual property rights needed,
-        if any. For example, if a third party patent license is required to
-        allow Recipient to Distribute the Program, it is Recipient's
-        responsibility to acquire that license before distributing the Program.
-      </li>
-      <li>d) Each Contributor represents that to its knowledge it has sufficient
-        copyright rights in its Contribution, if any, to grant the copyright
-        license set forth in this Agreement.
-      </li>
-      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
-        makes additional grants to any Recipient (other than those set forth
-        in this Agreement) as a result of such Recipient's receipt of the
-        Program under the terms of a Secondary License (if permitted under
-        the terms of Section 3).
-      </li>
-    </ul>
-    <h2 id="requirements">3. REQUIREMENTS</h2>
-    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
-    <ul>
-      <li>a) the Program must also be made available as Source Code, in
-        accordance with section 3.2, and the Contributor must accompany
-        the Program with a statement that the Source Code for the Program
-        is available under this Agreement, and informs Recipients how to
-        obtain it in a reasonable manner on or through a medium customarily
-        used for software exchange; and
-      </li>
-      <li>
-        b) the Contributor may Distribute the Program under a license
-        different than this Agreement, provided that such license:
-        <ul>
-          <li>i) effectively disclaims on behalf of all other Contributors all
-            warranties and conditions, express and implied, including warranties
-            or conditions of title and non-infringement, and implied warranties
-            or conditions of merchantability and fitness for a particular purpose;
-          </li>
-          <li>ii) effectively excludes on behalf of all other Contributors all
-            liability for damages, including direct, indirect, special, incidental
-            and consequential damages, such as lost profits;
-          </li>
-          <li>iii) does not attempt to limit or alter the recipients' rights in the
-            Source Code under section 3.2; and
-          </li>
-          <li>iv) requires any subsequent distribution of the Program by any party
-            to be under a license that satisfies the requirements of this section 3.
-          </li>
-        </ul>
-      </li>
-    </ul>
-    <p>3.2 When the Program is Distributed as Source Code:</p>
-    <ul>
-      <li>a) it must be made available under this Agreement, or if the Program (i)
-        is combined with other material in a separate file or files made available
-        under a Secondary License, and (ii) the initial Contributor attached to
-        the Source Code the notice described in Exhibit A of this Agreement,
-        then the Program may be made available under the terms of such
-        Secondary Licenses, and
-      </li>
-      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
-    </ul>
-    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
-      attribution notices, disclaimers of warranty, or limitations of liability
-      (‘notices’) contained within the Program from any copy of the Program which
-      they Distribute, provided that Contributors may add their own appropriate
-      notices.
-    </p>
-    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
-    <p>Commercial distributors of software may accept certain responsibilities
-      with respect to end users, business partners and the like. While this
-      license is intended to facilitate the commercial use of the Program, the
-      Contributor who includes the Program in a commercial product offering should
-      do so in a manner which does not create potential liability for other
-      Contributors. Therefore, if a Contributor includes the Program in a
-      commercial product offering, such Contributor (“Commercial Contributor”)
-      hereby agrees to defend and indemnify every other Contributor
-      (“Indemnified Contributor”) against any losses, damages and costs
-      (collectively “Losses”) arising from claims, lawsuits and other legal actions
-      brought by a third party against the Indemnified Contributor to the extent
-      caused by the acts or omissions of such Commercial Contributor in connection
-      with its distribution of the Program in a commercial product offering.
-      The obligations in this section do not apply to any claims or Losses relating
-      to any actual or alleged intellectual property infringement. In order to
-      qualify, an Indemnified Contributor must: a) promptly notify the
-      Commercial Contributor in writing of such claim, and b) allow the Commercial
-      Contributor to control, and cooperate with the Commercial Contributor in,
-      the defense and any related settlement negotiations. The Indemnified
-      Contributor may participate in any such claim at its own expense.
-    </p>
-    <p>For example, a Contributor might include the Program
-      in a commercial product offering, Product X. That Contributor is then a
-      Commercial Contributor. If that Commercial Contributor then makes performance
-      claims, or offers warranties related to Product X, those performance claims
-      and warranties are such Commercial Contributor's responsibility alone.
-      Under this section, the Commercial Contributor would have to defend claims
-      against the other Contributors related to those performance claims and
-      warranties, and if a court requires any other Contributor to pay any damages
-      as a result, the Commercial Contributor must pay those damages.
-    </p>
-    <h2 id="warranty">5. NO WARRANTY</h2>
-    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
-      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT
-      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
-      solely responsible for determining the appropriateness of using and
-      distributing the Program and assumes all risks associated with its
-      exercise of rights under this Agreement, including but not limited to the
-      risks and costs of program errors, compliance with applicable laws, damage
-      to or loss of data, programs or equipment, and unavailability or
-      interruption of operations.
-    </p>
-    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
-    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
-      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
-      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-    </p>
-    <h2 id="general">7. GENERAL</h2>
-    <p>If any provision of this Agreement is invalid or unenforceable under
-      applicable law, it shall not affect the validity or enforceability of the
-      remainder of the terms of this Agreement, and without further action by the
-      parties hereto, such provision shall be reformed to the minimum extent
-      necessary to make such provision valid and enforceable.
-    </p>
-    <p>If Recipient institutes patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-      (excluding combinations of the Program with other software or hardware)
-      infringes such Recipient's patent(s), then such Recipient's rights granted
-      under Section 2(b) shall terminate as of the date such litigation is filed.
-    </p>
-    <p>All Recipient's rights under this Agreement shall terminate if it fails to
-      comply with any of the material terms or conditions of this Agreement and
-      does not cure such failure in a reasonable period of time after becoming
-      aware of such noncompliance. If all Recipient's rights under this Agreement
-      terminate, Recipient agrees to cease use and distribution of the Program
-      as soon as reasonably practicable. However, Recipient's obligations under
-      this Agreement and any licenses granted by Recipient relating to the
-      Program shall continue and survive.
-    </p>
-    <p>Everyone is permitted to copy and distribute copies of this Agreement,
-      but in order to avoid inconsistency the Agreement is copyrighted and may
-      only be modified in the following manner. The Agreement Steward reserves
-      the right to publish new versions (including revisions) of this Agreement
-      from time to time. No one other than the Agreement Steward has the right
-      to modify this Agreement. The Eclipse Foundation is the initial Agreement
-      Steward. The Eclipse Foundation may assign the responsibility to serve as
-      the Agreement Steward to a suitable separate entity. Each new version of
-      the Agreement will be given a distinguishing version number. The Program
-      (including Contributions) may always be Distributed subject to the version
-      of the Agreement under which it was received. In addition, after a new
-      version of the Agreement is published, Contributor may elect to Distribute
-      the Program (including its Contributions) under the new version.
-    </p>
-    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-      receives no rights or licenses to the intellectual property of any
-      Contributor under this Agreement, whether expressly, by implication,
-      estoppel or otherwise. All rights in the Program not expressly granted
-      under this Agreement are reserved. Nothing in this Agreement is intended
-      to be enforceable by any entity that is not a Contributor or Recipient.
-      No third-party beneficiary rights are created under this Agreement.
-    </p>
-    <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2>
-    <p>“This Source Code may also be made available under the following 
-    	Secondary Licenses when the conditions for such availability set forth 
-    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    	version(s), and exceptions or additional permissions here}.”
-    </p>
-    <blockquote>
-      <p>Simply including a copy of this Agreement, including this Exhibit A
-        is not sufficient to license the Source Code under Secondary Licenses.
-      </p>
-      <p>If it is not possible or desirable to put the notice in a particular file,
-        then You may include the notice in a location (such as a LICENSE file in a
-        relevant directory) where a recipient would be likely to look for
-        such a notice.
-      </p>
-      <p>You may add additional accurate notices of copyright ownership.</p>
-    </blockquote>
-  
-</body></html>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/feature.properties b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/feature.properties
deleted file mode 100644
index 1435f3578dd..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/feature.properties
+++ /dev/null
@@ -1,159 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 IBM Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Papyrus - Graphical Modeling Framework (GMF) Tooling
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Papyrus Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=The Graphical Modeling Framework Tooling is a set of highly-productive tools to generate a diagram \
-editor by defining figures and mapping them to semantic elements. The generation is highly customizable, and \
-generates code that relies on GMF Runtime APIs.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-November 22, 2017\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v20.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-\t- Content may be structured and packaged into modules to facilitate delivering,\n\
-\t  extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-\t  plug-in fragments ("Fragments"), and features ("Features").\n\
-\t- Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-\t  in a directory named "plugins".\n\
-\t- A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-\t  Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-\t  Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-\t  numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-\t- Features may also include other Features ("Included Features"). Within a Feature, files\n\
-\t  named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-\t- The top-level (root) directory\n\
-\t- Plug-in and Fragment directories\n\
-\t- Inside Plug-ins and Fragments packaged as JARs\n\
-\t- Sub-directories of the directory named "src" of certain Plug-ins\n\
-\t- Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-\t- Eclipse Public License Version 2.0 (available at http://www.eclipse.org/legal/epl-v20.html)\n\
-\t- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-\t- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-\t- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-\t- Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-\t1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-\t   the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-\t   extending or updating the functionality of an Eclipse-based product.\n\
-\t2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-\t   Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-\t3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-\t   govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-\t   Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-\t   with the Specification. Such Installable Software Agreement must inform the user of the\n\
-\t   terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-\t   the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-\t   indication of agreement by the user, the provisioning Technology will complete installation\n\
-\t   of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
-
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/feature.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/feature.xml
deleted file mode 100644
index c429e335d47..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/feature.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.papyrus.gmf.tooling.feature"
-      label="%featureName"
-      version="3.3.0.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg">
-
-   <description url="http://www.eclipse.org/papyrus/gmf-tooling/">
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v20.html">
-      Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v2.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v20.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.common.ui" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen.ecore" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.swt" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.forms" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.core" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jface" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.jdt.ui" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.xpand" version="2.1.0" match="compatible"/>
-      <import plugin="org.eclipse.core.runtime" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.core.resources" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.4.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen.ecore" version="2.4.0" match="compatible"/>
-      <import plugin="org.eclipse.draw2d" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.common" version="1.2.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.validate" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.m2m.qvt.oml" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.codegen" version="2.9.0"/>
-      <import plugin="org.eclipse.emf.edit" version="2.4.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.xmi" version="2.4.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.4.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.codegen.ecore.ui" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.bridge" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.bridge.ui.dashboard" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.codegen.edit" version="2.9.0"/>
-      <import plugin="org.eclipse.papyrus.gmf.graphdef.codegen.ui" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.importer" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.bridge.ui" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.common" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.graphdef" version="2.9.0"/>
-      <import plugin="org.eclipse.papyrus.gmf.tooldef" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.map" version="2.9.0"/>
-      <import plugin="org.eclipse.papyrus.gmf.graphdef.edit" version="2.9.0"/>
-      <import plugin="org.eclipse.papyrus.gmf.tooldef.edit" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.edit" version="2.4.0" match="compatible"/>
-      <import plugin="org.eclipse.gmf.runtime.notation" version="1.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.graphdef.codegen" version="2.9.0"/>
-      <import plugin="org.eclipse.emf.common" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.edit" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.graphdef.edit" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.map.edit" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.m2m.qvt.oml.runtime" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore.editor" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.codegen.edit" version="2.0.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.pde.ui" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.pde.core" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.edit.ui" version="2.3.0" match="compatible"/>
-      <import plugin="org.eclipse.emf.validation" version="1.1.0" match="compatible"/>
-      <import plugin="org.eclipse.ocl.ecore" version="3.0.0" match="compatible"/>
-      <import plugin="org.eclipse.core.expressions"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.gef"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.core"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.commands.core"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.ui.properties"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.printing.render"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.printing"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.properties"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.providers"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.providers.ide"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.render"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.resources.editor"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide"/>
-      <import plugin="org.eclipse.gmf.runtime.draw2d.ui"/>
-      <import plugin="org.eclipse.ui.navigator.resources"/>
-      <import plugin="org.eclipse.emf.ecore" version="2.2.0" match="compatible"/>
-      <import plugin="org.eclipse.m2m.qvt.oml.common" version="3.4.0" match="compatible"/>
-      <import plugin="org.eclipse.m2m.qvt.oml.project" version="3.3.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.xpand.qvtlibrary" version="1.0.0" match="compatible"/>
-      <import plugin="lpg.runtime.java" version="2.0.17" match="compatible"/>
-      <import plugin="org.eclipse.ui" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.jface.text" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.editors" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.views" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.ui.ide" version="3.2.0" match="compatible"/>
-      <import plugin="org.eclipse.papyrus.gmf.codegen" version="2.2.0" match="compatible"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.codegen"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.codegen.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.codegen.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.graphdef"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.graphdef.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.map"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.map.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.bridge"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.bridge.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.bridge.ui.dashboard"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.graphdef.codegen"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.graphdef.codegen.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.tooldef"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.tooldef.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.validate"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.xpand"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.xpand.qvtlibrary"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.bridge.trace"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.codegen.xtend"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.papyrus.gmf.codegen.xtend.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/license.html b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/license.html
deleted file mode 100644
index d42ef9c4ab6..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/license.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0045)https://www.eclipse.org/legal/epl/notice.html -->
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-	<h2>Eclipse Foundation Software User Agreement</h2>
-	<p>November 22, 2017</p>
-
-	<h3>Usage Of Content</h3>
-
-	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-		(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY
-		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-		USE THE CONTENT.</p>
-
-	<h3>Applicable Licenses</h3>
-
-	<p>
-		Unless otherwise indicated, all Content made available by the Eclipse
-		Foundation is provided to you under the terms and conditions of the
-		Eclipse Public License Version 2.0 ("EPL"). A copy of the
-		EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, "Program" will mean the Content.
-	</p>
-
-	<p>Content includes, but is not limited to, source code, object
-		code, documentation and other files maintained in the Eclipse
-		Foundation source code repository ("Repository") in software
-		modules ("Modules") and made available as downloadable
-		archives ("Downloads").</p>
-
-	<ul>
-		<li>Content may be structured and packaged into modules to
-			facilitate delivering, extending, and upgrading the Content. Typical
-			modules may include plug-ins ("Plug-ins"), plug-in
-			fragments ("Fragments"), and features
-			("Features").</li>
-		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-			or JAR (Java� ARchive) in a directory named
-			"plugins".</li>
-		<li>A Feature is a bundle of one or more Plug-ins and/or
-			Fragments and associated material. Each Feature may be packaged as a
-			sub-directory in a directory named "features". Within a
-			Feature, files named "feature.xml" may contain a list of
-			the names and version numbers of the Plug-ins and/or Fragments
-			associated with that Feature.</li>
-		<li>Features may also include other Features ("Included
-			Features"). Within a Feature, files named
-			"feature.xml" may contain a list of the names and version
-			numbers of Included Features.</li>
-	</ul>
-
-	<p>The terms and conditions governing Plug-ins and Fragments should
-		be contained in files named "about.html"
-		("Abouts"). The terms and conditions governing Features and
-		Included Features should be contained in files named
-		"license.html" ("Feature Licenses"). Abouts and
-		Feature Licenses may be located in any directory of a Download or
-		Module including, but not limited to the following locations:</p>
-
-	<ul>
-		<li>The top-level (root) directory</li>
-		<li>Plug-in and Fragment directories</li>
-		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-		<li>Sub-directories of the directory named "src" of
-			certain Plug-ins</li>
-		<li>Feature directories</li>
-	</ul>
-
-	<p>Note: if a Feature made available by the Eclipse Foundation is
-		installed using the Provisioning Technology (as defined below), you
-		must agree to a license ("Feature Update License") during
-		the installation process. If the Feature contains Included Features,
-		the Feature Update License should either provide you with the terms
-		and conditions governing the Included Features or inform you where you
-		can locate them. Feature Update Licenses may be found in the
-		"license" property of files named
-		"feature.properties" found within a Feature. Such Abouts,
-		Feature Licenses, and Feature Update Licenses contain the terms and
-		conditions (or references to such terms and conditions) that govern
-		your use of the associated Content in that directory.</p>
-
-	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-		ARE NOT LIMITED TO):</p>
-
-	<ul>
-		<li>Eclipse Public License Version 2.0 (available at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>)
-		</li>
-		<li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
-		</li>
-		<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
-		</li>
-		<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
-		</li>
-		<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
-		</li>
-		<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
-		</li>
-	</ul>
-
-	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
-		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
-		or Feature Update License is provided, please contact the Eclipse
-		Foundation to determine what terms and conditions govern that
-		particular Content.</p>
-
-
-	<h3>Use of Provisioning Technology</h3>
-
-	<p>
-		The Eclipse Foundation makes available provisioning software, examples
-		of which include, but are not limited to, p2 and the Eclipse Update
-		Manager ("Provisioning Technology") for the purpose of
-		allowing users to install software, documentation, information and/or
-		other materials (collectively "Installable Software"). This
-		capability is provided with the intent of allowing such users to
-		install, extend and update Eclipse-based products. Information about
-		packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-		("Specification").
-	</p>
-
-	<p>You may use Provisioning Technology to allow other parties to
-		install Installable Software. You shall be responsible for enabling
-		the applicable license agreements relating to the Installable Software
-		to be presented to, and accepted by, the users of the Provisioning
-		Technology in accordance with the Specification. By using Provisioning
-		Technology in such a manner and making it available in accordance with
-		the Specification, you further acknowledge your agreement to, and the
-		acquisition of all necessary rights to permit the following:</p>
-
-	<ol>
-		<li>A series of actions may occur ("Provisioning
-			Process") in which a user may execute the Provisioning
-			Technology on a machine ("Target Machine") with the intent
-			of installing, extending or updating the functionality of an
-			Eclipse-based product.</li>
-		<li>During the Provisioning Process, the Provisioning Technology
-			may cause third party Installable Software or a portion thereof to be
-			accessed and copied to the Target Machine.</li>
-		<li>Pursuant to the Specification, you will provide to the user
-			the terms and conditions that govern the use of the Installable
-			Software ("Installable Software Agreement") and such
-			Installable Software Agreement shall be accessed from the Target
-			Machine in accordance with the Specification. Such Installable
-			Software Agreement must inform the user of the terms and conditions
-			that govern the Installable Software and must solicit acceptance by
-			the end user in the manner prescribed in such Installable Software
-			Agreement. Upon such indication of agreement by the user, the
-			provisioning Technology will complete installation of the Installable
-			Software.</li>
-	</ol>
-
-	<h3>Cryptography</h3>
-
-	<p>Content may contain encryption software. The country in which
-		you are currently may have restrictions on the import, possession, and
-		use, and/or re-export to another country, of encryption software.
-		BEFORE using any encryption software, please check the country's laws,
-		regulations and policies concerning the import, possession, or use,
-		and re-export of encryption software, to see if this is permitted.</p>
-
-	<p>
-		<small>Java and all Java-based trademarks are trademarks of
-			Oracle Corporation in the United States, other countries, or both.</small>
-	</p>
-
-
-</body></html>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/pom.xml b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/pom.xml
deleted file mode 100644
index 064d8b7b8e9..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- * Copyright (c) 2011 PetalsLink
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License v2.0
- *  which accompanies this distribution, and is available at
- *  http://www.eclipse.org/legal/epl-v20.html
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  
-  <parent>
-  	<groupId>org.eclipse.papyrus</groupId>
-	<artifactId>org.eclipse.papyrus.toolsmiths.features</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
-  </parent>
-  
-  <artifactId>org.eclipse.papyrus.gmf.tooling.feature</artifactId>
-  <groupId>org.eclipse.papyrus</groupId>
-  <version>3.3.0-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-  
-
-</project>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/rootfiles/epl-v20.html b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/rootfiles/epl-v20.html
deleted file mode 100644
index 626fd4a626d..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/rootfiles/epl-v20.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    
-    <title>Eclipse Public License - Version 2.0</title>
-    <style type="text/css">
-      body {
-        margin: 1.5em 3em;
-      }
-      h1{
-        font-size:1.5em;
-      }
-      h2{
-        font-size:1em;
-        margin-bottom:0.5em;
-        margin-top:1em;
-      }
-      p {
-        margin-top:  0.5em;
-        margin-bottom: 0.5em;
-      }
-      ul, ol{
-        list-style-type:none;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>Eclipse Public License - v 2.0</h1>
-    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-      PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION
-      OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-    </p>
-    <h2 id="definitions">1. DEFINITIONS</h2>
-    <p>“Contribution” means:</p>
-    <ul>
-      <li>a) in the case of the initial Contributor, the initial content
-        Distributed under this Agreement, and
-      </li>
-      <li>
-        b) in the case of each subsequent Contributor:
-        <ul>
-          <li>i) changes to the Program, and</li>
-          <li>ii) additions to the Program;</li>
-        </ul>
-        where such changes and/or additions to the Program originate from
-        and are Distributed by that particular Contributor. A Contribution
-        “originates” from a Contributor if it was added to the Program by such
-        Contributor itself or anyone acting on such Contributor's behalf.
-        Contributions do not include changes or additions to the Program that
-        are not Modified Works.
-      </li>
-    </ul>
-    <p>“Contributor” means any person or entity that Distributes the Program.</p>
-    <p>“Licensed Patents” mean patent claims licensable by a Contributor which
-      are necessarily infringed by the use or sale of its Contribution alone
-      or when combined with the Program.
-    </p>
-    <p>“Program” means the Contributions Distributed in accordance with this
-      Agreement.
-    </p>
-    <p>“Recipient” means anyone who receives the Program under this Agreement
-      or any Secondary License (as applicable), including Contributors.
-    </p>
-    <p>“Derivative Works” shall mean any work, whether in Source Code or other
-      form, that is based on (or derived from) the Program and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship.
-    </p>
-    <p>“Modified Works” shall mean any work in Source Code or other form that
-      results from an addition to, deletion from, or modification of the
-      contents of the Program, including, for purposes of clarity any new file
-      in Source Code form that contains any contents of the Program. Modified
-      Works shall not include works that contain only declarations, interfaces,
-      types, classes, structures, or files of the Program solely in each case
-      in order to link to, bind by name, or subclass the Program or Modified
-      Works thereof.
-    </p>
-    <p>“Distribute” means the acts of a) distributing or b) making available
-      in any manner that enables the transfer of a copy.
-    </p>
-    <p>“Source Code” means the form of a Program preferred for making
-      modifications, including but not limited to software source code,
-      documentation source, and configuration files.
-    </p>
-    <p>“Secondary License” means either the GNU General Public License,
-      Version 2.0, or any later versions of that license, including any
-      exceptions or additional permissions as identified by the initial
-      Contributor.
-    </p>
-    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
-    <ul>
-      <li>a) Subject to the terms of this Agreement, each Contributor hereby
-        grants Recipient a non-exclusive, worldwide, royalty-free copyright
-        license to reproduce, prepare Derivative Works of, publicly display,
-        publicly perform, Distribute and sublicense the Contribution of such
-        Contributor, if any, and such Derivative Works.
-      </li>
-      <li>b) Subject to the terms of this Agreement, each Contributor hereby
-        grants Recipient a non-exclusive, worldwide, royalty-free patent
-        license under Licensed Patents to make, use, sell, offer to sell,
-        import and otherwise transfer the Contribution of such Contributor,
-        if any, in Source Code or other form. This patent license shall
-        apply to the combination of the Contribution and the Program if,
-        at the time the Contribution is added by the Contributor, such
-        addition of the Contribution causes such combination to be covered
-        by the Licensed Patents. The patent license shall not apply to any
-        other combinations which include the Contribution. No hardware per
-        se is licensed hereunder.
-      </li>
-      <li>c) Recipient understands that although each Contributor grants the
-        licenses to its Contributions set forth herein, no assurances are
-        provided by any Contributor that the Program does not infringe the
-        patent or other intellectual property rights of any other entity.
-        Each Contributor disclaims any liability to Recipient for claims
-        brought by any other entity based on infringement of intellectual
-        property rights or otherwise. As a condition to exercising the rights
-        and licenses granted hereunder, each Recipient hereby assumes sole
-        responsibility to secure any other intellectual property rights needed,
-        if any. For example, if a third party patent license is required to
-        allow Recipient to Distribute the Program, it is Recipient's
-        responsibility to acquire that license before distributing the Program.
-      </li>
-      <li>d) Each Contributor represents that to its knowledge it has sufficient
-        copyright rights in its Contribution, if any, to grant the copyright
-        license set forth in this Agreement.
-      </li>
-      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
-        makes additional grants to any Recipient (other than those set forth
-        in this Agreement) as a result of such Recipient's receipt of the
-        Program under the terms of a Secondary License (if permitted under
-        the terms of Section 3).
-      </li>
-    </ul>
-    <h2 id="requirements">3. REQUIREMENTS</h2>
-    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
-    <ul>
-      <li>a) the Program must also be made available as Source Code, in
-        accordance with section 3.2, and the Contributor must accompany
-        the Program with a statement that the Source Code for the Program
-        is available under this Agreement, and informs Recipients how to
-        obtain it in a reasonable manner on or through a medium customarily
-        used for software exchange; and
-      </li>
-      <li>
-        b) the Contributor may Distribute the Program under a license
-        different than this Agreement, provided that such license:
-        <ul>
-          <li>i) effectively disclaims on behalf of all other Contributors all
-            warranties and conditions, express and implied, including warranties
-            or conditions of title and non-infringement, and implied warranties
-            or conditions of merchantability and fitness for a particular purpose;
-          </li>
-          <li>ii) effectively excludes on behalf of all other Contributors all
-            liability for damages, including direct, indirect, special, incidental
-            and consequential damages, such as lost profits;
-          </li>
-          <li>iii) does not attempt to limit or alter the recipients' rights in the
-            Source Code under section 3.2; and
-          </li>
-          <li>iv) requires any subsequent distribution of the Program by any party
-            to be under a license that satisfies the requirements of this section 3.
-          </li>
-        </ul>
-      </li>
-    </ul>
-    <p>3.2 When the Program is Distributed as Source Code:</p>
-    <ul>
-      <li>a) it must be made available under this Agreement, or if the Program (i)
-        is combined with other material in a separate file or files made available
-        under a Secondary License, and (ii) the initial Contributor attached to
-        the Source Code the notice described in Exhibit A of this Agreement,
-        then the Program may be made available under the terms of such
-        Secondary Licenses, and
-      </li>
-      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
-    </ul>
-    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
-      attribution notices, disclaimers of warranty, or limitations of liability
-      (‘notices’) contained within the Program from any copy of the Program which
-      they Distribute, provided that Contributors may add their own appropriate
-      notices.
-    </p>
-    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
-    <p>Commercial distributors of software may accept certain responsibilities
-      with respect to end users, business partners and the like. While this
-      license is intended to facilitate the commercial use of the Program, the
-      Contributor who includes the Program in a commercial product offering should
-      do so in a manner which does not create potential liability for other
-      Contributors. Therefore, if a Contributor includes the Program in a
-      commercial product offering, such Contributor (“Commercial Contributor”)
-      hereby agrees to defend and indemnify every other Contributor
-      (“Indemnified Contributor”) against any losses, damages and costs
-      (collectively “Losses”) arising from claims, lawsuits and other legal actions
-      brought by a third party against the Indemnified Contributor to the extent
-      caused by the acts or omissions of such Commercial Contributor in connection
-      with its distribution of the Program in a commercial product offering.
-      The obligations in this section do not apply to any claims or Losses relating
-      to any actual or alleged intellectual property infringement. In order to
-      qualify, an Indemnified Contributor must: a) promptly notify the
-      Commercial Contributor in writing of such claim, and b) allow the Commercial
-      Contributor to control, and cooperate with the Commercial Contributor in,
-      the defense and any related settlement negotiations. The Indemnified
-      Contributor may participate in any such claim at its own expense.
-    </p>
-    <p>For example, a Contributor might include the Program
-      in a commercial product offering, Product X. That Contributor is then a
-      Commercial Contributor. If that Commercial Contributor then makes performance
-      claims, or offers warranties related to Product X, those performance claims
-      and warranties are such Commercial Contributor's responsibility alone.
-      Under this section, the Commercial Contributor would have to defend claims
-      against the other Contributors related to those performance claims and
-      warranties, and if a court requires any other Contributor to pay any damages
-      as a result, the Commercial Contributor must pay those damages.
-    </p>
-    <h2 id="warranty">5. NO WARRANTY</h2>
-    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
-      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT
-      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
-      solely responsible for determining the appropriateness of using and
-      distributing the Program and assumes all risks associated with its
-      exercise of rights under this Agreement, including but not limited to the
-      risks and costs of program errors, compliance with applicable laws, damage
-      to or loss of data, programs or equipment, and unavailability or
-      interruption of operations.
-    </p>
-    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
-    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
-      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
-      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-    </p>
-    <h2 id="general">7. GENERAL</h2>
-    <p>If any provision of this Agreement is invalid or unenforceable under
-      applicable law, it shall not affect the validity or enforceability of the
-      remainder of the terms of this Agreement, and without further action by the
-      parties hereto, such provision shall be reformed to the minimum extent
-      necessary to make such provision valid and enforceable.
-    </p>
-    <p>If Recipient institutes patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-      (excluding combinations of the Program with other software or hardware)
-      infringes such Recipient's patent(s), then such Recipient's rights granted
-      under Section 2(b) shall terminate as of the date such litigation is filed.
-    </p>
-    <p>All Recipient's rights under this Agreement shall terminate if it fails to
-      comply with any of the material terms or conditions of this Agreement and
-      does not cure such failure in a reasonable period of time after becoming
-      aware of such noncompliance. If all Recipient's rights under this Agreement
-      terminate, Recipient agrees to cease use and distribution of the Program
-      as soon as reasonably practicable. However, Recipient's obligations under
-      this Agreement and any licenses granted by Recipient relating to the
-      Program shall continue and survive.
-    </p>
-    <p>Everyone is permitted to copy and distribute copies of this Agreement,
-      but in order to avoid inconsistency the Agreement is copyrighted and may
-      only be modified in the following manner. The Agreement Steward reserves
-      the right to publish new versions (including revisions) of this Agreement
-      from time to time. No one other than the Agreement Steward has the right
-      to modify this Agreement. The Eclipse Foundation is the initial Agreement
-      Steward. The Eclipse Foundation may assign the responsibility to serve as
-      the Agreement Steward to a suitable separate entity. Each new version of
-      the Agreement will be given a distinguishing version number. The Program
-      (including Contributions) may always be Distributed subject to the version
-      of the Agreement under which it was received. In addition, after a new
-      version of the Agreement is published, Contributor may elect to Distribute
-      the Program (including its Contributions) under the new version.
-    </p>
-    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-      receives no rights or licenses to the intellectual property of any
-      Contributor under this Agreement, whether expressly, by implication,
-      estoppel or otherwise. All rights in the Program not expressly granted
-      under this Agreement are reserved. Nothing in this Agreement is intended
-      to be enforceable by any entity that is not a Contributor or Recipient.
-      No third-party beneficiary rights are created under this Agreement.
-    </p>
-    <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2>
-    <p>“This Source Code may also be made available under the following 
-    	Secondary Licenses when the conditions for such availability set forth 
-    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    	version(s), and exceptions or additional permissions here}.”
-    </p>
-    <blockquote>
-      <p>Simply including a copy of this Agreement, including this Exhibit A
-        is not sufficient to license the Source Code under Secondary Licenses.
-      </p>
-      <p>If it is not possible or desirable to put the notice in a particular file,
-        then You may include the notice in a location (such as a LICENSE file in a
-        relevant directory) where a recipient would be likely to look for
-        such a notice.
-      </p>
-      <p>You may add additional accurate notices of copyright ownership.</p>
-    </blockquote>
-  
-</body></html>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/rootfiles/notice.html b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/rootfiles/notice.html
deleted file mode 100644
index d42ef9c4ab6..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/rootfiles/notice.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0045)https://www.eclipse.org/legal/epl/notice.html -->
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-	<h2>Eclipse Foundation Software User Agreement</h2>
-	<p>November 22, 2017</p>
-
-	<h3>Usage Of Content</h3>
-
-	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-		(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY
-		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-		USE THE CONTENT.</p>
-
-	<h3>Applicable Licenses</h3>
-
-	<p>
-		Unless otherwise indicated, all Content made available by the Eclipse
-		Foundation is provided to you under the terms and conditions of the
-		Eclipse Public License Version 2.0 ("EPL"). A copy of the
-		EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, "Program" will mean the Content.
-	</p>
-
-	<p>Content includes, but is not limited to, source code, object
-		code, documentation and other files maintained in the Eclipse
-		Foundation source code repository ("Repository") in software
-		modules ("Modules") and made available as downloadable
-		archives ("Downloads").</p>
-
-	<ul>
-		<li>Content may be structured and packaged into modules to
-			facilitate delivering, extending, and upgrading the Content. Typical
-			modules may include plug-ins ("Plug-ins"), plug-in
-			fragments ("Fragments"), and features
-			("Features").</li>
-		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-			or JAR (Java� ARchive) in a directory named
-			"plugins".</li>
-		<li>A Feature is a bundle of one or more Plug-ins and/or
-			Fragments and associated material. Each Feature may be packaged as a
-			sub-directory in a directory named "features". Within a
-			Feature, files named "feature.xml" may contain a list of
-			the names and version numbers of the Plug-ins and/or Fragments
-			associated with that Feature.</li>
-		<li>Features may also include other Features ("Included
-			Features"). Within a Feature, files named
-			"feature.xml" may contain a list of the names and version
-			numbers of Included Features.</li>
-	</ul>
-
-	<p>The terms and conditions governing Plug-ins and Fragments should
-		be contained in files named "about.html"
-		("Abouts"). The terms and conditions governing Features and
-		Included Features should be contained in files named
-		"license.html" ("Feature Licenses"). Abouts and
-		Feature Licenses may be located in any directory of a Download or
-		Module including, but not limited to the following locations:</p>
-
-	<ul>
-		<li>The top-level (root) directory</li>
-		<li>Plug-in and Fragment directories</li>
-		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-		<li>Sub-directories of the directory named "src" of
-			certain Plug-ins</li>
-		<li>Feature directories</li>
-	</ul>
-
-	<p>Note: if a Feature made available by the Eclipse Foundation is
-		installed using the Provisioning Technology (as defined below), you
-		must agree to a license ("Feature Update License") during
-		the installation process. If the Feature contains Included Features,
-		the Feature Update License should either provide you with the terms
-		and conditions governing the Included Features or inform you where you
-		can locate them. Feature Update Licenses may be found in the
-		"license" property of files named
-		"feature.properties" found within a Feature. Such Abouts,
-		Feature Licenses, and Feature Update Licenses contain the terms and
-		conditions (or references to such terms and conditions) that govern
-		your use of the associated Content in that directory.</p>
-
-	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-		ARE NOT LIMITED TO):</p>
-
-	<ul>
-		<li>Eclipse Public License Version 2.0 (available at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>)
-		</li>
-		<li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
-		</li>
-		<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
-		</li>
-		<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
-		</li>
-		<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
-		</li>
-		<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
-		</li>
-	</ul>
-
-	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
-		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
-		or Feature Update License is provided, please contact the Eclipse
-		Foundation to determine what terms and conditions govern that
-		particular Content.</p>
-
-
-	<h3>Use of Provisioning Technology</h3>
-
-	<p>
-		The Eclipse Foundation makes available provisioning software, examples
-		of which include, but are not limited to, p2 and the Eclipse Update
-		Manager ("Provisioning Technology") for the purpose of
-		allowing users to install software, documentation, information and/or
-		other materials (collectively "Installable Software"). This
-		capability is provided with the intent of allowing such users to
-		install, extend and update Eclipse-based products. Information about
-		packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-		("Specification").
-	</p>
-
-	<p>You may use Provisioning Technology to allow other parties to
-		install Installable Software. You shall be responsible for enabling
-		the applicable license agreements relating to the Installable Software
-		to be presented to, and accepted by, the users of the Provisioning
-		Technology in accordance with the Specification. By using Provisioning
-		Technology in such a manner and making it available in accordance with
-		the Specification, you further acknowledge your agreement to, and the
-		acquisition of all necessary rights to permit the following:</p>
-
-	<ol>
-		<li>A series of actions may occur ("Provisioning
-			Process") in which a user may execute the Provisioning
-			Technology on a machine ("Target Machine") with the intent
-			of installing, extending or updating the functionality of an
-			Eclipse-based product.</li>
-		<li>During the Provisioning Process, the Provisioning Technology
-			may cause third party Installable Software or a portion thereof to be
-			accessed and copied to the Target Machine.</li>
-		<li>Pursuant to the Specification, you will provide to the user
-			the terms and conditions that govern the use of the Installable
-			Software ("Installable Software Agreement") and such
-			Installable Software Agreement shall be accessed from the Target
-			Machine in accordance with the Specification. Such Installable
-			Software Agreement must inform the user of the terms and conditions
-			that govern the Installable Software and must solicit acceptance by
-			the end user in the manner prescribed in such Installable Software
-			Agreement. Upon such indication of agreement by the user, the
-			provisioning Technology will complete installation of the Installable
-			Software.</li>
-	</ol>
-
-	<h3>Cryptography</h3>
-
-	<p>Content may contain encryption software. The country in which
-		you are currently may have restrictions on the import, possession, and
-		use, and/or re-export to another country, of encryption software.
-		BEFORE using any encryption software, please check the country's laws,
-		regulations and policies concerning the import, possession, or use,
-		and re-export of encryption software, to see if this is permitted.</p>
-
-	<p>
-		<small>Java and all Java-based trademarks are trademarks of
-			Oracle Corporation in the United States, other countries, or both.</small>
-	</p>
-
-
-</body></html>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateBundle/about.html b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateBundle/about.html
deleted file mode 100644
index b761da52bfc..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateBundle/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 22, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateBundle/plugin.properties b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateBundle/plugin.properties
deleted file mode 100644
index 22293a6848f..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateBundle/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-pluginName=Graphical Modeling Framework Tooling Developer Resources Bundle
-providerName=Eclipse Modeling Project
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/build.properties b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/build.properties
deleted file mode 100644
index 816dfd84145..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2005 Borland Software Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-###############################################################################
-bin.includes =\
-epl-v20.html,\
-feature.xml,\
-feature.properties,\
-eclipse_update_120.jpg,\
-license.html
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/eclipse_update_120.jpg b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/eclipse_update_120.jpg
deleted file mode 100644
index 68e3e0248e6..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/eclipse_update_120.jpg
+++ /dev/null
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/epl-v20.html b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/epl-v20.html
deleted file mode 100644
index 626fd4a626d..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/epl-v20.html
+++ /dev/null
@@ -1,300 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0058)https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    
-    <title>Eclipse Public License - Version 2.0</title>
-    <style type="text/css">
-      body {
-        margin: 1.5em 3em;
-      }
-      h1{
-        font-size:1.5em;
-      }
-      h2{
-        font-size:1em;
-        margin-bottom:0.5em;
-        margin-top:1em;
-      }
-      p {
-        margin-top:  0.5em;
-        margin-bottom: 0.5em;
-      }
-      ul, ol{
-        list-style-type:none;
-      }
-    </style>
-  </head>
-  <body>
-    <h1>Eclipse Public License - v 2.0</h1>
-    <p>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE
-      PUBLIC LICENSE (“AGREEMENT”). ANY USE, REPRODUCTION OR DISTRIBUTION
-      OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
-    </p>
-    <h2 id="definitions">1. DEFINITIONS</h2>
-    <p>“Contribution” means:</p>
-    <ul>
-      <li>a) in the case of the initial Contributor, the initial content
-        Distributed under this Agreement, and
-      </li>
-      <li>
-        b) in the case of each subsequent Contributor:
-        <ul>
-          <li>i) changes to the Program, and</li>
-          <li>ii) additions to the Program;</li>
-        </ul>
-        where such changes and/or additions to the Program originate from
-        and are Distributed by that particular Contributor. A Contribution
-        “originates” from a Contributor if it was added to the Program by such
-        Contributor itself or anyone acting on such Contributor's behalf.
-        Contributions do not include changes or additions to the Program that
-        are not Modified Works.
-      </li>
-    </ul>
-    <p>“Contributor” means any person or entity that Distributes the Program.</p>
-    <p>“Licensed Patents” mean patent claims licensable by a Contributor which
-      are necessarily infringed by the use or sale of its Contribution alone
-      or when combined with the Program.
-    </p>
-    <p>“Program” means the Contributions Distributed in accordance with this
-      Agreement.
-    </p>
-    <p>“Recipient” means anyone who receives the Program under this Agreement
-      or any Secondary License (as applicable), including Contributors.
-    </p>
-    <p>“Derivative Works” shall mean any work, whether in Source Code or other
-      form, that is based on (or derived from) the Program and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship.
-    </p>
-    <p>“Modified Works” shall mean any work in Source Code or other form that
-      results from an addition to, deletion from, or modification of the
-      contents of the Program, including, for purposes of clarity any new file
-      in Source Code form that contains any contents of the Program. Modified
-      Works shall not include works that contain only declarations, interfaces,
-      types, classes, structures, or files of the Program solely in each case
-      in order to link to, bind by name, or subclass the Program or Modified
-      Works thereof.
-    </p>
-    <p>“Distribute” means the acts of a) distributing or b) making available
-      in any manner that enables the transfer of a copy.
-    </p>
-    <p>“Source Code” means the form of a Program preferred for making
-      modifications, including but not limited to software source code,
-      documentation source, and configuration files.
-    </p>
-    <p>“Secondary License” means either the GNU General Public License,
-      Version 2.0, or any later versions of that license, including any
-      exceptions or additional permissions as identified by the initial
-      Contributor.
-    </p>
-    <h2 id="grant-of-rights">2. GRANT OF RIGHTS</h2>
-    <ul>
-      <li>a) Subject to the terms of this Agreement, each Contributor hereby
-        grants Recipient a non-exclusive, worldwide, royalty-free copyright
-        license to reproduce, prepare Derivative Works of, publicly display,
-        publicly perform, Distribute and sublicense the Contribution of such
-        Contributor, if any, and such Derivative Works.
-      </li>
-      <li>b) Subject to the terms of this Agreement, each Contributor hereby
-        grants Recipient a non-exclusive, worldwide, royalty-free patent
-        license under Licensed Patents to make, use, sell, offer to sell,
-        import and otherwise transfer the Contribution of such Contributor,
-        if any, in Source Code or other form. This patent license shall
-        apply to the combination of the Contribution and the Program if,
-        at the time the Contribution is added by the Contributor, such
-        addition of the Contribution causes such combination to be covered
-        by the Licensed Patents. The patent license shall not apply to any
-        other combinations which include the Contribution. No hardware per
-        se is licensed hereunder.
-      </li>
-      <li>c) Recipient understands that although each Contributor grants the
-        licenses to its Contributions set forth herein, no assurances are
-        provided by any Contributor that the Program does not infringe the
-        patent or other intellectual property rights of any other entity.
-        Each Contributor disclaims any liability to Recipient for claims
-        brought by any other entity based on infringement of intellectual
-        property rights or otherwise. As a condition to exercising the rights
-        and licenses granted hereunder, each Recipient hereby assumes sole
-        responsibility to secure any other intellectual property rights needed,
-        if any. For example, if a third party patent license is required to
-        allow Recipient to Distribute the Program, it is Recipient's
-        responsibility to acquire that license before distributing the Program.
-      </li>
-      <li>d) Each Contributor represents that to its knowledge it has sufficient
-        copyright rights in its Contribution, if any, to grant the copyright
-        license set forth in this Agreement.
-      </li>
-      <li>e) Notwithstanding the terms of any Secondary License, no Contributor
-        makes additional grants to any Recipient (other than those set forth
-        in this Agreement) as a result of such Recipient's receipt of the
-        Program under the terms of a Secondary License (if permitted under
-        the terms of Section 3).
-      </li>
-    </ul>
-    <h2 id="requirements">3. REQUIREMENTS</h2>
-    <p>3.1 If a Contributor Distributes the Program in any form, then:</p>
-    <ul>
-      <li>a) the Program must also be made available as Source Code, in
-        accordance with section 3.2, and the Contributor must accompany
-        the Program with a statement that the Source Code for the Program
-        is available under this Agreement, and informs Recipients how to
-        obtain it in a reasonable manner on or through a medium customarily
-        used for software exchange; and
-      </li>
-      <li>
-        b) the Contributor may Distribute the Program under a license
-        different than this Agreement, provided that such license:
-        <ul>
-          <li>i) effectively disclaims on behalf of all other Contributors all
-            warranties and conditions, express and implied, including warranties
-            or conditions of title and non-infringement, and implied warranties
-            or conditions of merchantability and fitness for a particular purpose;
-          </li>
-          <li>ii) effectively excludes on behalf of all other Contributors all
-            liability for damages, including direct, indirect, special, incidental
-            and consequential damages, such as lost profits;
-          </li>
-          <li>iii) does not attempt to limit or alter the recipients' rights in the
-            Source Code under section 3.2; and
-          </li>
-          <li>iv) requires any subsequent distribution of the Program by any party
-            to be under a license that satisfies the requirements of this section 3.
-          </li>
-        </ul>
-      </li>
-    </ul>
-    <p>3.2 When the Program is Distributed as Source Code:</p>
-    <ul>
-      <li>a) it must be made available under this Agreement, or if the Program (i)
-        is combined with other material in a separate file or files made available
-        under a Secondary License, and (ii) the initial Contributor attached to
-        the Source Code the notice described in Exhibit A of this Agreement,
-        then the Program may be made available under the terms of such
-        Secondary Licenses, and
-      </li>
-      <li>b) a copy of this Agreement must be included with each copy of the Program.</li>
-    </ul>
-    <p>3.3 Contributors may not remove or alter any copyright, patent, trademark,
-      attribution notices, disclaimers of warranty, or limitations of liability
-      (‘notices’) contained within the Program from any copy of the Program which
-      they Distribute, provided that Contributors may add their own appropriate
-      notices.
-    </p>
-    <h2 id="commercial-distribution">4. COMMERCIAL DISTRIBUTION</h2>
-    <p>Commercial distributors of software may accept certain responsibilities
-      with respect to end users, business partners and the like. While this
-      license is intended to facilitate the commercial use of the Program, the
-      Contributor who includes the Program in a commercial product offering should
-      do so in a manner which does not create potential liability for other
-      Contributors. Therefore, if a Contributor includes the Program in a
-      commercial product offering, such Contributor (“Commercial Contributor”)
-      hereby agrees to defend and indemnify every other Contributor
-      (“Indemnified Contributor”) against any losses, damages and costs
-      (collectively “Losses”) arising from claims, lawsuits and other legal actions
-      brought by a third party against the Indemnified Contributor to the extent
-      caused by the acts or omissions of such Commercial Contributor in connection
-      with its distribution of the Program in a commercial product offering.
-      The obligations in this section do not apply to any claims or Losses relating
-      to any actual or alleged intellectual property infringement. In order to
-      qualify, an Indemnified Contributor must: a) promptly notify the
-      Commercial Contributor in writing of such claim, and b) allow the Commercial
-      Contributor to control, and cooperate with the Commercial Contributor in,
-      the defense and any related settlement negotiations. The Indemnified
-      Contributor may participate in any such claim at its own expense.
-    </p>
-    <p>For example, a Contributor might include the Program
-      in a commercial product offering, Product X. That Contributor is then a
-      Commercial Contributor. If that Commercial Contributor then makes performance
-      claims, or offers warranties related to Product X, those performance claims
-      and warranties are such Commercial Contributor's responsibility alone.
-      Under this section, the Commercial Contributor would have to defend claims
-      against the other Contributors related to those performance claims and
-      warranties, and if a court requires any other Contributor to pay any damages
-      as a result, the Commercial Contributor must pay those damages.
-    </p>
-    <h2 id="warranty">5. NO WARRANTY</h2>
-    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
-      BY APPLICABLE LAW, THE PROGRAM IS PROVIDED ON AN “AS IS” BASIS, WITHOUT
-      WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-      WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-      MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is
-      solely responsible for determining the appropriateness of using and
-      distributing the Program and assumes all risks associated with its
-      exercise of rights under this Agreement, including but not limited to the
-      risks and costs of program errors, compliance with applicable laws, damage
-      to or loss of data, programs or equipment, and unavailability or
-      interruption of operations.
-    </p>
-    <h2 id="disclaimer">6. DISCLAIMER OF LIABILITY</h2>
-    <p>EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, AND TO THE EXTENT PERMITTED
-      BY APPLICABLE LAW, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY
-      LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-      OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS),
-      HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-      LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-      OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
-      GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-    </p>
-    <h2 id="general">7. GENERAL</h2>
-    <p>If any provision of this Agreement is invalid or unenforceable under
-      applicable law, it shall not affect the validity or enforceability of the
-      remainder of the terms of this Agreement, and without further action by the
-      parties hereto, such provision shall be reformed to the minimum extent
-      necessary to make such provision valid and enforceable.
-    </p>
-    <p>If Recipient institutes patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Program itself
-      (excluding combinations of the Program with other software or hardware)
-      infringes such Recipient's patent(s), then such Recipient's rights granted
-      under Section 2(b) shall terminate as of the date such litigation is filed.
-    </p>
-    <p>All Recipient's rights under this Agreement shall terminate if it fails to
-      comply with any of the material terms or conditions of this Agreement and
-      does not cure such failure in a reasonable period of time after becoming
-      aware of such noncompliance. If all Recipient's rights under this Agreement
-      terminate, Recipient agrees to cease use and distribution of the Program
-      as soon as reasonably practicable. However, Recipient's obligations under
-      this Agreement and any licenses granted by Recipient relating to the
-      Program shall continue and survive.
-    </p>
-    <p>Everyone is permitted to copy and distribute copies of this Agreement,
-      but in order to avoid inconsistency the Agreement is copyrighted and may
-      only be modified in the following manner. The Agreement Steward reserves
-      the right to publish new versions (including revisions) of this Agreement
-      from time to time. No one other than the Agreement Steward has the right
-      to modify this Agreement. The Eclipse Foundation is the initial Agreement
-      Steward. The Eclipse Foundation may assign the responsibility to serve as
-      the Agreement Steward to a suitable separate entity. Each new version of
-      the Agreement will be given a distinguishing version number. The Program
-      (including Contributions) may always be Distributed subject to the version
-      of the Agreement under which it was received. In addition, after a new
-      version of the Agreement is published, Contributor may elect to Distribute
-      the Program (including its Contributions) under the new version.
-    </p>
-    <p>Except as expressly stated in Sections 2(a) and 2(b) above, Recipient
-      receives no rights or licenses to the intellectual property of any
-      Contributor under this Agreement, whether expressly, by implication,
-      estoppel or otherwise. All rights in the Program not expressly granted
-      under this Agreement are reserved. Nothing in this Agreement is intended
-      to be enforceable by any entity that is not a Contributor or Recipient.
-      No third-party beneficiary rights are created under this Agreement.
-    </p>
-    <h2 id="exhibit-a">Exhibit A – Form of Secondary Licenses Notice</h2>
-    <p>“This Source Code may also be made available under the following 
-    	Secondary Licenses when the conditions for such availability set forth 
-    	in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
-    	version(s), and exceptions or additional permissions here}.”
-    </p>
-    <blockquote>
-      <p>Simply including a copy of this Agreement, including this Exhibit A
-        is not sufficient to license the Source Code under Secondary Licenses.
-      </p>
-      <p>If it is not possible or desirable to put the notice in a particular file,
-        then You may include the notice in a location (such as a LICENSE file in a
-        relevant directory) where a recipient would be likely to look for
-        such a notice.
-      </p>
-      <p>You may add additional accurate notices of copyright ownership.</p>
-    </blockquote>
-  
-</body></html>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/feature.properties b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index dd62d115c69..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,156 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2010 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Graphical Modeling Framework Tooling Developer Resources
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Modeling Project
-
-# "updateSiteName" property - label for the update site
-updateSiteName=Graphical Modeling Framework (GMF) Updates
-
-# "description" property - description of the feature
-description=API documentation and source code zips for Graphical Modeling Framework Tooling component.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-November 22, 2017\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 2.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v20.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-       - Content may be structured and packaged into modules to facilitate delivering,\n\
-         extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-         plug-in fragments ("Fragments"), and features ("Features").\n\
-       - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
-         in a directory named "plugins".\n\
-       - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-         Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-         Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-         numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-       - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-         named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-       - The top-level (root) directory\n\
-       - Plug-in and Fragment directories\n\
-       - Inside Plug-ins and Fragments packaged as JARs\n\
-       - Sub-directories of the directory named "src" of certain Plug-ins\n\
-       - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-       - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-       - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-       - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-       - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-       - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
-       1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
-          the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
-          extending or updating the functionality of an Eclipse-based product.\n\
-       2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
-          Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
-       3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
-          govern the use of the Installable Software ("Installable Software Agreement") and such\n\
-          Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
-          with the Specification. Such Installable Software Agreement must inform the user of the\n\
-          terms and conditions that govern the Installable Software and must solicit acceptance by\n\
-          the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
-          indication of agreement by the user, the provisioning Technology will complete installation\n\
-          of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/license.html b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/license.html
deleted file mode 100644
index d42ef9c4ab6..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplateFeature/license.html
+++ /dev/null
@@ -1,181 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<!-- saved from url=(0045)https://www.eclipse.org/legal/epl/notice.html -->
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-	<h2>Eclipse Foundation Software User Agreement</h2>
-	<p>November 22, 2017</p>
-
-	<h3>Usage Of Content</h3>
-
-	<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION,
-		INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-		(COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY
-		THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-		CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-		BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS
-		GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY
-		APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED
-		BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS
-		AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE
-		AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT
-		USE THE CONTENT.</p>
-
-	<h3>Applicable Licenses</h3>
-
-	<p>
-		Unless otherwise indicated, all Content made available by the Eclipse
-		Foundation is provided to you under the terms and conditions of the
-		Eclipse Public License Version 2.0 ("EPL"). A copy of the
-		EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-2.0">http://www.eclipse.org/legal/epl-2.0</a>.
-		For purposes of the EPL, "Program" will mean the Content.
-	</p>
-
-	<p>Content includes, but is not limited to, source code, object
-		code, documentation and other files maintained in the Eclipse
-		Foundation source code repository ("Repository") in software
-		modules ("Modules") and made available as downloadable
-		archives ("Downloads").</p>
-
-	<ul>
-		<li>Content may be structured and packaged into modules to
-			facilitate delivering, extending, and upgrading the Content. Typical
-			modules may include plug-ins ("Plug-ins"), plug-in
-			fragments ("Fragments"), and features
-			("Features").</li>
-		<li>Each Plug-in or Fragment may be packaged as a sub-directory
-			or JAR (Java� ARchive) in a directory named
-			"plugins".</li>
-		<li>A Feature is a bundle of one or more Plug-ins and/or
-			Fragments and associated material. Each Feature may be packaged as a
-			sub-directory in a directory named "features". Within a
-			Feature, files named "feature.xml" may contain a list of
-			the names and version numbers of the Plug-ins and/or Fragments
-			associated with that Feature.</li>
-		<li>Features may also include other Features ("Included
-			Features"). Within a Feature, files named
-			"feature.xml" may contain a list of the names and version
-			numbers of Included Features.</li>
-	</ul>
-
-	<p>The terms and conditions governing Plug-ins and Fragments should
-		be contained in files named "about.html"
-		("Abouts"). The terms and conditions governing Features and
-		Included Features should be contained in files named
-		"license.html" ("Feature Licenses"). Abouts and
-		Feature Licenses may be located in any directory of a Download or
-		Module including, but not limited to the following locations:</p>
-
-	<ul>
-		<li>The top-level (root) directory</li>
-		<li>Plug-in and Fragment directories</li>
-		<li>Inside Plug-ins and Fragments packaged as JARs</li>
-		<li>Sub-directories of the directory named "src" of
-			certain Plug-ins</li>
-		<li>Feature directories</li>
-	</ul>
-
-	<p>Note: if a Feature made available by the Eclipse Foundation is
-		installed using the Provisioning Technology (as defined below), you
-		must agree to a license ("Feature Update License") during
-		the installation process. If the Feature contains Included Features,
-		the Feature Update License should either provide you with the terms
-		and conditions governing the Included Features or inform you where you
-		can locate them. Feature Update Licenses may be found in the
-		"license" property of files named
-		"feature.properties" found within a Feature. Such Abouts,
-		Feature Licenses, and Feature Update Licenses contain the terms and
-		conditions (or references to such terms and conditions) that govern
-		your use of the associated Content in that directory.</p>
-
-	<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY
-		REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND
-		CONDITIONS. SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT
-		ARE NOT LIMITED TO):</p>
-
-	<ul>
-		<li>Eclipse Public License Version 2.0 (available at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>)
-		</li>
-		<li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)
-		</li>
-		<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)
-		</li>
-		<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)
-		</li>
-		<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)
-		</li>
-		<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)
-		</li>
-	</ul>
-
-	<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND
-		CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License,
-		or Feature Update License is provided, please contact the Eclipse
-		Foundation to determine what terms and conditions govern that
-		particular Content.</p>
-
-
-	<h3>Use of Provisioning Technology</h3>
-
-	<p>
-		The Eclipse Foundation makes available provisioning software, examples
-		of which include, but are not limited to, p2 and the Eclipse Update
-		Manager ("Provisioning Technology") for the purpose of
-		allowing users to install software, documentation, information and/or
-		other materials (collectively "Installable Software"). This
-		capability is provided with the intent of allowing such users to
-		install, extend and update Eclipse-based products. Information about
-		packaging Installable Software is available at <a href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
-		("Specification").
-	</p>
-
-	<p>You may use Provisioning Technology to allow other parties to
-		install Installable Software. You shall be responsible for enabling
-		the applicable license agreements relating to the Installable Software
-		to be presented to, and accepted by, the users of the Provisioning
-		Technology in accordance with the Specification. By using Provisioning
-		Technology in such a manner and making it available in accordance with
-		the Specification, you further acknowledge your agreement to, and the
-		acquisition of all necessary rights to permit the following:</p>
-
-	<ol>
-		<li>A series of actions may occur ("Provisioning
-			Process") in which a user may execute the Provisioning
-			Technology on a machine ("Target Machine") with the intent
-			of installing, extending or updating the functionality of an
-			Eclipse-based product.</li>
-		<li>During the Provisioning Process, the Provisioning Technology
-			may cause third party Installable Software or a portion thereof to be
-			accessed and copied to the Target Machine.</li>
-		<li>Pursuant to the Specification, you will provide to the user
-			the terms and conditions that govern the use of the Installable
-			Software ("Installable Software Agreement") and such
-			Installable Software Agreement shall be accessed from the Target
-			Machine in accordance with the Specification. Such Installable
-			Software Agreement must inform the user of the terms and conditions
-			that govern the Installable Software and must solicit acceptance by
-			the end user in the manner prescribed in such Installable Software
-			Agreement. Upon such indication of agreement by the user, the
-			provisioning Technology will complete installation of the Installable
-			Software.</li>
-	</ol>
-
-	<h3>Cryptography</h3>
-
-	<p>Content may contain encryption software. The country in which
-		you are currently may have restrictions on the import, possession, and
-		use, and/or re-export to another country, of encryption software.
-		BEFORE using any encryption software, please check the country's laws,
-		regulations and policies concerning the import, possession, or use,
-		and re-export of encryption software, to see if this is permitted.</p>
-
-	<p>
-		<small>Java and all Java-based trademarks are trademarks of
-			Oracle Corporation in the United States, other countries, or both.</small>
-	</p>
-
-
-</body></html>
\ No newline at end of file
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.html b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.html
deleted file mode 100644
index b761da52bfc..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 22, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="http://www.eclipse.org/legal/epl-v20.html">http://www.eclipse.org/legal/epl-v20.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.ini b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.ini
deleted file mode 100644
index 945d0616766..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-welcomePage=$nl$/welcome.xml
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.mappings b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.mappings
deleted file mode 100644
index 529ce239e9d..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@buildId@
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.properties b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.properties
deleted file mode 100644
index 2bd70425ec0..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/about.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-# /**
-#  * <copyright>
-#  *
-#  * Copyright (c) 2005 Borland Software Corporation and others.
-#  * All rights reserved.   This program and the accompanying materials
-#  * are made available under the terms of the Eclipse Public License v2.0
-#  * which accompanies this distribution, and is available at
-#  * http://www.eclipse.org/legal/epl-v20.html
-#  *
-#  * Contributors:
-#  *   Borland - Initial API and implementation
-#  *   Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-#  * </copyright>
-#  */
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-featureName=Graphical Modeling Framework (GMF) Developer Resources
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Developer Resources \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2005.  All rights reserved.\n\
-\n\
-GMF is a framework for generating graphical applications based on EMF and GEF.\n\
-Visit http://www.eclipse.org/gmf
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/build.properties b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/build.properties
deleted file mode 100644
index 7a5a8bdd905..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/build.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 Borland Software Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-###############################################################################
-bin.includes = modeling32.png,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/,\
-               eclipse_update_120.jpg,\
-               epl-v20.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
-sourcePlugin=true
-src.includes = modeling32.png,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               plugin.xml,\
-               plugin.properties,\
-               src/**,\
-               META-INF/
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/modeling32.png b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/modeling32.png
deleted file mode 100644
index 6b08de2ada7..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/modeling32.png
+++ /dev/null
diff --git a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/plugin.properties b/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/plugin.properties
deleted file mode 100644
index e3f024bd499..00000000000
--- a/features/papyrus-toolsmiths-features/org.eclipse.papyrus.gmf.tooling.feature/sourceTemplatePlugin/plugin.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2005 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v2.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v20.html
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-pluginName=Graphical Modeling Framework Tooling Developer Resources
-providerName=Eclipse Modeling Project
diff --git a/features/papyrus-toolsmiths-features/pom.xml b/features/papyrus-toolsmiths-features/pom.xml
index 07da8b76f48..39055281574 100644
--- a/features/papyrus-toolsmiths-features/pom.xml
+++ b/features/papyrus-toolsmiths-features/pom.xml
@@ -21,7 +21,6 @@
 		<module>org.eclipse.papyrus.releng.feature</module>
 		<module>org.eclipse.papyrus.toolsmiths.builder.feature</module>
 		<module>org.eclipse.papyrus.toolsmiths.feature</module>
-		<module>org.eclipse.papyrus.gmf.tooling.feature</module>
 		<module>org.eclipse.papyrus.uml.assistants.feature</module>
 		<module>org.eclipse.papyrus.uml.m2m.qvto.tests.tools.feature</module>
 		<module>org.eclipse.papyrus.toolsmiths.validation.feature</module>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.options b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.options
deleted file mode 100644
index aa7d0f57b56..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.options
+++ /dev/null
@@ -1,4 +0,0 @@
-# Debugging options for the org.eclipse.papyrus.gmf.bridge.trace plug-in
-
-# Turn on general debugging for the org.eclipse.papyrus.gmf.bridge.trace plug-in
-org.eclipse.papyrus.gmf.bridge.trace/debug=false
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.project
deleted file mode 100644
index c8656c0afc6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.bridge.trace</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/META-INF/MANIFEST.MF
deleted file mode 100644
index 7794d7e7886..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.bridge.trace; singleton:=true
-Bundle-Version: 1.3.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.papyrus.gmf.codegen;bundle-version="[2.2.0,3.1.0)",
- org.eclipse.papyrus.gmf.bridge;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)"
-Bundle-Activator: org.eclipse.papyrus.gmf.internal.bridge.trace.GmfTracePlugin
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/build.properties
deleted file mode 100644
index 89329eacca0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#    Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               model/,\
-               plugin.xml,\
-               plugin.properties,\
-               .options
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/model/trace.ecore b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/model/trace.ecore
deleted file mode 100644
index 47539f47720..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/model/trace.ecore
+++ /dev/null
@@ -1,79 +0,0 @@
-<?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="trace" nsURI="http://www.eclipse.org/papyrus/gmf/2020/Trace"
-    nsPrefix="trace">
-  <eClassifiers xsi:type="ecore:EClass" name="TraceModel">
-    <eOperations name="getNodeTrace" eType="#//GenNodeTrace">
-      <eParameters name="visualID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getLinkTrace" eType="#//GenLinkTrace">
-      <eParameters name="visualID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    </eOperations>
-    <eOperations name="getAllAbstractTraces" upperBound="-1" eType="#//AbstractTrace"/>
-    <eOperations name="purgeUnprocessedTraces"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodeTraces" upperBound="-1"
-        eType="#//GenNodeTrace" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childNodeTraces" upperBound="-1"
-        eType="#//GenChildNodeTrace" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkTraces" upperBound="-1"
-        eType="#//GenLinkTrace" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolGroupTraces" upperBound="-1"
-        eType="#//ToolGroupTrace" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractTrace" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visualID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        iD="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="processed" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        transient="true" defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MatchingTrace" abstract="true" eSuperTypes="#//AbstractTrace">
-    <eOperations name="getQueryContext" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eOperations name="getEClassComparision" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eParameters name="varName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="eClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    </eOperations>
-    <eOperations name="getEStructuralFeatureComparison" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eParameters name="varName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eParameters name="feature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="queryText" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        derived="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenNodeTrace" eSuperTypes="#//MatchingTrace">
-    <eOperations name="setContext">
-      <eParameters name="genNode" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.codegen/models/gmfgen.ecore#//GenNode"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodeLabelTraces" upperBound="-1"
-        eType="#//GenNodeLabelTrace" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartmentTraces" upperBound="-1"
-        eType="#//GenCompartmentTrace" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenChildNodeTrace" eSuperTypes="#//GenNodeTrace"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GenNodeLabelTrace" eSuperTypes="#//MatchingTrace">
-    <eOperations name="setContext">
-      <eParameters name="genNodeLabel" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.codegen/models/gmfgen.ecore#//GenNodeLabel"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenLinkTrace" eSuperTypes="#//MatchingTrace">
-    <eOperations name="setContext">
-      <eParameters name="genLink" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.codegen/models/gmfgen.ecore#//GenLink"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkLabelTraces" upperBound="-1"
-        eType="#//GenLinkLabelTrace" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenCompartmentTrace" eSuperTypes="#//MatchingTrace">
-    <eOperations name="setContext">
-      <eParameters name="genCompartment" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.codegen/models/gmfgen.ecore#//GenCompartment"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenLinkLabelTrace" eSuperTypes="#//MatchingTrace">
-    <eOperations name="setContext">
-      <eParameters name="genLinkLabel" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.codegen/models/gmfgen.ecore#//GenLinkLabel"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolGroupTrace" eSuperTypes="#//MatchingTrace">
-    <eOperations name="setContext">
-      <eParameters name="toolGroup" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.codegen/models/gmfgen.ecore#//ToolGroup"/>
-    </eOperations>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/model/trace.genmodel b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/model/trace.genmodel
deleted file mode 100644
index 4811a90ba4e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/model/trace.genmodel
+++ /dev/null
@@ -1,75 +0,0 @@
-<?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" modelDirectory="/org.eclipse.papyrus.gmf.bridge.trace/src"
-    modelPluginID="org.eclipse.papyrus.gmf.bridge.trace" modelName="Trace" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.emf.codegen.ecore/model/GenModel.genmodel#//genmodel ../../org.eclipse.papyrus.gmf.codegen/models/gmfgen.genmodel#//gmfgen">
-  <foreignModel>trace.ecore</foreignModel>
-  <genPackages prefix="Trace" basePackage="org.eclipse.papyrus.gmf.internal.bridge" disposableProviderFactory="true"
-      ecorePackage="trace.ecore#/">
-    <genClasses ecoreClass="trace.ecore#//TraceModel">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference trace.ecore#//TraceModel/nodeTraces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference trace.ecore#//TraceModel/childNodeTraces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference trace.ecore#//TraceModel/linkTraces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference trace.ecore#//TraceModel/toolGroupTraces"/>
-      <genOperations ecoreOperation="trace.ecore#//TraceModel/getNodeTrace">
-        <genParameters ecoreParameter="trace.ecore#//TraceModel/getNodeTrace/visualID"/>
-      </genOperations>
-      <genOperations ecoreOperation="trace.ecore#//TraceModel/getLinkTrace">
-        <genParameters ecoreParameter="trace.ecore#//TraceModel/getLinkTrace/visualID"/>
-      </genOperations>
-      <genOperations ecoreOperation="trace.ecore#//TraceModel/getAllAbstractTraces"/>
-      <genOperations ecoreOperation="trace.ecore#//TraceModel/purgeUnprocessedTraces"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="trace.ecore#//AbstractTrace">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute trace.ecore#//AbstractTrace/visualID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute trace.ecore#//AbstractTrace/processed"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="trace.ecore#//MatchingTrace">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute trace.ecore#//MatchingTrace/queryText"/>
-      <genOperations ecoreOperation="trace.ecore#//MatchingTrace/getQueryContext"/>
-      <genOperations ecoreOperation="trace.ecore#//MatchingTrace/getEClassComparision">
-        <genParameters ecoreParameter="trace.ecore#//MatchingTrace/getEClassComparision/varName"/>
-        <genParameters ecoreParameter="trace.ecore#//MatchingTrace/getEClassComparision/eClass"/>
-      </genOperations>
-      <genOperations ecoreOperation="trace.ecore#//MatchingTrace/getEStructuralFeatureComparison">
-        <genParameters ecoreParameter="trace.ecore#//MatchingTrace/getEStructuralFeatureComparison/varName"/>
-        <genParameters ecoreParameter="trace.ecore#//MatchingTrace/getEStructuralFeatureComparison/feature"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="trace.ecore#//GenNodeTrace">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference trace.ecore#//GenNodeTrace/nodeLabelTraces"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference trace.ecore#//GenNodeTrace/compartmentTraces"/>
-      <genOperations ecoreOperation="trace.ecore#//GenNodeTrace/setContext">
-        <genParameters ecoreParameter="trace.ecore#//GenNodeTrace/setContext/genNode"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="trace.ecore#//GenChildNodeTrace"/>
-    <genClasses ecoreClass="trace.ecore#//GenNodeLabelTrace">
-      <genOperations ecoreOperation="trace.ecore#//GenNodeLabelTrace/setContext">
-        <genParameters ecoreParameter="trace.ecore#//GenNodeLabelTrace/setContext/genNodeLabel"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="trace.ecore#//GenLinkTrace">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference trace.ecore#//GenLinkTrace/linkLabelTraces"/>
-      <genOperations ecoreOperation="trace.ecore#//GenLinkTrace/setContext">
-        <genParameters ecoreParameter="trace.ecore#//GenLinkTrace/setContext/genLink"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="trace.ecore#//GenCompartmentTrace">
-      <genOperations ecoreOperation="trace.ecore#//GenCompartmentTrace/setContext">
-        <genParameters ecoreParameter="trace.ecore#//GenCompartmentTrace/setContext/genCompartment"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="trace.ecore#//GenLinkLabelTrace">
-      <genOperations ecoreOperation="trace.ecore#//GenLinkLabelTrace/setContext">
-        <genParameters ecoreParameter="trace.ecore#//GenLinkLabelTrace/setContext/genLinkLabel"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="trace.ecore#//ToolGroupTrace">
-      <genOperations ecoreOperation="trace.ecore#//ToolGroupTrace/setContext">
-        <genParameters ecoreParameter="trace.ecore#//ToolGroupTrace/setContext/toolGroup"/>
-      </genOperations>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/plugin.properties
deleted file mode 100644
index 00dd6b6dea1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/plugin.properties
+++ /dev/null
@@ -1,26 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#    Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Papyrus Trace Model
-providerName = Eclipse Modeling Project
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/plugin.xml
deleted file mode 100644
index ef3778fdc83..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/papyrus/gmf/2020/Trace" 
-       class = "org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage"
-       genModel = "model/trace.genmodel" /> 
-  </extension>
-
-  <extension point="org.eclipse.emf.ecore.extension_parser">
-    <parser type="trace" class="org.eclipse.papyrus.gmf.internal.common.ToolingResourceFactory" />
-  </extension>
-
-  <extension point="org.eclipse.team.core.fileTypes">
-    <fileTypes extension="trace" type="text" />
-  </extension>
-
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/pom.xml
deleted file mode 100644
index 3073e0b3313..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- * Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.bridge.trace</artifactId>
-	<version>1.3.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/AbstractTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/AbstractTrace.java
deleted file mode 100644
index 3d88d52c678..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/AbstractTrace.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace#getVisualID <em>Visual ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace#isProcessed <em>Processed</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getAbstractTrace()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractTrace extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Visual ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Visual ID</em>' attribute.
-	 * @see #setVisualID(int)
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getAbstractTrace_VisualID()
-	 * @model id="true"
-	 * @generated
-	 */
-	int getVisualID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace#getVisualID <em>Visual ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Visual ID</em>' attribute.
-	 * @see #getVisualID()
-	 * @generated
-	 */
-	void setVisualID(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Processed</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Processed</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Processed</em>' attribute.
-	 * @see #setProcessed(boolean)
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getAbstractTrace_Processed()
-	 * @model default="false" transient="true"
-	 * @generated
-	 */
-	boolean isProcessed();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace#isProcessed <em>Processed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Processed</em>' attribute.
-	 * @see #isProcessed()
-	 * @generated
-	 */
-	void setProcessed(boolean value);
-
-} // AbstractTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenChildNodeTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenChildNodeTrace.java
deleted file mode 100644
index 7c662ff5ef9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenChildNodeTrace.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gen Child Node Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenChildNodeTrace()
- * @model
- * @generated
- */
-public interface GenChildNodeTrace extends GenNodeTrace {
-} // GenChildNodeTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenCompartmentTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenCompartmentTrace.java
deleted file mode 100644
index e8ca8d713e3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenCompartmentTrace.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gen Compartment Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenCompartmentTrace()
- * @model
- * @generated
- */
-public interface GenCompartmentTrace extends MatchingTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setContext(GenCompartment genCompartment);
-
-} // GenCompartmentTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenLinkLabelTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenLinkLabelTrace.java
deleted file mode 100644
index ddcef327c2b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenLinkLabelTrace.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gen Link Label Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenLinkLabelTrace()
- * @model
- * @generated
- */
-public interface GenLinkLabelTrace extends MatchingTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setContext(GenLinkLabel genLinkLabel);
-
-} // GenLinkLabelTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenLinkTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenLinkTrace.java
deleted file mode 100644
index 343577aea8f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenLinkTrace.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gen Link Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace#getLinkLabelTraces <em>Link Label Traces</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenLinkTrace()
- * @model
- * @generated
- */
-public interface GenLinkTrace extends MatchingTrace {
-	/**
-	 * Returns the value of the '<em><b>Link Label Traces</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link Label Traces</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Link Label Traces</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenLinkTrace_LinkLabelTraces()
-	 * @model type="org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace" containment="true"
-	 * @generated
-	 */
-	EList<GenLinkLabelTrace> getLinkLabelTraces();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setContext(GenLink genLink);
-
-} // GenLinkTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenNodeLabelTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenNodeLabelTrace.java
deleted file mode 100644
index fcfa9b99c64..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenNodeLabelTrace.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNodeLabel;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gen Node Label Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenNodeLabelTrace()
- * @model
- * @generated
- */
-public interface GenNodeLabelTrace extends MatchingTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setContext(GenNodeLabel genNodeLabel);
-
-} // GenNodeLabelTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenNodeTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenNodeTrace.java
deleted file mode 100644
index 13c41fc7e14..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GenNodeTrace.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gen Node Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace#getNodeLabelTraces <em>Node Label Traces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace#getCompartmentTraces <em>Compartment Traces</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenNodeTrace()
- * @model
- * @generated
- */
-public interface GenNodeTrace extends MatchingTrace {
-	/**
-	 * Returns the value of the '<em><b>Node Label Traces</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Node Label Traces</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Node Label Traces</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenNodeTrace_NodeLabelTraces()
-	 * @model type="org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace" containment="true"
-	 * @generated
-	 */
-	EList<GenNodeLabelTrace> getNodeLabelTraces();
-
-	/**
-	 * Returns the value of the '<em><b>Compartment Traces</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Compartment Traces</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Compartment Traces</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getGenNodeTrace_CompartmentTraces()
-	 * @model type="org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace" containment="true"
-	 * @generated
-	 */
-	EList<GenCompartmentTrace> getCompartmentTraces();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setContext(GenNode genNode);
-
-} // GenNodeTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GmfTracePlugin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GmfTracePlugin.java
deleted file mode 100644
index 9c6de108079..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/GmfTracePlugin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-public class GmfTracePlugin extends Plugin {
-
-	private static GmfTracePlugin myInstance;
-
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		myInstance = this;
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		super.stop(context);
-		myInstance = null;
-	}
-
-	public static GmfTracePlugin getInstance() {
-		return myInstance;
-	}
-
-	public void logError(String message, Throwable exception) {
-		getLog().log(new Status(IStatus.ERROR, getBundle().getSymbolicName(), 0, message, exception));
-	}
-
-	public void logDebugInfo(String message) {
-		if (isDebugging()) {
-			getLog().log(new Status(IStatus.INFO, getBundle().getSymbolicName(), 0, message, null));
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/MatchingTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/MatchingTrace.java
deleted file mode 100644
index c76d7281a2b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/MatchingTrace.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.ocl.ParserException;
-import org.eclipse.ocl.ecore.OCL.Query;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Matching Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace#getQueryText <em>Query Text</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getMatchingTrace()
- * @model abstract="true"
- * @generated
- */
-public interface MatchingTrace extends AbstractTrace {
-	/**
-	 * Returns the value of the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query Text</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query Text</em>' attribute.
-	 * @see #setQueryText(String)
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getMatchingTrace_QueryText()
-	 * @model derived="true"
-	 * @generated
-	 */
-	String getQueryText();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace#getQueryText <em>Query Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query Text</em>' attribute.
-	 * @see #getQueryText()
-	 * @generated
-	 */
-	void setQueryText(String value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query Context</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EClass getQueryContext();
-
-	Query getQuery() throws ParserException;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	String getEClassComparision(String varName, EClass eClass);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	String getEStructuralFeatureComparison(String varName, EStructuralFeature feature);
-
-} // MatchingTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/MergingIdentifierDispenser.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/MergingIdentifierDispenser.java
deleted file mode 100644
index c14435cf3b7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/MergingIdentifierDispenser.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.ocl.ParserException;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroup;
-import org.eclipse.papyrus.gmf.internal.bridge.StatefulVisualIdentifierDispencer;
-
-public class MergingIdentifierDispenser implements StatefulVisualIdentifierDispencer {
-	
-	private static final int CANVAS_COUNT_BASE = 1000;
-	private static final int TOP_NODE_COUNT_BASE = 2000;
-	private static final int CHILD_NODE_COUNT_BASE = 3000;
-	private static final int LINK_COUNT_BASE = 4000;
-	private static final int NODE_LABEL_COUNT_BASE = 5000;
-	private static final int LINK_LABEL_COUNT_BASE = 6000;
-	private static final int COMPARTMENT_COUNT_BASE = 7000;
-	private static final int OVERFLOW_COUNT_BASE = 8000;
-	
-	private static final int TOOL_GROUP_COUNT_BASE = 0;
-	
-	private int myTopNodeCount = TOP_NODE_COUNT_BASE;
-	private int myChildNodeCount = CHILD_NODE_COUNT_BASE;
-	private int myLinkCount = LINK_COUNT_BASE;
-	private int myNodeLabelCount = NODE_LABEL_COUNT_BASE;
-	private int myLinkLabelCount = LINK_LABEL_COUNT_BASE;
-	private int myCompartmentCount = COMPARTMENT_COUNT_BASE;
-	private int myToolGroupCount = TOOL_GROUP_COUNT_BASE;
-	private int myOverflowCount = OVERFLOW_COUNT_BASE;
-	
-	private TraceModel myTraceModel;
-	private Map<String, String> mySavingOptions;
-	
-	public void loadState(URI genModelFileURI) {
-		loadTraceModel(genModelFileURI);
-		initCounters();
-	}
-
-	public void saveState() {
-		myTraceModel.purgeUnprocessedTraces();
-		try {
-			myTraceModel.eResource().save(getSavingOptions());
-		} catch (IOException e) {
-			GmfTracePlugin.getInstance().logError("Unable to save trace model", e);
-		}
-		myTraceModel = null;
-	}
-	
-	private Map<?, ?> getSavingOptions() {
-		if (mySavingOptions == null) {
-			mySavingOptions = new HashMap<String, String>();
-			mySavingOptions.put(XMIResource.OPTION_ENCODING, "UTF-8");
-			mySavingOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-		}
-		return mySavingOptions;
-	}
-	
-	private void loadTraceModel(URI genModelFileURI) {
-		URI traceModelURI = genModelFileURI.trimFileExtension().appendFileExtension("trace");
-		ResourceSet resSet = new ResourceSetImpl();
-		Resource traceRes;
-		try {
-			traceRes = resSet.getResource(traceModelURI, true);
-		} catch (RuntimeException e) {
-			traceRes = resSet.createResource(traceModelURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-		}
-
-		if (traceRes.getContents().size() > 0 && traceRes.getContents().get(0) instanceof TraceModel) {
-			myTraceModel = (TraceModel) traceRes.getContents().get(0);
-		} else {
-			myTraceModel = TraceFactory.eINSTANCE.createTraceModel();
-			traceRes.getContents().add(0, myTraceModel);
-		}
-	}
-
-	private void initCounters() {
-		myTopNodeCount = Math.max(myTopNodeCount, getMaxVid(myTraceModel.getNodeTraces()));
-		myChildNodeCount = Math.max(myChildNodeCount, getMaxVid(myTraceModel.getChildNodeTraces()));
-		myLinkCount = Math.max(myLinkCount, getMaxVid(myTraceModel.getLinkTraces()));
-		
-		initNodeChildrenCounters(myTraceModel.getNodeTraces());
-		initNodeChildrenCounters(myTraceModel.getChildNodeTraces());
-
-		for (GenLinkTrace trace : myTraceModel.getLinkTraces()) {
-			myLinkLabelCount = Math.max(myLinkLabelCount, getMaxVid(trace.getLinkLabelTraces()));
-		}
-		
-		myToolGroupCount = Math.max(myToolGroupCount, getMaxVid(myTraceModel.getToolGroupTraces()));
-	}
-	
-	private void initNodeChildrenCounters(Collection<? extends GenNodeTrace> nodeTraces) {
-		for (GenNodeTrace trace : nodeTraces) {
-			myNodeLabelCount = Math.max(myNodeLabelCount, getMaxVid(trace.getNodeLabelTraces()));
-			myCompartmentCount = Math.max(myCompartmentCount, getMaxVid(trace.getCompartmentTraces()));
-		}
-	}
-	
-	private int getMaxVid(Collection<? extends AbstractTrace> abstractTraces) {
-		int id = -1;
-		for (AbstractTrace trace : abstractTraces) {
-			id = Math.max(id, trace.getVisualID());
-			myOverflowCount = Math.max(myOverflowCount, trace.getVisualID());
-		}
-		return id;
-	}
-
-	public int get(GenDiagram diagram) {
-		return CANVAS_COUNT_BASE;
-	}
-
-	public int get(GenTopLevelNode node) {
-		int visualID = getMatchingVID(node, myTraceModel.getNodeTraces());
-		if (visualID > -1) {
-			return visualID;
-		}
-		
-		visualID = getNextTopNodeVID();
-		GenNodeTrace nodeTrace = TraceFactory.eINSTANCE.createGenNodeTrace();
-		nodeTrace.setVisualID(visualID);
-		nodeTrace.setContext(node);
-		nodeTrace.setProcessed(true);
-		myTraceModel.getNodeTraces().add(nodeTrace);
-		return visualID;
-	}
-
-	public int get(GenNodeLabel nodeLabel) {
-		GenNodeTrace nodeTrace = myTraceModel.getNodeTrace(nodeLabel.getNode().getVisualID());
-		int visualID = getMatchingVID(nodeLabel, nodeTrace.getNodeLabelTraces());
-		if (visualID > -1) {
-			return visualID;
-		}
-		
-		visualID = getNextNodeLabelVID();
-		GenNodeLabelTrace nodeLabelTrace = TraceFactory.eINSTANCE.createGenNodeLabelTrace();
-		nodeLabelTrace.setVisualID(visualID);
-		nodeTrace.getNodeLabelTraces().add(nodeLabelTrace);
-		nodeLabelTrace.setContext(nodeLabel);
-		nodeLabelTrace.setProcessed(true);
-		return visualID;
-	}
-
-	public int get(GenLink link) {
-		int visualID = getMatchingVID(link, myTraceModel.getLinkTraces());
-		if (visualID > -1) {
-			return visualID;
-		}
-		
-		visualID = getNextLinkVID();
-		GenLinkTrace nodeLabelTrace = TraceFactory.eINSTANCE.createGenLinkTrace();
-		nodeLabelTrace.setVisualID(visualID);
-		nodeLabelTrace.setContext(link);
-		myTraceModel.getLinkTraces().add(nodeLabelTrace);
-		nodeLabelTrace.setProcessed(true);
-		return visualID;
-	}
-
-	public int get(GenChildNode childNode) {
-		int visualID = getMatchingVID(childNode, myTraceModel.getChildNodeTraces());
-		if (visualID > -1) {
-			return visualID;
-		}
-		
-		visualID = getNextChildNodeVID();
-		GenChildNodeTrace childNodeTrace = TraceFactory.eINSTANCE.createGenChildNodeTrace();
-		childNodeTrace.setVisualID(visualID);
-		childNodeTrace.setContext(childNode);
-		myTraceModel.getChildNodeTraces().add(childNodeTrace);
-		childNodeTrace.setProcessed(true);
-		return visualID;
-	}
-
-	public int get(GenCompartment compartment) {
-		GenNodeTrace nodeTrace = myTraceModel.getNodeTrace(compartment.getNode().getVisualID());
-		int visualID = getMatchingVID(compartment, nodeTrace.getCompartmentTraces());
-		if (visualID > -1) {
-			return visualID;
-		}
-		
-		visualID = getNextCompartmentVID();
-		GenCompartmentTrace compartmentTrace = TraceFactory.eINSTANCE.createGenCompartmentTrace();
-		compartmentTrace.setVisualID(visualID);
-		nodeTrace.getCompartmentTraces().add(compartmentTrace);
-		compartmentTrace.setContext(compartment);
-		compartmentTrace.setProcessed(true);
-		return visualID;
-	}
-
-	public int get(GenLinkLabel label) {
-		GenLinkTrace linkTrace = myTraceModel.getLinkTrace(label.getLink().getVisualID());
-		int visualID = getMatchingVID(label, linkTrace.getLinkLabelTraces());
-		if (visualID > -1) {
-			return visualID;
-		}
-		
-		visualID = getNextLinkLabelVID();
-		GenLinkLabelTrace linkLabelTrace = TraceFactory.eINSTANCE.createGenLinkLabelTrace();
-		linkLabelTrace.setVisualID(visualID);
-		linkTrace.getLinkLabelTraces().add(linkLabelTrace);
-		linkLabelTrace.setContext(label);
-		linkLabelTrace.setProcessed(true);
-		return visualID;
-	}
-
-	public int get(ToolGroup toolGroup) {
-		int visualID = getMatchingVID(toolGroup, myTraceModel.getToolGroupTraces());
-		if (visualID > -1) {
-			return visualID;
-		}
-		
-		visualID = getNextToolVID();
-		ToolGroupTrace toolGroupTrace = TraceFactory.eINSTANCE.createToolGroupTrace();
-		toolGroupTrace.setVisualID(visualID);
-		toolGroupTrace.setContext(toolGroup);
-		myTraceModel.getToolGroupTraces().add(toolGroupTrace);
-		toolGroupTrace.setProcessed(true);
-		return visualID;
-	}
-
-	private int getMatchingVID(Object context, Collection<? extends MatchingTrace> matchingTraces) {
-		for (MatchingTrace trace : matchingTraces) {
-			if (trace.isProcessed()) {
-				continue;
-			}
-			try {
-				Object result = trace.getQuery().evaluate(context);
-				if (result instanceof Boolean && ((Boolean) result).booleanValue()) {
-					trace.setProcessed(true);
-					return trace.getVisualID();
-				}
-			} catch (ParserException e) {
-				GmfTracePlugin.getInstance().logError("Error while parcing expression body from trace", e);
-			}
-		}
-		return -1;
-	}
-
-	private int getNextToolVID() {
-		if (++myToolGroupCount < CANVAS_COUNT_BASE) {
-			GmfTracePlugin.getInstance().logDebugInfo("New tool visualID issued: " + myToolGroupCount);
-			return myToolGroupCount;
-		}
-		return ++myOverflowCount;
-	}
-	
-	private int getNextTopNodeVID() {
-		if (++myTopNodeCount < CHILD_NODE_COUNT_BASE) {
-			GmfTracePlugin.getInstance().logDebugInfo("New top node visualID issued: " + myTopNodeCount);
-			return myTopNodeCount;
-		}
-		return ++myOverflowCount;
-	}
-	
-	private int getNextChildNodeVID() {
-		if (++myChildNodeCount < LINK_COUNT_BASE) {
-			GmfTracePlugin.getInstance().logDebugInfo("New child node visualID issued: " + myChildNodeCount);
-			return myChildNodeCount;
-		}
-		return ++myOverflowCount;
-	}
-	
-	private int getNextLinkVID() {
-		if (++myLinkCount < NODE_LABEL_COUNT_BASE) {
-			GmfTracePlugin.getInstance().logDebugInfo("New link visualID issued: " + myLinkCount);
-			return myLinkCount;
-		}
-		return ++myOverflowCount;
-	}
-	
-	private int getNextNodeLabelVID() {
-		if (++myNodeLabelCount < LINK_LABEL_COUNT_BASE) {
-			GmfTracePlugin.getInstance().logDebugInfo("New node label visualID issued: " + myNodeLabelCount);
-			return myNodeLabelCount;
-		}
-		return ++myOverflowCount;
-	}
-	
-	private int getNextLinkLabelVID() {
-		if (++myLinkLabelCount < COMPARTMENT_COUNT_BASE) {
-			GmfTracePlugin.getInstance().logDebugInfo("New link label visualID issued: " + myLinkLabelCount);
-			return myLinkLabelCount;
-		}
-		return ++myOverflowCount;
-	}
-	
-	private int getNextCompartmentVID() {
-		if (++myCompartmentCount < OVERFLOW_COUNT_BASE) {
-			GmfTracePlugin.getInstance().logDebugInfo("New compartment visualID issued: " + myCompartmentCount);
-			return myCompartmentCount;
-		}
-		return ++myOverflowCount;
-	}
-
-}
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/ToolGroupTrace.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/ToolGroupTrace.java
deleted file mode 100644
index 5a96962a71f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/ToolGroupTrace.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroup;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool Group Trace</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getToolGroupTrace()
- * @model
- * @generated
- */
-public interface ToolGroupTrace extends MatchingTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setContext(ToolGroup toolGroup);
-
-} // ToolGroupTrace
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TraceFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TraceFactory.java
deleted file mode 100644
index 2107262b399..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TraceFactory.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage
- * @generated
- */
-public interface TraceFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TraceFactory eINSTANCE = org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Model</em>'.
-	 * @generated
-	 */
-	TraceModel createTraceModel();
-
-	/**
-	 * Returns a new object of class '<em>Gen Node Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Gen Node Trace</em>'.
-	 * @generated
-	 */
-	GenNodeTrace createGenNodeTrace();
-
-	/**
-	 * Returns a new object of class '<em>Gen Child Node Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Gen Child Node Trace</em>'.
-	 * @generated
-	 */
-	GenChildNodeTrace createGenChildNodeTrace();
-
-	/**
-	 * Returns a new object of class '<em>Gen Node Label Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Gen Node Label Trace</em>'.
-	 * @generated
-	 */
-	GenNodeLabelTrace createGenNodeLabelTrace();
-
-	/**
-	 * Returns a new object of class '<em>Gen Link Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Gen Link Trace</em>'.
-	 * @generated
-	 */
-	GenLinkTrace createGenLinkTrace();
-
-	/**
-	 * Returns a new object of class '<em>Gen Compartment Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Gen Compartment Trace</em>'.
-	 * @generated
-	 */
-	GenCompartmentTrace createGenCompartmentTrace();
-
-	/**
-	 * Returns a new object of class '<em>Gen Link Label Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Gen Link Label Trace</em>'.
-	 * @generated
-	 */
-	GenLinkLabelTrace createGenLinkLabelTrace();
-
-	/**
-	 * Returns a new object of class '<em>Tool Group Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tool Group Trace</em>'.
-	 * @generated
-	 */
-	ToolGroupTrace createToolGroupTrace();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	TracePackage getTracePackage();
-
-} //TraceFactory
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TraceModel.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TraceModel.java
deleted file mode 100644
index acf81498c4b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TraceModel.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getNodeTraces <em>Node Traces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getChildNodeTraces <em>Child Node Traces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getLinkTraces <em>Link Traces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getToolGroupTraces <em>Tool Group Traces</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getTraceModel()
- * @model
- * @generated
- */
-public interface TraceModel extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Node Traces</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Node Traces</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Node Traces</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getTraceModel_NodeTraces()
-	 * @model type="org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace" containment="true"
-	 * @generated
-	 */
-	EList<GenNodeTrace> getNodeTraces();
-
-	/**
-	 * Returns the value of the '<em><b>Child Node Traces</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Child Node Traces</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Child Node Traces</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getTraceModel_ChildNodeTraces()
-	 * @model type="org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace" containment="true"
-	 * @generated
-	 */
-	EList<GenChildNodeTrace> getChildNodeTraces();
-
-	/**
-	 * Returns the value of the '<em><b>Link Traces</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link Traces</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Link Traces</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getTraceModel_LinkTraces()
-	 * @model type="org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace" containment="true"
-	 * @generated
-	 */
-	EList<GenLinkTrace> getLinkTraces();
-
-	/**
-	 * Returns the value of the '<em><b>Tool Group Traces</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Group Traces</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Group Traces</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#getTraceModel_ToolGroupTraces()
-	 * @model type="org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace" containment="true"
-	 * @generated
-	 */
-	EList<ToolGroupTrace> getToolGroupTraces();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	GenNodeTrace getNodeTrace(int visualID);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	GenLinkTrace getLinkTrace(int visualID);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation" type="org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace"
-	 * @generated
-	 */
-	EList<AbstractTrace> getAllAbstractTraces();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void purgeUnprocessedTraces();
-
-} // TraceModel
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TracePackage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TracePackage.java
deleted file mode 100644
index bcb0a58e23c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/TracePackage.java
+++ /dev/null
@@ -1,996 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TraceFactory
- * @model kind="package"
- * @generated
- */
-public interface TracePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "trace";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/gmf/2020/Trace";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "trace";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	TracePackage eINSTANCE = org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceModelImpl <em>Model</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceModelImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getTraceModel()
-	 * @generated
-	 */
-	int TRACE_MODEL = 0;
-
-	/**
-	 * The feature id for the '<em><b>Node Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRACE_MODEL__NODE_TRACES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Child Node Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRACE_MODEL__CHILD_NODE_TRACES = 1;
-
-	/**
-	 * The feature id for the '<em><b>Link Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRACE_MODEL__LINK_TRACES = 2;
-
-	/**
-	 * The feature id for the '<em><b>Tool Group Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRACE_MODEL__TOOL_GROUP_TRACES = 3;
-
-	/**
-	 * The number of structural features of the '<em>Model</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TRACE_MODEL_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.AbstractTraceImpl <em>Abstract Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.AbstractTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getAbstractTrace()
-	 * @generated
-	 */
-	int ABSTRACT_TRACE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TRACE__VISUAL_ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TRACE__PROCESSED = 1;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TRACE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.MatchingTraceImpl <em>Matching Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.MatchingTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getMatchingTrace()
-	 * @generated
-	 */
-	int MATCHING_TRACE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCHING_TRACE__VISUAL_ID = ABSTRACT_TRACE__VISUAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCHING_TRACE__PROCESSED = ABSTRACT_TRACE__PROCESSED;
-
-	/**
-	 * The feature id for the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCHING_TRACE__QUERY_TEXT = ABSTRACT_TRACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Matching Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MATCHING_TRACE_FEATURE_COUNT = ABSTRACT_TRACE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeTraceImpl <em>Gen Node Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenNodeTrace()
-	 * @generated
-	 */
-	int GEN_NODE_TRACE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_TRACE__VISUAL_ID = MATCHING_TRACE__VISUAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_TRACE__PROCESSED = MATCHING_TRACE__PROCESSED;
-
-	/**
-	 * The feature id for the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_TRACE__QUERY_TEXT = MATCHING_TRACE__QUERY_TEXT;
-
-	/**
-	 * The feature id for the '<em><b>Node Label Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_TRACE__NODE_LABEL_TRACES = MATCHING_TRACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Compartment Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_TRACE__COMPARTMENT_TRACES = MATCHING_TRACE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Gen Node Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_TRACE_FEATURE_COUNT = MATCHING_TRACE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenChildNodeTraceImpl <em>Gen Child Node Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenChildNodeTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenChildNodeTrace()
-	 * @generated
-	 */
-	int GEN_CHILD_NODE_TRACE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_CHILD_NODE_TRACE__VISUAL_ID = GEN_NODE_TRACE__VISUAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_CHILD_NODE_TRACE__PROCESSED = GEN_NODE_TRACE__PROCESSED;
-
-	/**
-	 * The feature id for the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_CHILD_NODE_TRACE__QUERY_TEXT = GEN_NODE_TRACE__QUERY_TEXT;
-
-	/**
-	 * The feature id for the '<em><b>Node Label Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_CHILD_NODE_TRACE__NODE_LABEL_TRACES = GEN_NODE_TRACE__NODE_LABEL_TRACES;
-
-	/**
-	 * The feature id for the '<em><b>Compartment Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_CHILD_NODE_TRACE__COMPARTMENT_TRACES = GEN_NODE_TRACE__COMPARTMENT_TRACES;
-
-	/**
-	 * The number of structural features of the '<em>Gen Child Node Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_CHILD_NODE_TRACE_FEATURE_COUNT = GEN_NODE_TRACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeLabelTraceImpl <em>Gen Node Label Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeLabelTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenNodeLabelTrace()
-	 * @generated
-	 */
-	int GEN_NODE_LABEL_TRACE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_LABEL_TRACE__VISUAL_ID = MATCHING_TRACE__VISUAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_LABEL_TRACE__PROCESSED = MATCHING_TRACE__PROCESSED;
-
-	/**
-	 * The feature id for the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_LABEL_TRACE__QUERY_TEXT = MATCHING_TRACE__QUERY_TEXT;
-
-	/**
-	 * The number of structural features of the '<em>Gen Node Label Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_NODE_LABEL_TRACE_FEATURE_COUNT = MATCHING_TRACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkTraceImpl <em>Gen Link Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenLinkTrace()
-	 * @generated
-	 */
-	int GEN_LINK_TRACE = 6;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_TRACE__VISUAL_ID = MATCHING_TRACE__VISUAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_TRACE__PROCESSED = MATCHING_TRACE__PROCESSED;
-
-	/**
-	 * The feature id for the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_TRACE__QUERY_TEXT = MATCHING_TRACE__QUERY_TEXT;
-
-	/**
-	 * The feature id for the '<em><b>Link Label Traces</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_TRACE__LINK_LABEL_TRACES = MATCHING_TRACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Gen Link Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_TRACE_FEATURE_COUNT = MATCHING_TRACE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenCompartmentTraceImpl <em>Gen Compartment Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenCompartmentTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenCompartmentTrace()
-	 * @generated
-	 */
-	int GEN_COMPARTMENT_TRACE = 7;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_COMPARTMENT_TRACE__VISUAL_ID = MATCHING_TRACE__VISUAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_COMPARTMENT_TRACE__PROCESSED = MATCHING_TRACE__PROCESSED;
-
-	/**
-	 * The feature id for the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_COMPARTMENT_TRACE__QUERY_TEXT = MATCHING_TRACE__QUERY_TEXT;
-
-	/**
-	 * The number of structural features of the '<em>Gen Compartment Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_COMPARTMENT_TRACE_FEATURE_COUNT = MATCHING_TRACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkLabelTraceImpl <em>Gen Link Label Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkLabelTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenLinkLabelTrace()
-	 * @generated
-	 */
-	int GEN_LINK_LABEL_TRACE = 8;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_LABEL_TRACE__VISUAL_ID = MATCHING_TRACE__VISUAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_LABEL_TRACE__PROCESSED = MATCHING_TRACE__PROCESSED;
-
-	/**
-	 * The feature id for the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_LABEL_TRACE__QUERY_TEXT = MATCHING_TRACE__QUERY_TEXT;
-
-	/**
-	 * The number of structural features of the '<em>Gen Link Label Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GEN_LINK_LABEL_TRACE_FEATURE_COUNT = MATCHING_TRACE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.ToolGroupTraceImpl <em>Tool Group Trace</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.ToolGroupTraceImpl
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getToolGroupTrace()
-	 * @generated
-	 */
-	int TOOL_GROUP_TRACE = 9;
-
-	/**
-	 * The feature id for the '<em><b>Visual ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP_TRACE__VISUAL_ID = MATCHING_TRACE__VISUAL_ID;
-
-	/**
-	 * The feature id for the '<em><b>Processed</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP_TRACE__PROCESSED = MATCHING_TRACE__PROCESSED;
-
-	/**
-	 * The feature id for the '<em><b>Query Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP_TRACE__QUERY_TEXT = MATCHING_TRACE__QUERY_TEXT;
-
-	/**
-	 * The number of structural features of the '<em>Tool Group Trace</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP_TRACE_FEATURE_COUNT = MATCHING_TRACE_FEATURE_COUNT + 0;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel <em>Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Model</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel
-	 * @generated
-	 */
-	EClass getTraceModel();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getNodeTraces <em>Node Traces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Node Traces</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getNodeTraces()
-	 * @see #getTraceModel()
-	 * @generated
-	 */
-	EReference getTraceModel_NodeTraces();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getChildNodeTraces <em>Child Node Traces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Child Node Traces</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getChildNodeTraces()
-	 * @see #getTraceModel()
-	 * @generated
-	 */
-	EReference getTraceModel_ChildNodeTraces();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getLinkTraces <em>Link Traces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Link Traces</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getLinkTraces()
-	 * @see #getTraceModel()
-	 * @generated
-	 */
-	EReference getTraceModel_LinkTraces();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getToolGroupTraces <em>Tool Group Traces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tool Group Traces</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel#getToolGroupTraces()
-	 * @see #getTraceModel()
-	 * @generated
-	 */
-	EReference getTraceModel_ToolGroupTraces();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace <em>Abstract Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace
-	 * @generated
-	 */
-	EClass getAbstractTrace();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace#getVisualID <em>Visual ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Visual ID</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace#getVisualID()
-	 * @see #getAbstractTrace()
-	 * @generated
-	 */
-	EAttribute getAbstractTrace_VisualID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace#isProcessed <em>Processed</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Processed</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace#isProcessed()
-	 * @see #getAbstractTrace()
-	 * @generated
-	 */
-	EAttribute getAbstractTrace_Processed();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace <em>Matching Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Matching Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace
-	 * @generated
-	 */
-	EClass getMatchingTrace();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace#getQueryText <em>Query Text</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Query Text</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace#getQueryText()
-	 * @see #getMatchingTrace()
-	 * @generated
-	 */
-	EAttribute getMatchingTrace_QueryText();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace <em>Gen Node Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Gen Node Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace
-	 * @generated
-	 */
-	EClass getGenNodeTrace();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace#getNodeLabelTraces <em>Node Label Traces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Node Label Traces</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace#getNodeLabelTraces()
-	 * @see #getGenNodeTrace()
-	 * @generated
-	 */
-	EReference getGenNodeTrace_NodeLabelTraces();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace#getCompartmentTraces <em>Compartment Traces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Compartment Traces</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace#getCompartmentTraces()
-	 * @see #getGenNodeTrace()
-	 * @generated
-	 */
-	EReference getGenNodeTrace_CompartmentTraces();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace <em>Gen Child Node Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Gen Child Node Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace
-	 * @generated
-	 */
-	EClass getGenChildNodeTrace();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace <em>Gen Node Label Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Gen Node Label Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace
-	 * @generated
-	 */
-	EClass getGenNodeLabelTrace();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace <em>Gen Link Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Gen Link Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace
-	 * @generated
-	 */
-	EClass getGenLinkTrace();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace#getLinkLabelTraces <em>Link Label Traces</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Link Label Traces</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace#getLinkLabelTraces()
-	 * @see #getGenLinkTrace()
-	 * @generated
-	 */
-	EReference getGenLinkTrace_LinkLabelTraces();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace <em>Gen Compartment Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Gen Compartment Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace
-	 * @generated
-	 */
-	EClass getGenCompartmentTrace();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace <em>Gen Link Label Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Gen Link Label Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace
-	 * @generated
-	 */
-	EClass getGenLinkLabelTrace();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace <em>Tool Group Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool Group Trace</em>'.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace
-	 * @generated
-	 */
-	EClass getToolGroupTrace();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	TraceFactory getTraceFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceModelImpl <em>Model</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceModelImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getTraceModel()
-		 * @generated
-		 */
-		EClass TRACE_MODEL = eINSTANCE.getTraceModel();
-
-		/**
-		 * The meta object literal for the '<em><b>Node Traces</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TRACE_MODEL__NODE_TRACES = eINSTANCE.getTraceModel_NodeTraces();
-
-		/**
-		 * The meta object literal for the '<em><b>Child Node Traces</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TRACE_MODEL__CHILD_NODE_TRACES = eINSTANCE.getTraceModel_ChildNodeTraces();
-
-		/**
-		 * The meta object literal for the '<em><b>Link Traces</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TRACE_MODEL__LINK_TRACES = eINSTANCE.getTraceModel_LinkTraces();
-
-		/**
-		 * The meta object literal for the '<em><b>Tool Group Traces</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference TRACE_MODEL__TOOL_GROUP_TRACES = eINSTANCE.getTraceModel_ToolGroupTraces();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.AbstractTraceImpl <em>Abstract Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.AbstractTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getAbstractTrace()
-		 * @generated
-		 */
-		EClass ABSTRACT_TRACE = eINSTANCE.getAbstractTrace();
-
-		/**
-		 * The meta object literal for the '<em><b>Visual ID</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ABSTRACT_TRACE__VISUAL_ID = eINSTANCE.getAbstractTrace_VisualID();
-
-		/**
-		 * The meta object literal for the '<em><b>Processed</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ABSTRACT_TRACE__PROCESSED = eINSTANCE.getAbstractTrace_Processed();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.MatchingTraceImpl <em>Matching Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.MatchingTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getMatchingTrace()
-		 * @generated
-		 */
-		EClass MATCHING_TRACE = eINSTANCE.getMatchingTrace();
-
-		/**
-		 * The meta object literal for the '<em><b>Query Text</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute MATCHING_TRACE__QUERY_TEXT = eINSTANCE.getMatchingTrace_QueryText();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeTraceImpl <em>Gen Node Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenNodeTrace()
-		 * @generated
-		 */
-		EClass GEN_NODE_TRACE = eINSTANCE.getGenNodeTrace();
-
-		/**
-		 * The meta object literal for the '<em><b>Node Label Traces</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GEN_NODE_TRACE__NODE_LABEL_TRACES = eINSTANCE.getGenNodeTrace_NodeLabelTraces();
-
-		/**
-		 * The meta object literal for the '<em><b>Compartment Traces</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GEN_NODE_TRACE__COMPARTMENT_TRACES = eINSTANCE.getGenNodeTrace_CompartmentTraces();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenChildNodeTraceImpl <em>Gen Child Node Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenChildNodeTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenChildNodeTrace()
-		 * @generated
-		 */
-		EClass GEN_CHILD_NODE_TRACE = eINSTANCE.getGenChildNodeTrace();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeLabelTraceImpl <em>Gen Node Label Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeLabelTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenNodeLabelTrace()
-		 * @generated
-		 */
-		EClass GEN_NODE_LABEL_TRACE = eINSTANCE.getGenNodeLabelTrace();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkTraceImpl <em>Gen Link Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenLinkTrace()
-		 * @generated
-		 */
-		EClass GEN_LINK_TRACE = eINSTANCE.getGenLinkTrace();
-
-		/**
-		 * The meta object literal for the '<em><b>Link Label Traces</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference GEN_LINK_TRACE__LINK_LABEL_TRACES = eINSTANCE.getGenLinkTrace_LinkLabelTraces();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenCompartmentTraceImpl <em>Gen Compartment Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenCompartmentTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenCompartmentTrace()
-		 * @generated
-		 */
-		EClass GEN_COMPARTMENT_TRACE = eINSTANCE.getGenCompartmentTrace();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkLabelTraceImpl <em>Gen Link Label Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkLabelTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getGenLinkLabelTrace()
-		 * @generated
-		 */
-		EClass GEN_LINK_LABEL_TRACE = eINSTANCE.getGenLinkLabelTrace();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.ToolGroupTraceImpl <em>Tool Group Trace</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.ToolGroupTraceImpl
-		 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TracePackageImpl#getToolGroupTrace()
-		 * @generated
-		 */
-		EClass TOOL_GROUP_TRACE = eINSTANCE.getToolGroupTrace();
-
-	}
-
-} //TracePackage
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/AbstractTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/AbstractTraceImpl.java
deleted file mode 100644
index 33f3a6ee470..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/AbstractTraceImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.AbstractTraceImpl#getVisualID <em>Visual ID</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.AbstractTraceImpl#isProcessed <em>Processed</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractTraceImpl extends EObjectImpl implements AbstractTrace {
-	/**
-	 * The default value of the '{@link #getVisualID() <em>Visual ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVisualID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int VISUAL_ID_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getVisualID() <em>Visual ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVisualID()
-	 * @generated
-	 * @ordered
-	 */
-	protected int visualID = VISUAL_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isProcessed() <em>Processed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isProcessed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean PROCESSED_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isProcessed() <em>Processed</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isProcessed()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean processed = PROCESSED_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.ABSTRACT_TRACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getVisualID() {
-		return visualID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVisualID(int newVisualID) {
-		int oldVisualID = visualID;
-		visualID = newVisualID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.ABSTRACT_TRACE__VISUAL_ID, oldVisualID, visualID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isProcessed() {
-		return processed;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setProcessed(boolean newProcessed) {
-		boolean oldProcessed = processed;
-		processed = newProcessed;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.ABSTRACT_TRACE__PROCESSED, oldProcessed, processed));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TracePackage.ABSTRACT_TRACE__VISUAL_ID:
-				return new Integer(getVisualID());
-			case TracePackage.ABSTRACT_TRACE__PROCESSED:
-				return isProcessed() ? Boolean.TRUE : Boolean.FALSE;
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TracePackage.ABSTRACT_TRACE__VISUAL_ID:
-				setVisualID(((Integer)newValue).intValue());
-				return;
-			case TracePackage.ABSTRACT_TRACE__PROCESSED:
-				setProcessed(((Boolean)newValue).booleanValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TracePackage.ABSTRACT_TRACE__VISUAL_ID:
-				setVisualID(VISUAL_ID_EDEFAULT);
-				return;
-			case TracePackage.ABSTRACT_TRACE__PROCESSED:
-				setProcessed(PROCESSED_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TracePackage.ABSTRACT_TRACE__VISUAL_ID:
-				return visualID != VISUAL_ID_EDEFAULT;
-			case TracePackage.ABSTRACT_TRACE__PROCESSED:
-				return processed != PROCESSED_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (visualID: ");
-		result.append(visualID);
-		result.append(", processed: ");
-		result.append(processed);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AbstractTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenChildNodeTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenChildNodeTraceImpl.java
deleted file mode 100644
index c683cc3c848..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenChildNodeTraceImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gen Child Node Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GenChildNodeTraceImpl extends GenNodeTraceImpl implements GenChildNodeTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenChildNodeTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.GEN_CHILD_NODE_TRACE;
-	}
-
-} //GenChildNodeTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenCompartmentTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenCompartmentTraceImpl.java
deleted file mode 100644
index d26a6b2ba97..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenCompartmentTraceImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gen Compartment Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GenCompartmentTraceImpl extends MatchingTraceImpl implements GenCompartmentTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenCompartmentTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.GEN_COMPARTMENT_TRACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setContext(GenCompartment genCompartment) {
-		setQueryText("true");
-	}
-	
-	public EClass getQueryContext() {
-		return GMFGenPackage.eINSTANCE.getGenCompartment();
-	}
-	
-} //GenCompartmentTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenLinkLabelTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenLinkLabelTraceImpl.java
deleted file mode 100644
index 36333b842d7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenLinkLabelTraceImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gen Link Label Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GenLinkLabelTraceImpl extends MatchingTraceImpl implements GenLinkLabelTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenLinkLabelTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.GEN_LINK_LABEL_TRACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setContext(GenLinkLabel genLinkLabel) {
-		setQueryText("true");
-	}
-	
-	public EClass getQueryContext() {
-		return GMFGenPackage.eINSTANCE.getGenLinkLabel();
-	}
-
-} //GenLinkLabelTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenLinkTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenLinkTraceImpl.java
deleted file mode 100644
index f20ea69e3a9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenLinkTraceImpl.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FeatureLinkModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.TypeLinkModelFacet;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gen Link Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenLinkTraceImpl#getLinkLabelTraces <em>Link Label Traces</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GenLinkTraceImpl extends MatchingTraceImpl implements GenLinkTrace {
-	/**
-	 * The cached value of the '{@link #getLinkLabelTraces() <em>Link Label Traces</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkLabelTraces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<GenLinkLabelTrace> linkLabelTraces;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenLinkTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.GEN_LINK_TRACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<GenLinkLabelTrace> getLinkLabelTraces() {
-		if (linkLabelTraces == null) {
-			linkLabelTraces = new EObjectContainmentEList<GenLinkLabelTrace>(GenLinkLabelTrace.class, this, TracePackage.GEN_LINK_TRACE__LINK_LABEL_TRACES);
-		}
-		return linkLabelTraces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setContext(GenLink genLink) {
-		StringBuffer result = new StringBuffer();
-		if (genLink.getModelFacet() instanceof FeatureLinkModelFacet) {
-			EStructuralFeature feature = ((FeatureLinkModelFacet) genLink.getModelFacet()).getMetaFeature().getEcoreFeature();
-			result.append("modelFacet.oclIsKindOf(gmfgen::FeatureLinkModelFacet) and ");
-			result.append("(let _feature_:ecore::EStructuralFeature = modelFacet.oclAsType(gmfgen::FeatureLinkModelFacet).metaFeature.ecoreFeature in ");
-			result.append(getEStructuralFeatureComparison("_feature_", feature));
-			result.append(")");
-		} else if (genLink.getModelFacet() instanceof TypeLinkModelFacet) {
-			EClass eClass = ((TypeLinkModelFacet) genLink.getModelFacet()).getMetaClass().getEcoreClass();
-			result.append("modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet) and ");
-			result.append("(let _eClass_:ecore::EClass = modelFacet.oclAsType(gmfgen::TypeLinkModelFacet).metaClass.ecoreClass in ");
-			result.append(getEClassComparision("_eClass_", eClass));
-			result.append(")");
-		} else if (genLink.getModelFacet() == null) {
-			result.append("modelFacet = null");
-		} else {
-			throw new IllegalArgumentException("Incorrect gen link passed - Feature/TypeLinkModelFacet should be used");			
-		}
-		setQueryText(result.toString());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TracePackage.GEN_LINK_TRACE__LINK_LABEL_TRACES:
-				return ((InternalEList<?>)getLinkLabelTraces()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TracePackage.GEN_LINK_TRACE__LINK_LABEL_TRACES:
-				return getLinkLabelTraces();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TracePackage.GEN_LINK_TRACE__LINK_LABEL_TRACES:
-				getLinkLabelTraces().clear();
-				getLinkLabelTraces().addAll((Collection<? extends GenLinkLabelTrace>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TracePackage.GEN_LINK_TRACE__LINK_LABEL_TRACES:
-				getLinkLabelTraces().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TracePackage.GEN_LINK_TRACE__LINK_LABEL_TRACES:
-				return linkLabelTraces != null && !linkLabelTraces.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-	
-	public EClass getQueryContext() {
-		return GMFGenPackage.eINSTANCE.getGenLink();
-	}
-	
-} //GenLinkTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenNodeLabelTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenNodeLabelTraceImpl.java
deleted file mode 100644
index 3ff1a0d99a9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenNodeLabelTraceImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gen Node Label Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GenNodeLabelTraceImpl extends MatchingTraceImpl implements GenNodeLabelTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenNodeLabelTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.GEN_NODE_LABEL_TRACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setContext(GenNodeLabel genNodeLabel) {
-		setQueryText("true");
-	}
-	
-	public EClass getQueryContext() {
-		return GMFGenPackage.eINSTANCE.getGenNodeLabel();
-	}
-	
-} //GenNodeLabelTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenNodeTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenNodeTraceImpl.java
deleted file mode 100644
index 4b376957969..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/GenNodeTraceImpl.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.TypeModelFacet;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gen Node Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeTraceImpl#getNodeLabelTraces <em>Node Label Traces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.GenNodeTraceImpl#getCompartmentTraces <em>Compartment Traces</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GenNodeTraceImpl extends MatchingTraceImpl implements GenNodeTrace {
-	/**
-	 * The cached value of the '{@link #getNodeLabelTraces() <em>Node Label Traces</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNodeLabelTraces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<GenNodeLabelTrace> nodeLabelTraces;
-
-	/**
-	 * The cached value of the '{@link #getCompartmentTraces() <em>Compartment Traces</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompartmentTraces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<GenCompartmentTrace> compartmentTraces;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenNodeTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.GEN_NODE_TRACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<GenNodeLabelTrace> getNodeLabelTraces() {
-		if (nodeLabelTraces == null) {
-			nodeLabelTraces = new EObjectContainmentEList<GenNodeLabelTrace>(GenNodeLabelTrace.class, this, TracePackage.GEN_NODE_TRACE__NODE_LABEL_TRACES);
-		}
-		return nodeLabelTraces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<GenCompartmentTrace> getCompartmentTraces() {
-		if (compartmentTraces == null) {
-			compartmentTraces = new EObjectContainmentEList<GenCompartmentTrace>(GenCompartmentTrace.class, this, TracePackage.GEN_NODE_TRACE__COMPARTMENT_TRACES);
-		}
-		return compartmentTraces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setContext(GenNode genNode) {
-		StringBuffer query = new StringBuffer();
-		if (genNode.getModelFacet() != null) {
-			TypeModelFacet modelFacet = genNode.getModelFacet();
-			query.append("let _eClass_:ecore::EClass = modelFacet.metaClass.ecoreClass in ");
-			query.append(getEClassComparision("_eClass_", modelFacet.getMetaClass().getEcoreClass()));
-			if (modelFacet.getContainmentMetaFeature() != null) {
-				query.insert(0, "(");
-				query.append(") and (let _containmentMF_:ecore::EStructuralFeature = modelFacet.containmentMetaFeature.ecoreFeature in ");
-				query.append(getEStructuralFeatureComparison("_containmentMF_", modelFacet.getContainmentMetaFeature().getEcoreFeature()));
-				query.append(")");
-				if (modelFacet.getContainmentMetaFeature() != modelFacet.getChildMetaFeature()) {
-					query.append(" and ( let _childMF_:ecore::EStructuralFeature = modelFacet.childMetaFeature.ecoreFeature in ");
-					query.append(getEStructuralFeatureComparison("_childMF_", modelFacet.getChildMetaFeature().getEcoreFeature()));
-					query.append(")");
-				}
-			}
-		} else {
-			query.append("modelFacet = null");
-		}
-		setQueryText(query.toString());
-	}
-	
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TracePackage.GEN_NODE_TRACE__NODE_LABEL_TRACES:
-				return ((InternalEList<?>)getNodeLabelTraces()).basicRemove(otherEnd, msgs);
-			case TracePackage.GEN_NODE_TRACE__COMPARTMENT_TRACES:
-				return ((InternalEList<?>)getCompartmentTraces()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TracePackage.GEN_NODE_TRACE__NODE_LABEL_TRACES:
-				return getNodeLabelTraces();
-			case TracePackage.GEN_NODE_TRACE__COMPARTMENT_TRACES:
-				return getCompartmentTraces();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TracePackage.GEN_NODE_TRACE__NODE_LABEL_TRACES:
-				getNodeLabelTraces().clear();
-				getNodeLabelTraces().addAll((Collection<? extends GenNodeLabelTrace>)newValue);
-				return;
-			case TracePackage.GEN_NODE_TRACE__COMPARTMENT_TRACES:
-				getCompartmentTraces().clear();
-				getCompartmentTraces().addAll((Collection<? extends GenCompartmentTrace>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TracePackage.GEN_NODE_TRACE__NODE_LABEL_TRACES:
-				getNodeLabelTraces().clear();
-				return;
-			case TracePackage.GEN_NODE_TRACE__COMPARTMENT_TRACES:
-				getCompartmentTraces().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TracePackage.GEN_NODE_TRACE__NODE_LABEL_TRACES:
-				return nodeLabelTraces != null && !nodeLabelTraces.isEmpty();
-			case TracePackage.GEN_NODE_TRACE__COMPARTMENT_TRACES:
-				return compartmentTraces != null && !compartmentTraces.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-	
-	public EClass getQueryContext() {
-		return GMFGenPackage.eINSTANCE.getGenTopLevelNode();
-	}
-	
-} //GenNodeTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/MatchingTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/MatchingTraceImpl.java
deleted file mode 100644
index 63c6623b352..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/MatchingTraceImpl.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.ocl.ParserException;
-import org.eclipse.ocl.ecore.OCL;
-import org.eclipse.ocl.ecore.OCL.Helper;
-import org.eclipse.ocl.ecore.OCL.Query;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Matching Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.MatchingTraceImpl#getQueryText <em>Query Text</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MatchingTraceImpl extends AbstractTraceImpl implements MatchingTrace {
-	/**
-	 * The default value of the '{@link #getQueryText() <em>Query Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueryText()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUERY_TEXT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQueryText() <em>Query Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQueryText()
-	 * @generated
-	 * @ordered
-	 */
-	protected String queryText = QUERY_TEXT_EDEFAULT;
-
-	protected Query query;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MatchingTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.MATCHING_TRACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getQueryText() {
-		return queryText;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setQueryText(String newQueryText) {
-		String oldQueryText = queryText;
-		queryText = newQueryText;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, TracePackage.MATCHING_TRACE__QUERY_TEXT, oldQueryText, queryText));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public abstract EClass getQueryContext();
-
-	public Query getQuery() throws ParserException {
-		if (query == null) {
-			query = createQuery();
-		}
-		return query;
-	}
-	
-	private Query createQuery() throws ParserException {
-		OCL ocl = OCL.newInstance();
-		Helper oclHelper = ocl.createOCLHelper();
-		oclHelper.setContext(getQueryContext());
-		return ocl.createQuery(oclHelper.createQuery(getQueryText()));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getEClassComparision(String varName, EClass eClass) {
-		StringBuffer result = new StringBuffer();
-		result.append(varName);
-		result.append(".ePackage.nsURI = '");
-		result.append(eClass.getEPackage().getNsURI());
-		result.append("' and ");
-		result.append(varName);
-		result.append(".name = '");
-		result.append(eClass.getName());
-		result.append("'");
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getEStructuralFeatureComparison(String varName, EStructuralFeature feature) {
-		StringBuffer result = new StringBuffer();
-		result.append("(let _eClass_:ecore::EClass = ");
-		result.append(varName);
-		result.append(".eContainingClass in ");
-		result.append(getEClassComparision("_eClass_", feature.getEContainingClass()));
-		result.append(") and ");
-		result.append(varName);
-		result.append(".name = '");
-		result.append(feature.getName());
-		result.append("'");
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TracePackage.MATCHING_TRACE__QUERY_TEXT:
-				return getQueryText();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TracePackage.MATCHING_TRACE__QUERY_TEXT:
-				setQueryText((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TracePackage.MATCHING_TRACE__QUERY_TEXT:
-				setQueryText(QUERY_TEXT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TracePackage.MATCHING_TRACE__QUERY_TEXT:
-				return QUERY_TEXT_EDEFAULT == null ? queryText != null : !QUERY_TEXT_EDEFAULT.equals(queryText);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (queryText: ");
-		result.append(queryText);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MatchingTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/ToolGroupTraceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/ToolGroupTraceImpl.java
deleted file mode 100644
index 66396a21dbc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/ToolGroupTraceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroup;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tool Group Trace</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ToolGroupTraceImpl extends MatchingTraceImpl implements ToolGroupTrace {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolGroupTraceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.TOOL_GROUP_TRACE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContext(ToolGroup toolGroup) {
-		// TODO: implement this method
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new UnsupportedOperationException();
-	}
-	
-	public EClass getQueryContext() {
-		return GMFGenPackage.eINSTANCE.getToolGroup();
-	}
-
-} //ToolGroupTraceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TraceFactoryImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TraceFactoryImpl.java
deleted file mode 100644
index 52287e6cf7b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TraceFactoryImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TraceFactory;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TraceFactoryImpl extends EFactoryImpl implements TraceFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static TraceFactory init() {
-		try {
-			TraceFactory theTraceFactory = (TraceFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/gmf/2020/Trace"); 
-			if (theTraceFactory != null) {
-				return theTraceFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new TraceFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TraceFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case TracePackage.TRACE_MODEL: return createTraceModel();
-			case TracePackage.GEN_NODE_TRACE: return createGenNodeTrace();
-			case TracePackage.GEN_CHILD_NODE_TRACE: return createGenChildNodeTrace();
-			case TracePackage.GEN_NODE_LABEL_TRACE: return createGenNodeLabelTrace();
-			case TracePackage.GEN_LINK_TRACE: return createGenLinkTrace();
-			case TracePackage.GEN_COMPARTMENT_TRACE: return createGenCompartmentTrace();
-			case TracePackage.GEN_LINK_LABEL_TRACE: return createGenLinkLabelTrace();
-			case TracePackage.TOOL_GROUP_TRACE: return createToolGroupTrace();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TraceModel createTraceModel() {
-		TraceModelImpl traceModel = new TraceModelImpl();
-		return traceModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenNodeTrace createGenNodeTrace() {
-		GenNodeTraceImpl genNodeTrace = new GenNodeTraceImpl();
-		return genNodeTrace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenChildNodeTrace createGenChildNodeTrace() {
-		GenChildNodeTraceImpl genChildNodeTrace = new GenChildNodeTraceImpl();
-		return genChildNodeTrace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenNodeLabelTrace createGenNodeLabelTrace() {
-		GenNodeLabelTraceImpl genNodeLabelTrace = new GenNodeLabelTraceImpl();
-		return genNodeLabelTrace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenLinkTrace createGenLinkTrace() {
-		GenLinkTraceImpl genLinkTrace = new GenLinkTraceImpl();
-		return genLinkTrace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenCompartmentTrace createGenCompartmentTrace() {
-		GenCompartmentTraceImpl genCompartmentTrace = new GenCompartmentTraceImpl();
-		return genCompartmentTrace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenLinkLabelTrace createGenLinkLabelTrace() {
-		GenLinkLabelTraceImpl genLinkLabelTrace = new GenLinkLabelTraceImpl();
-		return genLinkLabelTrace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolGroupTrace createToolGroupTrace() {
-		ToolGroupTraceImpl toolGroupTrace = new ToolGroupTraceImpl();
-		return toolGroupTrace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TracePackage getTracePackage() {
-		return (TracePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static TracePackage getPackage() {
-		return TracePackage.eINSTANCE;
-	}
-
-} //TraceFactoryImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TraceModelImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TraceModelImpl.java
deleted file mode 100644
index 1f94f80aae2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TraceModelImpl.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GmfTracePlugin;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Model</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceModelImpl#getNodeTraces <em>Node Traces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceModelImpl#getChildNodeTraces <em>Child Node Traces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceModelImpl#getLinkTraces <em>Link Traces</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.internal.bridge.trace.impl.TraceModelImpl#getToolGroupTraces <em>Tool Group Traces</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TraceModelImpl extends EObjectImpl implements TraceModel {
-	/**
-	 * The cached value of the '{@link #getNodeTraces() <em>Node Traces</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNodeTraces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<GenNodeTrace> nodeTraces;
-
-	/**
-	 * The cached value of the '{@link #getChildNodeTraces() <em>Child Node Traces</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildNodeTraces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<GenChildNodeTrace> childNodeTraces;
-
-	/**
-	 * The cached value of the '{@link #getLinkTraces() <em>Link Traces</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkTraces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<GenLinkTrace> linkTraces;
-
-	/**
-	 * The cached value of the '{@link #getToolGroupTraces() <em>Tool Group Traces</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolGroupTraces()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ToolGroupTrace> toolGroupTraces;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TraceModelImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return TracePackage.Literals.TRACE_MODEL;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<GenNodeTrace> getNodeTraces() {
-		if (nodeTraces == null) {
-			nodeTraces = new EObjectContainmentEList<GenNodeTrace>(GenNodeTrace.class, this, TracePackage.TRACE_MODEL__NODE_TRACES);
-		}
-		return nodeTraces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<GenChildNodeTrace> getChildNodeTraces() {
-		if (childNodeTraces == null) {
-			childNodeTraces = new EObjectContainmentEList<GenChildNodeTrace>(GenChildNodeTrace.class, this, TracePackage.TRACE_MODEL__CHILD_NODE_TRACES);
-		}
-		return childNodeTraces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<GenLinkTrace> getLinkTraces() {
-		if (linkTraces == null) {
-			linkTraces = new EObjectContainmentEList<GenLinkTrace>(GenLinkTrace.class, this, TracePackage.TRACE_MODEL__LINK_TRACES);
-		}
-		return linkTraces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ToolGroupTrace> getToolGroupTraces() {
-		if (toolGroupTraces == null) {
-			toolGroupTraces = new EObjectContainmentEList<ToolGroupTrace>(ToolGroupTrace.class, this, TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES);
-		}
-		return toolGroupTraces;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public GenNodeTrace getNodeTrace(int visualID) {
-		for (GenNodeTrace trace : getNodeTraces()) {
-			if (trace.getVisualID() == visualID) {
-				return trace;
-			}
-		}
-		for (GenChildNodeTrace trace : getChildNodeTraces()) {
-			if (trace.getVisualID() == visualID) {
-				return trace;
-			}
-		}
-
-		throw new IllegalArgumentException("Node trace with id = " + visualID + " was not found");
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public GenLinkTrace getLinkTrace(int visualID) {
-		for (GenLinkTrace trace : getLinkTraces()) {
-			if (trace.getVisualID() == visualID) {
-				return trace;
-			}
-		}
-		throw new IllegalArgumentException("Link trace with id = " + visualID + " was not found");
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public EList<AbstractTrace> getAllAbstractTraces() {
-		Collection<AbstractTrace> result = new ArrayList<AbstractTrace>();
-		result.addAll(getNodeTraces());
-		addNodeChildTraces(result, getNodeTraces());
-		
-		result.addAll(getChildNodeTraces());
-		addNodeChildTraces(result, getChildNodeTraces());
-		
-		result.addAll(getLinkTraces());
-		for (GenLinkTrace trace : getLinkTraces()) {
-			result.addAll(trace.getLinkLabelTraces());
-		}
-		
-		result.addAll(getToolGroupTraces());
-		return new BasicEList.UnmodifiableEList<AbstractTrace>(result.size(), result.toArray());
-	}
-	
-	private void addNodeChildTraces(Collection<AbstractTrace> collection, Collection<? extends GenNodeTrace> nodeTraces) {
-		for (GenNodeTrace trace : nodeTraces) {
-			collection.addAll(trace.getCompartmentTraces());
-			collection.addAll(trace.getNodeLabelTraces());
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void purgeUnprocessedTraces() {
-		for (AbstractTrace trace : getAllAbstractTraces()) {
-			if (trace.isProcessed()) {
-				continue;
-			}
-			GmfTracePlugin.getInstance().logDebugInfo("Removing unused trace with visual ID = " + trace.getVisualID());
-			switch (trace.eClass().getClassifierID()) {
-			case TracePackage.GEN_NODE_TRACE: 
-				getNodeTraces().remove(trace);
-				break;
-			case TracePackage.GEN_CHILD_NODE_TRACE: 
-				getChildNodeTraces().remove(trace);
-				break;
-			case TracePackage.GEN_LINK_TRACE: 
-				getLinkTraces().remove(trace);
-				break;
-			case TracePackage.TOOL_GROUP_TRACE: 
-				getToolGroupTraces().remove(trace);
-				break;
-			case TracePackage.GEN_NODE_LABEL_TRACE:
-				((GenNodeTrace) trace.eContainer()).getNodeLabelTraces().remove(trace);
-				break;
-			case TracePackage.GEN_COMPARTMENT_TRACE:
-				((GenNodeTrace) trace.eContainer()).getCompartmentTraces().remove(trace);
-				break;
-			case TracePackage.GEN_LINK_LABEL_TRACE:
-				((GenLinkTrace) trace.eContainer()).getLinkLabelTraces().remove(trace);
-				break;
-			}
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case TracePackage.TRACE_MODEL__NODE_TRACES:
-				return ((InternalEList<?>)getNodeTraces()).basicRemove(otherEnd, msgs);
-			case TracePackage.TRACE_MODEL__CHILD_NODE_TRACES:
-				return ((InternalEList<?>)getChildNodeTraces()).basicRemove(otherEnd, msgs);
-			case TracePackage.TRACE_MODEL__LINK_TRACES:
-				return ((InternalEList<?>)getLinkTraces()).basicRemove(otherEnd, msgs);
-			case TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES:
-				return ((InternalEList<?>)getToolGroupTraces()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case TracePackage.TRACE_MODEL__NODE_TRACES:
-				return getNodeTraces();
-			case TracePackage.TRACE_MODEL__CHILD_NODE_TRACES:
-				return getChildNodeTraces();
-			case TracePackage.TRACE_MODEL__LINK_TRACES:
-				return getLinkTraces();
-			case TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES:
-				return getToolGroupTraces();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case TracePackage.TRACE_MODEL__NODE_TRACES:
-				getNodeTraces().clear();
-				getNodeTraces().addAll((Collection<? extends GenNodeTrace>)newValue);
-				return;
-			case TracePackage.TRACE_MODEL__CHILD_NODE_TRACES:
-				getChildNodeTraces().clear();
-				getChildNodeTraces().addAll((Collection<? extends GenChildNodeTrace>)newValue);
-				return;
-			case TracePackage.TRACE_MODEL__LINK_TRACES:
-				getLinkTraces().clear();
-				getLinkTraces().addAll((Collection<? extends GenLinkTrace>)newValue);
-				return;
-			case TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES:
-				getToolGroupTraces().clear();
-				getToolGroupTraces().addAll((Collection<? extends ToolGroupTrace>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case TracePackage.TRACE_MODEL__NODE_TRACES:
-				getNodeTraces().clear();
-				return;
-			case TracePackage.TRACE_MODEL__CHILD_NODE_TRACES:
-				getChildNodeTraces().clear();
-				return;
-			case TracePackage.TRACE_MODEL__LINK_TRACES:
-				getLinkTraces().clear();
-				return;
-			case TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES:
-				getToolGroupTraces().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case TracePackage.TRACE_MODEL__NODE_TRACES:
-				return nodeTraces != null && !nodeTraces.isEmpty();
-			case TracePackage.TRACE_MODEL__CHILD_NODE_TRACES:
-				return childNodeTraces != null && !childNodeTraces.isEmpty();
-			case TracePackage.TRACE_MODEL__LINK_TRACES:
-				return linkTraces != null && !linkTraces.isEmpty();
-			case TracePackage.TRACE_MODEL__TOOL_GROUP_TRACES:
-				return toolGroupTraces != null && !toolGroupTraces.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //TraceModelImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TracePackageImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TracePackageImpl.java
deleted file mode 100644
index 52a5921d304..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/impl/TracePackageImpl.java
+++ /dev/null
@@ -1,547 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.impl;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenModelPackage;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TraceFactory;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class TracePackageImpl extends EPackageImpl implements TracePackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass traceModelEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractTraceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass matchingTraceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass genNodeTraceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass genChildNodeTraceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass genNodeLabelTraceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass genLinkTraceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass genCompartmentTraceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass genLinkLabelTraceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolGroupTraceEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private TracePackageImpl() {
-		super(eNS_URI, TraceFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static TracePackage init() {
-		if (isInited) return (TracePackage)EPackage.Registry.INSTANCE.getEPackage(TracePackage.eNS_URI);
-
-		// Obtain or create and register package
-		TracePackageImpl theTracePackage = (TracePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof TracePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new TracePackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		EcorePackage.eINSTANCE.eClass();
-		GenModelPackage.eINSTANCE.eClass();
-		GMFGenPackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theTracePackage.createPackageContents();
-
-		// Initialize created meta-data
-		theTracePackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theTracePackage.freeze();
-
-		return theTracePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTraceModel() {
-		return traceModelEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTraceModel_NodeTraces() {
-		return (EReference)traceModelEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTraceModel_ChildNodeTraces() {
-		return (EReference)traceModelEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTraceModel_LinkTraces() {
-		return (EReference)traceModelEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTraceModel_ToolGroupTraces() {
-		return (EReference)traceModelEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractTrace() {
-		return abstractTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractTrace_VisualID() {
-		return (EAttribute)abstractTraceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractTrace_Processed() {
-		return (EAttribute)abstractTraceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMatchingTrace() {
-		return matchingTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMatchingTrace_QueryText() {
-		return (EAttribute)matchingTraceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGenNodeTrace() {
-		return genNodeTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGenNodeTrace_NodeLabelTraces() {
-		return (EReference)genNodeTraceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGenNodeTrace_CompartmentTraces() {
-		return (EReference)genNodeTraceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGenChildNodeTrace() {
-		return genChildNodeTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGenNodeLabelTrace() {
-		return genNodeLabelTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGenLinkTrace() {
-		return genLinkTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGenLinkTrace_LinkLabelTraces() {
-		return (EReference)genLinkTraceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGenCompartmentTrace() {
-		return genCompartmentTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGenLinkLabelTrace() {
-		return genLinkLabelTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getToolGroupTrace() {
-		return toolGroupTraceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TraceFactory getTraceFactory() {
-		return (TraceFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		traceModelEClass = createEClass(TRACE_MODEL);
-		createEReference(traceModelEClass, TRACE_MODEL__NODE_TRACES);
-		createEReference(traceModelEClass, TRACE_MODEL__CHILD_NODE_TRACES);
-		createEReference(traceModelEClass, TRACE_MODEL__LINK_TRACES);
-		createEReference(traceModelEClass, TRACE_MODEL__TOOL_GROUP_TRACES);
-
-		abstractTraceEClass = createEClass(ABSTRACT_TRACE);
-		createEAttribute(abstractTraceEClass, ABSTRACT_TRACE__VISUAL_ID);
-		createEAttribute(abstractTraceEClass, ABSTRACT_TRACE__PROCESSED);
-
-		matchingTraceEClass = createEClass(MATCHING_TRACE);
-		createEAttribute(matchingTraceEClass, MATCHING_TRACE__QUERY_TEXT);
-
-		genNodeTraceEClass = createEClass(GEN_NODE_TRACE);
-		createEReference(genNodeTraceEClass, GEN_NODE_TRACE__NODE_LABEL_TRACES);
-		createEReference(genNodeTraceEClass, GEN_NODE_TRACE__COMPARTMENT_TRACES);
-
-		genChildNodeTraceEClass = createEClass(GEN_CHILD_NODE_TRACE);
-
-		genNodeLabelTraceEClass = createEClass(GEN_NODE_LABEL_TRACE);
-
-		genLinkTraceEClass = createEClass(GEN_LINK_TRACE);
-		createEReference(genLinkTraceEClass, GEN_LINK_TRACE__LINK_LABEL_TRACES);
-
-		genCompartmentTraceEClass = createEClass(GEN_COMPARTMENT_TRACE);
-
-		genLinkLabelTraceEClass = createEClass(GEN_LINK_LABEL_TRACE);
-
-		toolGroupTraceEClass = createEClass(TOOL_GROUP_TRACE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		GMFGenPackage theGMFGenPackage = (GMFGenPackage)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		matchingTraceEClass.getESuperTypes().add(this.getAbstractTrace());
-		genNodeTraceEClass.getESuperTypes().add(this.getMatchingTrace());
-		genChildNodeTraceEClass.getESuperTypes().add(this.getGenNodeTrace());
-		genNodeLabelTraceEClass.getESuperTypes().add(this.getMatchingTrace());
-		genLinkTraceEClass.getESuperTypes().add(this.getMatchingTrace());
-		genCompartmentTraceEClass.getESuperTypes().add(this.getMatchingTrace());
-		genLinkLabelTraceEClass.getESuperTypes().add(this.getMatchingTrace());
-		toolGroupTraceEClass.getESuperTypes().add(this.getMatchingTrace());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(traceModelEClass, TraceModel.class, "TraceModel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTraceModel_NodeTraces(), this.getGenNodeTrace(), null, "nodeTraces", null, 0, -1, TraceModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTraceModel_ChildNodeTraces(), this.getGenChildNodeTrace(), null, "childNodeTraces", null, 0, -1, TraceModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTraceModel_LinkTraces(), this.getGenLinkTrace(), null, "linkTraces", null, 0, -1, TraceModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getTraceModel_ToolGroupTraces(), this.getToolGroupTrace(), null, "toolGroupTraces", null, 0, -1, TraceModel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		EOperation op = addEOperation(traceModelEClass, this.getGenNodeTrace(), "getNodeTrace", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEInt(), "visualID", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(traceModelEClass, this.getGenLinkTrace(), "getLinkTrace", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEInt(), "visualID", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(traceModelEClass, this.getAbstractTrace(), "getAllAbstractTraces", 0, -1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(traceModelEClass, null, "purgeUnprocessedTraces", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(abstractTraceEClass, AbstractTrace.class, "AbstractTrace", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAbstractTrace_VisualID(), ecorePackage.getEInt(), "visualID", null, 0, 1, AbstractTrace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAbstractTrace_Processed(), ecorePackage.getEBoolean(), "processed", "false", 0, 1, AbstractTrace.class, IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(matchingTraceEClass, MatchingTrace.class, "MatchingTrace", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMatchingTrace_QueryText(), ecorePackage.getEString(), "queryText", null, 0, 1, MatchingTrace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		addEOperation(matchingTraceEClass, ecorePackage.getEClass(), "getQueryContext", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(matchingTraceEClass, ecorePackage.getEString(), "getEClassComparision", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEString(), "varName", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEClass(), "eClass", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		op = addEOperation(matchingTraceEClass, ecorePackage.getEString(), "getEStructuralFeatureComparison", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEString(), "varName", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEStructuralFeature(), "feature", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(genNodeTraceEClass, GenNodeTrace.class, "GenNodeTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getGenNodeTrace_NodeLabelTraces(), this.getGenNodeLabelTrace(), null, "nodeLabelTraces", null, 0, -1, GenNodeTrace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getGenNodeTrace_CompartmentTraces(), this.getGenCompartmentTrace(), null, "compartmentTraces", null, 0, -1, GenNodeTrace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		op = addEOperation(genNodeTraceEClass, null, "setContext", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theGMFGenPackage.getGenNode(), "genNode", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(genChildNodeTraceEClass, GenChildNodeTrace.class, "GenChildNodeTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(genNodeLabelTraceEClass, GenNodeLabelTrace.class, "GenNodeLabelTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		op = addEOperation(genNodeLabelTraceEClass, null, "setContext", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theGMFGenPackage.getGenNodeLabel(), "genNodeLabel", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(genLinkTraceEClass, GenLinkTrace.class, "GenLinkTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getGenLinkTrace_LinkLabelTraces(), this.getGenLinkLabelTrace(), null, "linkLabelTraces", null, 0, -1, GenLinkTrace.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		op = addEOperation(genLinkTraceEClass, null, "setContext", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theGMFGenPackage.getGenLink(), "genLink", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(genCompartmentTraceEClass, GenCompartmentTrace.class, "GenCompartmentTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		op = addEOperation(genCompartmentTraceEClass, null, "setContext", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theGMFGenPackage.getGenCompartment(), "genCompartment", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(genLinkLabelTraceEClass, GenLinkLabelTrace.class, "GenLinkLabelTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		op = addEOperation(genLinkLabelTraceEClass, null, "setContext", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theGMFGenPackage.getGenLinkLabel(), "genLinkLabel", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(toolGroupTraceEClass, ToolGroupTrace.class, "ToolGroupTrace", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		op = addEOperation(toolGroupTraceEClass, null, "setContext", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, theGMFGenPackage.getToolGroup(), "toolGroup", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //TracePackageImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/util/TraceAdapterFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/util/TraceAdapterFactory.java
deleted file mode 100644
index cc4270b8bf3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/util/TraceAdapterFactory.java
+++ /dev/null
@@ -1,307 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage
- * @generated
- */
-public class TraceAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TracePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TraceAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = TracePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TraceSwitch<Adapter> modelSwitch =
-		new TraceSwitch<Adapter>() {
-			@Override
-			public Adapter caseTraceModel(TraceModel object) {
-				return createTraceModelAdapter();
-			}
-			@Override
-			public Adapter caseAbstractTrace(AbstractTrace object) {
-				return createAbstractTraceAdapter();
-			}
-			@Override
-			public Adapter caseMatchingTrace(MatchingTrace object) {
-				return createMatchingTraceAdapter();
-			}
-			@Override
-			public Adapter caseGenNodeTrace(GenNodeTrace object) {
-				return createGenNodeTraceAdapter();
-			}
-			@Override
-			public Adapter caseGenChildNodeTrace(GenChildNodeTrace object) {
-				return createGenChildNodeTraceAdapter();
-			}
-			@Override
-			public Adapter caseGenNodeLabelTrace(GenNodeLabelTrace object) {
-				return createGenNodeLabelTraceAdapter();
-			}
-			@Override
-			public Adapter caseGenLinkTrace(GenLinkTrace object) {
-				return createGenLinkTraceAdapter();
-			}
-			@Override
-			public Adapter caseGenCompartmentTrace(GenCompartmentTrace object) {
-				return createGenCompartmentTraceAdapter();
-			}
-			@Override
-			public Adapter caseGenLinkLabelTrace(GenLinkLabelTrace object) {
-				return createGenLinkLabelTraceAdapter();
-			}
-			@Override
-			public Adapter caseToolGroupTrace(ToolGroupTrace object) {
-				return createToolGroupTraceAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel <em>Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel
-	 * @generated
-	 */
-	public Adapter createTraceModelAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace <em>Abstract Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace
-	 * @generated
-	 */
-	public Adapter createAbstractTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace <em>Matching Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace
-	 * @generated
-	 */
-	public Adapter createMatchingTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace <em>Gen Node Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace
-	 * @generated
-	 */
-	public Adapter createGenNodeTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace <em>Gen Child Node Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace
-	 * @generated
-	 */
-	public Adapter createGenChildNodeTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace <em>Gen Node Label Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace
-	 * @generated
-	 */
-	public Adapter createGenNodeLabelTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace <em>Gen Link Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace
-	 * @generated
-	 */
-	public Adapter createGenLinkTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace <em>Gen Compartment Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace
-	 * @generated
-	 */
-	public Adapter createGenCompartmentTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace <em>Gen Link Label Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace
-	 * @generated
-	 */
-	public Adapter createGenLinkLabelTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace <em>Tool Group Trace</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace
-	 * @generated
-	 */
-	public Adapter createToolGroupTraceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //TraceAdapterFactory
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/util/TraceSwitch.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/util/TraceSwitch.java
deleted file mode 100644
index 281952d51d0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.trace/src/org/eclipse/papyrus/gmf/internal/bridge/trace/util/TraceSwitch.java
+++ /dev/null
@@ -1,358 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.internal.bridge.trace.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.AbstractTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenChildNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenCompartmentTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenLinkTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeLabelTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.GenNodeTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.MatchingTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.ToolGroupTrace;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TraceModel;
-import org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.internal.bridge.trace.TracePackage
- * @generated
- */
-public class TraceSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static TracePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TraceSwitch() {
-		if (modelPackage == null) {
-			modelPackage = TracePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case TracePackage.TRACE_MODEL: {
-				TraceModel traceModel = (TraceModel)theEObject;
-				T result = caseTraceModel(traceModel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.ABSTRACT_TRACE: {
-				AbstractTrace abstractTrace = (AbstractTrace)theEObject;
-				T result = caseAbstractTrace(abstractTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.MATCHING_TRACE: {
-				MatchingTrace matchingTrace = (MatchingTrace)theEObject;
-				T result = caseMatchingTrace(matchingTrace);
-				if (result == null) result = caseAbstractTrace(matchingTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.GEN_NODE_TRACE: {
-				GenNodeTrace genNodeTrace = (GenNodeTrace)theEObject;
-				T result = caseGenNodeTrace(genNodeTrace);
-				if (result == null) result = caseMatchingTrace(genNodeTrace);
-				if (result == null) result = caseAbstractTrace(genNodeTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.GEN_CHILD_NODE_TRACE: {
-				GenChildNodeTrace genChildNodeTrace = (GenChildNodeTrace)theEObject;
-				T result = caseGenChildNodeTrace(genChildNodeTrace);
-				if (result == null) result = caseGenNodeTrace(genChildNodeTrace);
-				if (result == null) result = caseMatchingTrace(genChildNodeTrace);
-				if (result == null) result = caseAbstractTrace(genChildNodeTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.GEN_NODE_LABEL_TRACE: {
-				GenNodeLabelTrace genNodeLabelTrace = (GenNodeLabelTrace)theEObject;
-				T result = caseGenNodeLabelTrace(genNodeLabelTrace);
-				if (result == null) result = caseMatchingTrace(genNodeLabelTrace);
-				if (result == null) result = caseAbstractTrace(genNodeLabelTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.GEN_LINK_TRACE: {
-				GenLinkTrace genLinkTrace = (GenLinkTrace)theEObject;
-				T result = caseGenLinkTrace(genLinkTrace);
-				if (result == null) result = caseMatchingTrace(genLinkTrace);
-				if (result == null) result = caseAbstractTrace(genLinkTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.GEN_COMPARTMENT_TRACE: {
-				GenCompartmentTrace genCompartmentTrace = (GenCompartmentTrace)theEObject;
-				T result = caseGenCompartmentTrace(genCompartmentTrace);
-				if (result == null) result = caseMatchingTrace(genCompartmentTrace);
-				if (result == null) result = caseAbstractTrace(genCompartmentTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.GEN_LINK_LABEL_TRACE: {
-				GenLinkLabelTrace genLinkLabelTrace = (GenLinkLabelTrace)theEObject;
-				T result = caseGenLinkLabelTrace(genLinkLabelTrace);
-				if (result == null) result = caseMatchingTrace(genLinkLabelTrace);
-				if (result == null) result = caseAbstractTrace(genLinkLabelTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case TracePackage.TOOL_GROUP_TRACE: {
-				ToolGroupTrace toolGroupTrace = (ToolGroupTrace)theEObject;
-				T result = caseToolGroupTrace(toolGroupTrace);
-				if (result == null) result = caseMatchingTrace(toolGroupTrace);
-				if (result == null) result = caseAbstractTrace(toolGroupTrace);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Model</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Model</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTraceModel(TraceModel object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Abstract Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Abstract Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractTrace(AbstractTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Matching Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Matching Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMatchingTrace(MatchingTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Gen Node Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Gen Node Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGenNodeTrace(GenNodeTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Gen Child Node Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Gen Child Node Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGenChildNodeTrace(GenChildNodeTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Gen Node Label Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Gen Node Label Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGenNodeLabelTrace(GenNodeLabelTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Gen Link Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Gen Link Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGenLinkTrace(GenLinkTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Gen Compartment Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Gen Compartment Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGenCompartmentTrace(GenCompartmentTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Gen Link Label Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Gen Link Label Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGenLinkLabelTrace(GenLinkLabelTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>Tool Group Trace</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>Tool Group Trace</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseToolGroupTrace(ToolGroupTrace object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //TraceSwitch
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.project
deleted file mode 100644
index 7850608c618..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.bridge.ui.dashboard</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF
deleted file mode 100644
index 4871d4c652e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,22 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.bridge.ui.dashboard;singleton:=true
-Bundle-Version: 2.3.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Activator: org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard.Plugin
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.editor;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.emf.importer;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.papyrus.gmf.graphdef.edit;bundle-version="[2.0.0,3.1.0)",
- org.eclipse.papyrus.gmf.tooldef.edit;bundle-version="[2.0.0,3.1.0)",
- org.eclipse.papyrus.gmf.map.edit;bundle-version="[2.0.0,3.1.0)",
- org.eclipse.papyrus.gmf.codegen.edit;bundle-version="[2.9.0,3.0.0)",
- org.eclipse.papyrus.gmf.bridge.ui;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.gmf.bridge.ui.dashboard,
- org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;x-internal:=true,
- org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard.actions;x-friends:="org.eclipse.papyrus.gmf.codegen.lite.ui"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/build.properties
deleted file mode 100644
index 81e1de6eda2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               about.html
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/cview16/dashboard.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/cview16/dashboard.gif
deleted file mode 100644
index 610e0700a70..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/cview16/dashboard.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/cview16/synced.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/cview16/synced.gif
deleted file mode 100644
index 870934b6934..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/cview16/synced.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/viewban/logo.png b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/viewban/logo.png
deleted file mode 100644
index 6d4a54ee003..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/icons/viewban/logo.png
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/plugin.properties
deleted file mode 100644
index 2248c467cd1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-pluginName = Papyrus GMF Dashboard
-providerName=Eclipse Modeling Project
-view.name=GMF Dashboard
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/plugin.xml
deleted file mode 100644
index 3153c2d5915..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/plugin.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-   <extension-point id="actions" name="Dashboard Actions" schema="schema/actions.exsd"/>
-
-   <extension point = "org.eclipse.ui.views">
-      <view
-         id = "org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardPart"
-         name = "%view.name"
-         category = "org.eclipse.ui"
-         class = "org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard.DashboardPart"
-         icon = "icons/cview16/dashboard.gif" />
-   </extension>
-
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/pom.xml
deleted file mode 100644
index b500f440a6d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- * Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.bridge.ui.dashboard</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/schema/actions.exsd b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/schema/actions.exsd
deleted file mode 100644
index b81f49943b0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/schema/actions.exsd
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.papyrus.gmf.bridge.ui.dashboard">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.papyrus.gmf.bridge.ui.dashboard" id="actions" name="Dashboard Actions"/>
-      </appInfo>
-      <documentation>
-         Actions for GMF Dashboard view.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="action" minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="action">
-      <annotation>
-         <documentation>
-            Dashboard action.
-         </documentation>
-      </annotation>
-      <complexType>
-         <attribute name="label" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Action label.
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Action implementation.
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardAction"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="location" type="string" use="required">
-            <annotation>
-               <documentation>
-                  Identifier of the action location within the dashboard. Use DashboardFacade.LOCATION_* constants.
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="standard" type="boolean">
-            <annotation>
-               <documentation>
-                  Hint to add action as &apos;standard&apos;. Result depends on action container implementation. False if not specified.
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         2.0
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal&lt;br&gt;
- All rights reserved. This program and the accompanying materials 
- are made available under the terms of the Eclipse Public License 2.0 
- which accompanies this distribution, and is available at 
- &lt;a href=&quot;https://www.eclipse.org/legal/epl-2.0/&quot;&gt;https://www.eclipse.org/legal/epl-2.0/&lt;/a&gt;
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardAction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardAction.java
deleted file mode 100644
index 6281facc0c7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardAction.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.bridge.ui.dashboard;
-
-/**
- * EXPERIMENTAL
- * 
- * @author dstadnik
- */
-public interface DashboardAction {
-
-	public void init(DashboardFacade context);
-
-	public boolean isEnabled();
-
-	public void run();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardFacade.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardFacade.java
deleted file mode 100644
index 178e6da79cf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardFacade.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.bridge.ui.dashboard;
-
-import org.eclipse.swt.widgets.Shell;
-
-/**
- * EXPERIMENTAL
- * 
- * @author dstadnik
- */
-public interface DashboardFacade {
-
-	public static final String LOCATION_DM = "domain_model"; //$NON-NLS-1$
-
-	public static final String LOCATION_DGM = "domain_genmodel"; //$NON-NLS-1$
-
-	public static final String LOCATION_GDM = "graphdef_model"; //$NON-NLS-1$
-
-	public static final String LOCATION_TDM = "tooldef_model"; //$NON-NLS-1$
-
-	public static final String LOCATION_MM = "map_model"; //$NON-NLS-1$
-
-	public static final String LOCATION_GM = "genmodel"; //$NON-NLS-1$
-
-	public static final String LOCATION_MM2GM = "map_model-genmodel"; //$NON-NLS-1$
-
-	public static final String OPTION_RCP = "rcp"; //$NON-NLS-1$
-
-	public DashboardState getState();
-
-	public void updateStatus();
-
-	public boolean isStrict();
-
-	public Shell getShell();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardState.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardState.java
deleted file mode 100644
index 1d93d8e5d87..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/bridge/ui/dashboard/DashboardState.java
+++ /dev/null
@@ -1,316 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.bridge.ui.dashboard;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard.Plugin;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-/**
- * EXPERIMENTAL
- * 
- * @author dstadnik
- */
-public final class DashboardState {
-
-	private static final String PREF_KEY = "gmf_dashboard"; //$NON-NLS-1$
-
-	private static final String OPTION_PREFIX = "option_"; //$NON-NLS-1$
-
-	private static final String DM_KEY = "domainModel"; //$NON-NLS-1$
-
-	private static final String DGM_KEY = "domainGenerationModel"; //$NON-NLS-1$
-
-	private static final String GDM_KEY = "graphicalDefinitionModel"; //$NON-NLS-1$
-
-	private static final String TDM_KEY = "toolingDefinitionModel"; //$NON-NLS-1$
-
-	private static final String MM_KEY = "mappingModel"; //$NON-NLS-1$
-
-	private static final String GM_KEY = "generationModel"; //$NON-NLS-1$
-
-	private URI dm;
-
-	private URI dgm;
-
-	private URI gdm;
-
-	private URI tdm;
-
-	private URI mm;
-
-	private URI gm;
-
-	private Set<String> enabledOptions;
-
-	private IProject project;
-
-	public DashboardState() {
-		enabledOptions = new HashSet<String>();
-	}
-
-	public DashboardState(IProject project) {
-		this();
-		this.project = project;
-		Preferences prefs = getPreferences();
-		if (prefs != null) {
-			readOptions(prefs);
-			dm = read(prefs, DM_KEY);
-			dgm = read(prefs, DGM_KEY);
-			gdm = read(prefs, GDM_KEY);
-			tdm = read(prefs, TDM_KEY);
-			mm = read(prefs, MM_KEY);
-			gm = read(prefs, GM_KEY);
-		}
-	}
-
-	public URI getDM() {
-		return dm;
-	}
-
-	public URI getDGM() {
-		return dgm;
-	}
-
-	public URI getGDM() {
-		return gdm;
-	}
-
-	public URI getTDM() {
-		return tdm;
-	}
-
-	public URI getMM() {
-		return mm;
-	}
-
-	public URI getGM() {
-		return gm;
-	}
-
-	public void setDM(URI uri) {
-		dm = uri;
-		write(DM_KEY, dm);
-	}
-
-	public void setDGM(URI uri) {
-		dgm = uri;
-		write(DGM_KEY, dgm);
-	}
-
-	public void setGDM(URI uri) {
-		gdm = uri;
-		write(GDM_KEY, gdm);
-	}
-
-	public void setTDM(URI uri) {
-		tdm = uri;
-		write(TDM_KEY, tdm);
-	}
-
-	public void setMM(URI uri) {
-		mm = uri;
-		write(MM_KEY, mm);
-	}
-
-	public void setGM(URI uri) {
-		gm = uri;
-		write(GM_KEY, gm);
-	}
-
-	public void setDM(IFile file) {
-		dm = getURI(file);
-		write(DM_KEY, dm);
-	}
-
-	public void setDGM(IFile file) {
-		dgm = getURI(file);
-		write(DGM_KEY, dgm);
-	}
-
-	public void setGDM(IFile file) {
-		gdm = getURI(file);
-		write(GDM_KEY, gdm);
-	}
-
-	public void setTDM(IFile file) {
-		tdm = getURI(file);
-		write(TDM_KEY, tdm);
-	}
-
-	public void setMM(IFile file) {
-		mm = getURI(file);
-		write(MM_KEY, mm);
-	}
-
-	public void setGM(IFile file) {
-		gm = getURI(file);
-		write(GM_KEY, gm);
-	}
-
-	private static URI getURI(IFile file) {
-		if (file == null) {
-			return null;
-		}
-		return URI.createPlatformResourceURI(file.getFullPath().toString(), true);
-	}
-
-	public int getModelsCount() {
-		return 6;
-	}
-
-	public int getSpecifiedModelsCount() {
-		int count = 0;
-		if (dm != null) {
-			count++;
-		}
-		if (dgm != null) {
-			count++;
-		}
-		if (gdm != null) {
-			count++;
-		}
-		if (tdm != null) {
-			count++;
-		}
-		if (mm != null) {
-			count++;
-		}
-		if (gm != null) {
-			count++;
-		}
-		return count;
-	}
-
-	public boolean getOption(String name) {
-		return enabledOptions.contains(name);
-	}
-
-	public void setOption(String name, boolean value) {
-		if (name == null) {
-			throw new IllegalArgumentException();
-		}
-		if (value) {
-			enabledOptions.add(name);
-		} else {
-			enabledOptions.remove(name);
-		}
-		Preferences prefs = getPreferences();
-		if (prefs == null) {
-			return;
-		}
-		String key = OPTION_PREFIX + name;
-		if (value) {
-			prefs.put(key, "*"); //$NON-NLS-1$
-		} else {
-			prefs.remove(key);
-		}
-		savePreferences(prefs);
-	}
-
-	private void readOptions(Preferences prefs) {
-		try {
-			for (String key : prefs.keys()) {
-				if (key.startsWith(OPTION_PREFIX)) {
-					enabledOptions.add(key.substring(OPTION_PREFIX.length()));
-				}
-			}
-		} catch (BackingStoreException e) {
-			IStatus status = Plugin.createError("Unable to read options", e);
-			Plugin.getDefault().getLog().log(status);
-		}
-	}
-
-	private URI read(Preferences prefs, String key) {
-		String s = prefs.get(key, null);
-		if (s == null) {
-			return null;
-		}
-		try {
-			return URI.createURI(s);
-		} catch (IllegalArgumentException e) {
-			IStatus status = Plugin.createError("Invalid URI", e);
-			Plugin.getDefault().getLog().log(status);
-		}
-		return null;
-	}
-
-	private void write(String key, URI uri) {
-		if (project == null) {
-			return;
-		}
-		String s = null;
-		if (uri != null) {
-			s = uri.toString();
-		}
-		Preferences prefs = getPreferences();
-		prefs.put(key, s);
-		savePreferences(prefs);
-	}
-
-	private void savePreferences(Preferences prefs) {
-		try {
-			prefs.flush();
-		} catch (BackingStoreException e) {
-			IStatus status = Plugin.createError("Unable to update state", e);
-			Plugin.getDefault().getLog().log(status);
-		}
-	}
-
-	private Preferences getPreferences() {
-		if (project == null) {
-			return null;
-		}
-		Preferences node = getExistingPreferences();
-		if (node != null) {
-			return node;
-		}
-		return new ProjectScope(project).getNode(Plugin.getPluginID()).node(PREF_KEY);
-	}
-
-	private Preferences getExistingPreferences() {
-		if (project == null) {
-			return null;
-		}
-		Preferences node = Platform.getPreferencesService().getRootNode().node(ProjectScope.SCOPE);
-		try {
-			if (!node.nodeExists(project.getName())) {
-				return null;
-			}
-			node = node.node(project.getName());
-			if (!node.nodeExists(Plugin.getPluginID())) {
-				return null;
-			}
-			node = node.node(Plugin.getPluginID());
-			if (!node.nodeExists(PREF_KEY)) {
-				return null;
-			}
-			return node.node(PREF_KEY);
-		} catch (BackingStoreException e) {
-			IStatus status = Plugin.createError("Unable to read state", e);
-			Plugin.getDefault().getLog().log(status);
-		}
-		return null;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/ActionContainer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/ActionContainer.java
deleted file mode 100644
index 470c75a48ad..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/ActionContainer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import org.eclipse.draw2d.IFigure;
-
-/**
- * @author dstadnik
- */
-public interface ActionContainer {
-
-	public void addAction(IFigure actionFigure);
-
-	public void addAction(IFigure actionFigure, boolean std);
-
-	public void removeAction(IFigure actionFigure, boolean std);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardActionRegistry.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardActionRegistry.java
deleted file mode 100644
index 8f3b5e999e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardActionRegistry.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.dynamichelpers.ExtensionTracker;
-import org.eclipse.core.runtime.dynamichelpers.IExtensionChangeHandler;
-import org.eclipse.core.runtime.dynamichelpers.IExtensionTracker;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardAction;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardFacade;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * @author dstadnik
- */
-public class DashboardActionRegistry implements IExtensionChangeHandler {
-
-	private static String EXTENSIONPOINT_UNIQUE_ID = "org.eclipse.papyrus.gmf.bridge.ui.dashboard.actions"; //$NON-NLS-1$
-
-	private Set<DashboardMediator> mediators;
-
-	private Set<DashboardActionDescriptor> descriptors;
-
-	public DashboardActionRegistry() {
-		mediators = new HashSet<DashboardMediator>();
-		descriptors = new HashSet<DashboardActionDescriptor>();
-		PlatformUI.getWorkbench().getExtensionTracker().registerHandler(this, ExtensionTracker.createExtensionPointFilter(getExtensionPointFilter()));
-		IExtensionPoint point = Platform.getExtensionRegistry().getExtensionPoint(EXTENSIONPOINT_UNIQUE_ID);
-		if (point != null) {
-			IExtension[] extensions = point.getExtensions();
-			extensions = orderExtensions(extensions);
-			for (IExtension extension : extensions) {
-				addDescriptors(extension);
-			}
-		}
-	}
-
-	public void dispose() {
-		PlatformUI.getWorkbench().getExtensionTracker().unregisterHandler(this);
-	}
-
-	private IExtensionPoint getExtensionPointFilter() {
-		return Platform.getExtensionRegistry().getExtensionPoint(EXTENSIONPOINT_UNIQUE_ID);
-	}
-
-	void registerMediator(DashboardMediator mediator) {
-		mediators.add(mediator);
-	}
-
-	void unregisterMediator(DashboardMediator mediator) {
-		mediators.remove(mediator);
-	}
-
-	public void addExtension(IExtensionTracker tracker, IExtension addedExtension) {
-		addDescriptors(addedExtension);
-	}
-
-	public void removeExtension(IExtension extension, Object[] objects) {
-		for (Object object : objects) {
-			if (object instanceof DashboardActionDescriptor) {
-				DashboardActionDescriptor descriptor = (DashboardActionDescriptor) object;
-				descriptors.remove(descriptor);
-				for (DashboardMediator mediator : mediators) {
-					mediator.removeDashboardAction(descriptor);
-				}
-			}
-		}
-	}
-
-	public void addDescriptors(IExtension extension) {
-		for (IConfigurationElement element : extension.getConfigurationElements()) {
-			if (element.getName().equals("action")) { //$NON-NLS-1$
-				DashboardActionDescriptor desc = new DashboardActionDescriptor(element);
-				descriptors.add(desc);
-				PlatformUI.getWorkbench().getExtensionTracker().registerObject(element.getDeclaringExtension(), desc, IExtensionTracker.REF_STRONG);
-				for (DashboardMediator mediator : mediators) {
-					mediator.addDashboardAction(desc);
-				}
-			}
-		}
-	}
-
-	public static IExtension[] orderExtensions(IExtension[] extensions) {
-		// By default, the order is based on plugin id sorted
-		// in ascending order. The order for a plugin providing
-		// more than one extension for an extension point is
-		// dependent in the order listed in the XML file.
-		IExtension[] sortedExtension = new IExtension[extensions.length];
-		System.arraycopy(extensions, 0, sortedExtension, 0, extensions.length);
-		Comparator<IExtension> comparer = new Comparator<IExtension>() {
-
-			public int compare(IExtension arg0, IExtension arg1) {
-				String s1 = arg0.getNamespaceIdentifier();
-				String s2 = arg1.getNamespaceIdentifier();
-				return s1.compareToIgnoreCase(s2);
-			}
-		};
-		Collections.sort(Arrays.asList(sortedExtension), comparer);
-		return sortedExtension;
-	}
-
-	public DashboardActionDescriptor[] getDescriptors() {
-		return descriptors.toArray(new DashboardActionDescriptor[descriptors.size()]);
-	}
-
-	public static class DashboardActionDescriptor {
-
-		private final IConfigurationElement element;
-
-		private final String label;
-
-		private final String location;
-
-		private final boolean standard;
-
-		public DashboardActionDescriptor(IConfigurationElement element) {
-			this.element = element;
-			label = element.getAttribute("label"); //$NON-NLS-1$
-			location = element.getAttribute("location"); //$NON-NLS-1$
-			standard = Boolean.valueOf(element.getAttribute("standard")).booleanValue(); //$NON-NLS-1$
-		}
-
-		public IConfigurationElement getElement() {
-			return element;
-		}
-
-		public String getLabel() {
-			return label;
-		}
-
-		public DashboardAction createDashboardAction() {
-			return new Proxy();
-		}
-
-		public DashboardAction createContributedDashboardAction() {
-			try {
-				return (DashboardAction) element.createExecutableExtension("class"); //$NON-NLS-1$
-			} catch (Exception e) {
-				Plugin.getDefault().getLog().log(Plugin.createError("Unable to create GMF Dashboard action", e)); //$NON-NLS-1$
-			}
-			return null;
-		}
-
-		public String getLocation() {
-			return location;
-		}
-
-		public boolean isStandard() {
-			return standard;
-		}
-
-		private class Proxy implements DashboardAction {
-
-			private DashboardFacade context;
-
-			private boolean inited;
-
-			private DashboardAction delegate;
-
-			private boolean notAvailable;
-
-			public void init(DashboardFacade context) {
-				this.context = context;
-				inited = true;
-			}
-
-			public boolean isEnabled() {
-				if (delegate != null) {
-					return delegate.isEnabled();
-				}
-				if (notAvailable) {
-					return false;
-				}
-				return true;
-			}
-
-			public void run() {
-				if (notAvailable) {
-					return;
-				}
-				if (delegate == null) {
-					delegate = createContributedDashboardAction();
-					if (delegate == null) {
-						notAvailable = true;
-						return;
-					}
-					if (inited) {
-						delegate.init(context);
-					}
-				}
-				if (delegate.isEnabled()) {
-					delegate.run();
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardFigure.java
deleted file mode 100644
index 4b4013b4211..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardFigure.java
+++ /dev/null
@@ -1,441 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import org.eclipse.draw2d.AbstractLayout;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.ImageFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.PolygonDecoration;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Insets;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author dstadnik
- */
-public class DashboardFigure extends RectangleFigure {
-
-	private static final int LINE_WIDTH = 6;
-
-	private static final int TEXT_GAP = LINE_WIDTH + 3;
-
-	private static final int ARROW_LENGTH = 15;
-
-	private static final Color DASHBOARD_BG = new Color(null, 113, 104, 209);
-
-	private static final Color DASHBOARD_FG = new Color(null, 169, 164, 227);
-
-	private static final Color MODEL_BG = ColorConstants.white;
-
-	private ImageFigure logoFigure;
-
-	private IFigure statusFigure;
-
-	// models
-
-	private ModelFigure dgmFigure;
-
-	private ModelFigure gdmFigure;
-
-	private ModelFigure dmFigure;
-
-	private ModelFigure tdmFigure;
-
-	private ModelFigure mmFigure;
-
-	private ModelFigure gmFigure;
-
-	// flows
-
-	private FlowFigure dm2dgmFlow;
-
-	private FlowFigure dm2gdmFlow;
-
-	private FlowFigure dm2tdmFlow;
-
-	private FlowFigure dm2mmFlow;
-
-	private FlowFigure gdm2mmFlow;
-
-	private FlowFigure tdm2mmFlow;
-
-	private FlowFigure mm2gmFlow;
-
-	// flow actions
-
-	private FlowActionFigure dm2dgmFigure;
-
-	private FlowActionFigure dm2gdmFigure;
-
-	private FlowActionFigure dm2tdmFigure;
-
-	private FlowActionFigure dm2mmFigure;
-
-	private FlowActionFigure mm2gmFigure;
-
-	public DashboardFigure() {
-		add(logoFigure = new ImageFigure() {
-
-			protected void paintFigure(Graphics graphics) {
-				if (getImage() != null) {
-					graphics.drawImage(getImage(), new Rectangle(getImage().getBounds()), getBounds());
-				}
-			}
-		});
-		Image logoImage = Plugin.getDefault().getImageRegistry().get(Plugin.GMF_LOGO_IMAGE);
-		if (logoImage != null) {
-			logoFigure.setImage(logoImage);
-		}
-		add(dgmFigure = createModelFigure(Messages.DashboardFigure_DGM, Plugin.DGM_ICON));
-		add(gdmFigure = createModelFigure(Messages.DashboardFigure_GDM, Plugin.GDM_ICON));
-		add(dmFigure = createModelFigure(Messages.DashboardFigure_DM, Plugin.DM_ICON));
-		add(tdmFigure = createModelFigure(Messages.DashboardFigure_TDM, Plugin.TDM_ICON));
-		add(mmFigure = createModelFigure(Messages.DashboardFigure_MM, Plugin.MM_ICON));
-		add(gmFigure = createModelFigure(Messages.DashboardFigure_GM, Plugin.GM_ICON));
-		add(dm2dgmFlow = createFlowFigure(true));
-		add(dm2gdmFlow = createFlowFigure(true));
-		add(dm2tdmFlow = createFlowFigure(true));
-		add(dm2mmFlow = createFlowFigure(true));
-		add(gdm2mmFlow = createFlowFigure(false));
-		add(tdm2mmFlow = createFlowFigure(false));
-		add(mm2gmFlow = createFlowFigure(true));
-		add(dm2dgmFigure = createFlowActionFigure());
-		add(dm2gdmFigure = createFlowActionFigure());
-		add(dm2tdmFigure = createFlowActionFigure());
-		add(dm2mmFigure = createFlowActionFigure());
-		add(mm2gmFigure = createFlowActionFigure());
-		add(statusFigure = new Figure());
-		statusFigure.setFont(JFaceResources.getBannerFont());
-		ToolbarLayout statusLayout = new ToolbarLayout();
-		statusLayout.setStretchMinorAxis(false);
-		statusFigure.setLayoutManager(statusLayout);
-		statusFigure.add(new Label());
-		statusFigure.add(new Label());
-		setLayoutManager(new DashboardLayout());
-		setBorder(new MarginBorder(10));
-		setBackgroundColor(DASHBOARD_BG);
-		setForegroundColor(DASHBOARD_FG);
-	}
-
-	public ModelFigure getDGMFigure() {
-		return dgmFigure;
-	}
-
-	public ModelFigure getGDMFigure() {
-		return gdmFigure;
-	}
-
-	public ModelFigure getDMFigure() {
-		return dmFigure;
-	}
-
-	public ModelFigure getTDMFigure() {
-		return tdmFigure;
-	}
-
-	public ModelFigure getMMFigure() {
-		return mmFigure;
-	}
-
-	public ModelFigure getGMFigure() {
-		return gmFigure;
-	}
-
-	public FlowActionFigure getDM2DGMFigure() {
-		return dm2dgmFigure;
-	}
-
-	public FlowActionFigure getDM2GDMFigure() {
-		return dm2gdmFigure;
-	}
-
-	public FlowActionFigure getDM2TDMFigure() {
-		return dm2tdmFigure;
-	}
-
-	public FlowActionFigure getDM2MMFigure() {
-		return dm2mmFigure;
-	}
-
-	public FlowActionFigure getMM2GMFigure() {
-		return mm2gmFigure;
-	}
-
-	public Label getStatusLine(int i) {
-		return (Label) statusFigure.getChildren().get(i);
-	}
-
-	protected ModelFigure createModelFigure(String description, String iconKey) {
-		ModelFigure modelFigure = new ModelFigure();
-		modelFigure.setDescription(description);
-		Image image = Plugin.getDefault().getImageRegistry().get(iconKey);
-		if (image != null) {
-			modelFigure.setIcon(image);
-		}
-		modelFigure.setBackgroundColor(MODEL_BG);
-		modelFigure.setForegroundColor(DASHBOARD_FG);
-		modelFigure.setLineWidth(LINE_WIDTH);
-		modelFigure.setSpacing(TEXT_GAP);
-		return modelFigure;
-	}
-
-	protected FlowFigure createFlowFigure(boolean directed) {
-		FlowFigure flowFigure = new FlowFigure();
-		if (directed) {
-			PolygonDecoration decoration = new PolygonDecoration();
-			PointList template = new PointList();
-			template.addPoint(0, -LINE_WIDTH / 2);
-			template.addPoint(0, LINE_WIDTH / 2);
-			template.addPoint(-ARROW_LENGTH, LINE_WIDTH / 2 + 10);
-			template.addPoint(-ARROW_LENGTH, -(LINE_WIDTH / 2 + 10));
-			decoration.setTemplate(template);
-			decoration.setScale(1, 1);
-			flowFigure.setTargetDecoration(decoration);
-		}
-		flowFigure.setForegroundColor(DASHBOARD_FG);
-		flowFigure.setLineWidth(LINE_WIDTH);
-		return flowFigure;
-	}
-
-	protected FlowActionFigure createFlowActionFigure() {
-		FlowActionFigure flowActionFigure = new FlowActionFigure();
-		ToolbarLayout flowActionLayout = new ToolbarLayout();
-		flowActionLayout.setStretchMinorAxis(false);
-		flowActionLayout.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
-		flowActionFigure.setLayoutManager(flowActionLayout);
-		flowActionFigure.setBackgroundColor(MODEL_BG);
-		flowActionFigure.setForegroundColor(DASHBOARD_FG);
-		flowActionFigure.setLineWidth(LINE_WIDTH / 3);
-		flowActionFigure.setBorder(new MarginBorder(TEXT_GAP / 2));
-		return flowActionFigure;
-	}
-
-	protected void outlineShape(Graphics graphics) {
-	}
-
-	private class DashboardLayout extends AbstractLayout {
-
-		private static final int MAX_BOX_WIDTH = 300;
-
-		private static final int BOX_SPACING = 20;
-
-		protected Dimension calculatePreferredSize(IFigure container, int wHint, int hHint) {
-			Dimension d = getLayoutData().getSize();
-			Insets insets = container.getInsets();
-			d = new Dimension(d.width + insets.getWidth(), d.height + insets.getHeight());
-			return d.union(getBorderPreferredSize(container));
-		}
-
-		public void layout(IFigure container) {
-			getLayoutData().apply(container.getClientArea().getLocation());
-		}
-
-		protected LayoutData getLayoutData() {
-			Dimension dgmSize = dgmFigure.getPreferredSize();
-			dgmSize.width = Math.min(dgmSize.width, MAX_BOX_WIDTH);
-			Dimension dmSize = dmFigure.getPreferredSize();
-			dmSize.width = Math.min(dmSize.width, MAX_BOX_WIDTH);;
-			Dimension gdmSize = gdmFigure.getPreferredSize();
-			gdmSize.width = Math.min(gdmSize.width, MAX_BOX_WIDTH);
-			Dimension tdmSize = gdmFigure.getPreferredSize();
-			tdmSize.width = Math.min(tdmSize.width, MAX_BOX_WIDTH);
-			Dimension mmSize = mmFigure.getPreferredSize();
-			mmSize.width = Math.min(mmSize.width, MAX_BOX_WIDTH);;
-			Dimension gmSize = gmFigure.getPreferredSize();
-			gmSize.width = Math.min(gmSize.width, MAX_BOX_WIDTH);
-			Dimension dm2dgmSize = dm2dgmFigure.getPreferredSize();
-			Dimension dm2gdmSize = dm2gdmFigure.getPreferredSize();
-			Dimension dm2tdmSize = dm2tdmFigure.getPreferredSize();
-			Dimension dm2mmSize = dm2mmFigure.getPreferredSize();
-			Dimension mm2gmSize = mm2gmFigure.getPreferredSize();
-
-			LayoutData data = new LayoutData();
-
-			// boxes
-			int dmY = gdmSize.height + BOX_SPACING;
-			int dgmY = dmY + dmSize.height + BOX_SPACING;
-			data.dgmBox = new Rectangle(0, dgmY, dgmSize.width, dgmSize.height);
-			data.dm2dgmBox = new Rectangle((data.dgmBox.width - dm2dgmSize.width) / 2, dmY + (dmSize.height - dm2dgmSize.height) / 2, dm2dgmSize.width, dm2dgmSize.height);
-			data.dmBox = new Rectangle(data.dm2dgmBox.x + data.dm2dgmBox.width + BOX_SPACING, dmY, dmSize.width, dmSize.height);
-			int dm2tdmX = data.dmBox.x + (data.dmBox.width - dm2tdmSize.width) / 2;
-			int gap1 = dm2tdmX - (data.dgmBox.x + data.dgmBox.width);
-			if (gap1 < BOX_SPACING) {
-				int delta = BOX_SPACING - gap1;
-				data.dmBox.x += delta;
-				dm2tdmX += delta;
-			}
-			data.dm2gdmBox = new Rectangle(data.dmBox.x + (data.dmBox.width - dm2gdmSize.width) / 2, (gdmSize.height - dm2gdmSize.height) / 2, dm2gdmSize.width, dm2gdmSize.height);
-			data.gdmBox = new Rectangle(data.dm2gdmBox.x + data.dm2gdmBox.width + BOX_SPACING + ARROW_LENGTH, 0, gdmSize.width, gdmSize.height);
-			int tdmY = data.dmBox.y + data.dmBox.height + BOX_SPACING;
-			data.dm2tdmBox = new Rectangle(dm2tdmX, tdmY + (tdmSize.height - dm2tdmSize.height) / 2, dm2tdmSize.width, dm2tdmSize.height);
-			data.tdmBox = new Rectangle(data.dm2tdmBox.x + data.dm2tdmBox.width + BOX_SPACING + ARROW_LENGTH, tdmY, tdmSize.width, tdmSize.height);
-			data.dm2mmBox = new Rectangle(data.dmBox.x + data.dmBox.width + BOX_SPACING, data.dmBox.y + (data.dmBox.height - dm2mmSize.height) / 2, dm2mmSize.width, dm2mmSize.height);
-			data.mmBox = new Rectangle(data.dm2mmBox.x + data.dm2mmBox.width + BOX_SPACING + ARROW_LENGTH, data.dmBox.y, mmSize.width, mmSize.height);
-			int gmY = data.mmBox.y + data.mmBox.height + BOX_SPACING;
-			data.mm2gmBox = new Rectangle(data.mmBox.x + data.mmBox.width + BOX_SPACING, data.mmBox.y + (data.mmBox.height - mm2gmSize.height) / 2, mm2gmSize.width, mm2gmSize.height);
-			data.gmBox = new Rectangle(data.mm2gmBox.x - (gmSize.width - mm2gmSize.width) / 2, gmY, gmSize.width, gmSize.height);
-			int gap2 = data.gmBox.x - (data.tdmBox.x + data.tdmBox.width);
-			if (gap2 < BOX_SPACING) {
-				int delta = BOX_SPACING - gap2;
-				data.mm2gmBox.x += delta;
-				data.gmBox.x += delta;
-			}
-
-			// points
-			int pointsY = data.dmBox.y + data.dmBox.height / 2;
-			data.dm2dgmPoints = new PointList(3);
-			data.dm2dgmPoints.addPoint(data.dmBox.x, pointsY);
-			data.dm2dgmPoints.addPoint(data.dm2dgmBox.x + data.dm2dgmBox.width / 2, pointsY);
-			data.dm2dgmPoints.addPoint(data.dm2dgmBox.x + data.dm2dgmBox.width / 2, data.dgmBox.y);
-			int pointsX = data.dmBox.x + data.dmBox.width / 2;
-			data.dm2gdmPoints = new PointList(3);
-			data.dm2gdmPoints.addPoint(pointsX, data.dmBox.y);
-			data.dm2gdmPoints.addPoint(pointsX, data.dm2gdmBox.y + data.dm2gdmBox.height / 2);
-			data.dm2gdmPoints.addPoint(data.gdmBox.x, data.dm2gdmBox.y + data.dm2gdmBox.height / 2);
-			data.dm2tdmPoints = new PointList(3);
-			data.dm2tdmPoints.addPoint(pointsX, data.dmBox.y + data.dmBox.height);
-			data.dm2tdmPoints.addPoint(pointsX, data.dm2tdmBox.y + data.dm2tdmBox.height / 2);
-			data.dm2tdmPoints.addPoint(data.tdmBox.x, data.dm2tdmBox.y + data.dm2tdmBox.height / 2);
-			data.dm2mmPoints = new PointList(2);
-			data.dm2mmPoints.addPoint(data.dmBox.x + data.dmBox.width, pointsY);
-			data.dm2mmPoints.addPoint(data.mmBox.x, pointsY);
-			int crossX = data.dm2mmBox.x + data.dm2mmBox.width / 2;
-			data.gdm2mmPoints = new PointList(2);
-			data.gdm2mmPoints.addPoint(crossX, data.gdmBox.y + data.gdmBox.height);
-			data.gdm2mmPoints.addPoint(crossX, pointsY);
-			data.tdm2mmPoints = new PointList(2);
-			data.tdm2mmPoints.addPoint(crossX, data.tdmBox.y);
-			data.tdm2mmPoints.addPoint(crossX, pointsY);
-			data.mm2gmPoints = new PointList(3);
-			data.mm2gmPoints.addPoint(data.mmBox.x + data.mmBox.width, pointsY);
-			data.mm2gmPoints.addPoint(data.mm2gmBox.x + data.mm2gmBox.width / 2, pointsY);
-			data.mm2gmPoints.addPoint(data.mm2gmBox.x + data.mm2gmBox.width / 2, data.gmBox.y);
-
-			// logo and status
-			int logoMaxWidth = data.dm2gdmBox.x - BOX_SPACING;
-			int logoMaxHeight = data.dmBox.y - BOX_SPACING;
-			Dimension logoSize = logoFigure.getPreferredSize();
-			if (logoSize.width > logoMaxWidth || logoSize.height > logoMaxHeight) {
-				double scale = Math.min((double) logoMaxWidth / logoSize.width, (double) logoMaxHeight / logoSize.height);
-				logoSize.width *= scale;
-				logoSize.height *= scale;
-			}
-			data.logoBox = new Rectangle(0, 0, logoSize.width, logoSize.height);
-			Dimension statusSize = statusFigure.getPreferredSize();
-			int statusX = Math.max(data.gmBox.x + data.gmBox.width - statusSize.width, data.gdmBox.x + data.gdmBox.width + BOX_SPACING);
-			//int statusY = (data.mmBox.y - statusSize.height) / 2;
-			data.statusBox = new Rectangle(statusX, 0, statusSize.width, statusSize.height);
-
-			return data;
-		}
-
-		private class LayoutData {
-
-			public Rectangle logoBox;
-
-			public Rectangle statusBox;
-
-			public Rectangle dgmBox;
-
-			public Rectangle gdmBox;
-
-			public Rectangle dmBox;
-
-			public Rectangle tdmBox;
-
-			public Rectangle mmBox;
-
-			public Rectangle gmBox;
-
-			public PointList dm2dgmPoints;
-
-			public PointList dm2gdmPoints;
-
-			public PointList dm2tdmPoints;
-
-			public PointList dm2mmPoints;
-
-			public PointList gdm2mmPoints;
-
-			public PointList tdm2mmPoints;
-
-			public PointList mm2gmPoints;
-
-			public Rectangle dm2dgmBox;
-
-			public Rectangle dm2gdmBox;
-
-			public Rectangle dm2tdmBox;
-
-			public Rectangle dm2mmBox;
-
-			public Rectangle mm2gmBox;
-
-			public void apply(Point offset) {
-				logoFigure.setBounds(logoBox.getTranslated(offset));
-				statusFigure.setBounds(statusBox.getTranslated(offset));
-				dgmFigure.setBounds(dgmBox.getTranslated(offset));
-				gdmFigure.setBounds(gdmBox.getTranslated(offset));
-				dmFigure.setBounds(dmBox.getTranslated(offset));
-				tdmFigure.setBounds(tdmBox.getTranslated(offset));
-				mmFigure.setBounds(mmBox.getTranslated(offset));
-				gmFigure.setBounds(gmBox.getTranslated(offset));
-				dm2dgmFlow.setPoints(getTranslated(dm2dgmPoints, offset));
-				dm2gdmFlow.setPoints(getTranslated(dm2gdmPoints, offset));
-				dm2tdmFlow.setPoints(getTranslated(dm2tdmPoints, offset));
-				dm2mmFlow.setPoints(getTranslated(dm2mmPoints, offset));
-				gdm2mmFlow.setPoints(getTranslated(gdm2mmPoints, offset));
-				tdm2mmFlow.setPoints(getTranslated(tdm2mmPoints, offset));
-				mm2gmFlow.setPoints(getTranslated(mm2gmPoints, offset));
-				dm2dgmFigure.setBounds(dm2dgmBox.getTranslated(offset));
-				dm2gdmFigure.setBounds(dm2gdmBox.getTranslated(offset));
-				dm2tdmFigure.setBounds(dm2tdmBox.getTranslated(offset));
-				dm2mmFigure.setBounds(dm2mmBox.getTranslated(offset));
-				mm2gmFigure.setBounds(mm2gmBox.getTranslated(offset));
-			}
-
-			private PointList getTranslated(PointList source, Point offset) {
-				PointList target = new PointList(source.size());
-				target.addAll(source);
-				target.translate(offset);
-				return target;
-			}
-
-			public Dimension getSize() {
-				Rectangle bounds = logoBox.getCopy();
-				bounds.union(statusBox);
-				bounds.union(dgmBox);
-				bounds.union(gdmBox);
-				bounds.union(dmBox);
-				bounds.union(tdmBox);
-				bounds.union(mmBox);
-				bounds.union(gmBox);
-				return bounds.getSize();
-			}
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardMediator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardMediator.java
deleted file mode 100644
index 1c03903a431..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardMediator.java
+++ /dev/null
@@ -1,673 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.draw2d.ActionEvent;
-import org.eclipse.draw2d.ActionListener;
-import org.eclipse.draw2d.CheckBox;
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.presentation.EcoreModelWizard;
-import org.eclipse.emf.importer.ui.EMFModelWizard;
-import org.eclipse.emf.importer.ui.GenModelReloadActionDelegate;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardAction;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardFacade;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardState;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.presentation.GMFGenModelWizard;
-import org.eclipse.papyrus.gmf.gmfgraph.presentation.GMFGraphModelWizard;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard.DashboardActionRegistry.DashboardActionDescriptor;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard.actions.TransformMap2GenModelAction;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.GMFGraphSimpleModelWizard;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.GMFMapGuideModelWizard;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.GMFToolSimpleModelWizard;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.WizardOperationMode;
-import org.eclipse.papyrus.gmf.internal.common.URIUtil;
-import org.eclipse.papyrus.gmf.internal.common.ui.FileSelector;
-import org.eclipse.papyrus.gmf.mappings.presentation.GMFMapModelWizard;
-import org.eclipse.papyrus.gmf.tooldef.presentation.GMFToolModelWizard;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWizard;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.part.FileEditorInput;
-
-/**
- * @author dstadnik
- */
-public class DashboardMediator implements DashboardFacade {
-
-	private static final boolean STRICT = true;
-
-	private DashboardFigure view;
-
-	private Shell shell;
-
-	private IProject project;
-
-	private DashboardState state;
-
-	private Map<String, ActionContainer> locations;
-
-	private Map<DashboardActionDescriptor, IFigure> contributions;
-
-	private Map<String, CheckBox> optionFigures;
-
-	public DashboardMediator(Shell shell) {
-		state = new DashboardState();
-		locations = new HashMap<String, ActionContainer>();
-		contributions = new HashMap<DashboardActionDescriptor, IFigure>();
-		optionFigures = new HashMap<String, CheckBox>();
-		this.shell = shell;
-	}
-
-	public boolean isStrict() {
-		return STRICT;
-	}
-
-	public Shell getShell() {
-		return shell;
-	}
-
-	public void setView(DashboardFigure view) {
-		this.view = view;
-		locations.put(DashboardFacade.LOCATION_DM, view.getDMFigure());
-		locations.put(DashboardFacade.LOCATION_DGM, view.getDGMFigure());
-		locations.put(DashboardFacade.LOCATION_GDM, view.getGDMFigure());
-		locations.put(DashboardFacade.LOCATION_TDM, view.getTDMFigure());
-		locations.put(DashboardFacade.LOCATION_MM, view.getMMFigure());
-		locations.put(DashboardFacade.LOCATION_GM, view.getGMFigure());
-		locations.put(DashboardFacade.LOCATION_MM2GM, view.getMM2GMFigure());
-		view.getDGMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Select, new SelectDGMAction()));
-		view.getDGMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Edit, new EditDGMAction()));
-		view.getDGMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Reload, new ReloadDGMAction()));
-		view.getGDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Select, new SelectGDMAction()));
-		view.getGDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Edit, new EditGDMAction()));
-		view.getGDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Create, new CreateGDMAction()));
-		view.getDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Select, new SelectDMAction()));
-		view.getDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Edit, new EditDMAction()));
-		view.getDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Create, new CreateDMAction()));
-		view.getTDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Select, new SelectTDMAction()));
-		view.getTDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Edit, new EditTDMAction()));
-		view.getTDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Create, new CreateTDMAction()));
-		view.getMMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Select, new SelectMMAction()));
-		view.getMMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Edit, new EditMMAction()));
-		view.getMMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Create, new CreateMMAction()));
-		view.getGMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Select, new SelectGMAction()));
-		view.getGMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Edit, new EditGMAction()));
-		view.getGMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Create, new CreateGMAction()));
-		view.getDM2DGMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Derive, new DeriveDGMAction()));
-		view.getDM2GDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Derive, new DeriveGDMAction()));
-		view.getDM2TDMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Derive, new DeriveTDMAction()));
-		view.getDM2MMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Combine, new CombineMMAction()));
-		view.getMM2GMFigure().addAction(createOptionFigure(Messages.DashboardMediator_RCP, DashboardFacade.OPTION_RCP));
-		view.getMM2GMFigure().addAction(createLinkFigure(Messages.DashboardMediator_Transform, new TransformMap2GenModelAction()));
-		for (DashboardActionDescriptor descriptor : Plugin.getDefault().getDashboardActionRegistry().getDescriptors()) {
-			addDashboardAction(descriptor);
-		}
-		updateStatus();
-	}
-
-	public void addDashboardAction(DashboardActionDescriptor descriptor) {
-		ActionContainer location = locations.get(descriptor.getLocation());
-		if (location == null) {
-			Plugin.getDefault().getLog().log(Plugin.createError("Unknown GMF Dashboard location: " + descriptor.getLocation(), null)); //$NON-NLS-1$
-			return;
-		}
-		DashboardAction action = descriptor.createDashboardAction();
-		if (action == null) {
-			return;
-		}
-		IFigure actionFigure = createLinkFigure(descriptor.getLabel(), action);
-		location.addAction(actionFigure, descriptor.isStandard());
-		contributions.put(descriptor, actionFigure);
-	}
-
-	public void removeDashboardAction(DashboardActionDescriptor descriptor) {
-		IFigure actionFigure = contributions.remove(descriptor);
-		if (actionFigure == null) {
-			return; // not contributed; just ignore
-		}
-		ActionContainer location = locations.get(descriptor.getLocation());
-		if (location == null) {
-			Plugin.getDefault().getLog().log(Plugin.createError("Unknown GMF Dashboard location: " + descriptor.getLocation(), null)); //$NON-NLS-1$
-			return;
-		}
-		location.removeAction(actionFigure, descriptor.isStandard());
-	}
-
-	/**
-	 * Also initializes the action.
-	 */
-	protected IFigure createLinkFigure(String text, DashboardAction action) {
-		action.init(this);
-		HyperlinkFigure linkFigure = new HyperlinkFigure(action);
-		linkFigure.setText(text);
-		return linkFigure;
-	}
-
-	protected IFigure createOptionFigure(String text, final String option) {
-		final CheckBox optionFigure = new CheckBox(text);
-		optionFigure.setRequestFocusEnabled(false);
-		optionFigure.setFocusTraversable(false);
-		optionFigure.setForegroundColor(ColorConstants.blue);
-		optionFigure.addActionListener(new ActionListener() {
-
-			public void actionPerformed(ActionEvent event) {
-				getState().setOption(option, optionFigure.isSelected());
-			}
-		});
-		optionFigures.put(option, optionFigure);
-		return optionFigure;
-	}
-
-	public IProject getProject() {
-		return project;
-	}
-
-	public DashboardState getState() {
-		return state;
-	}
-
-	public void setProjectAndState(IProject project, DashboardState state) {
-		this.project = project;
-		this.state = state;
-		if (this.state == null) {
-			this.state = new DashboardState();
-		}
-		updateStatus();
-	}
-
-	public void updateStatus() {
-		if (project == null) {
-			view.getStatusLine(0).setText(Messages.DashboardMediator_SelectProject);
-			view.getStatusLine(1).setText(""); //$NON-NLS-1$
-		} else {
-			view.getStatusLine(0).setText(MessageFormat.format(Messages.DashboardMediator_Project, new Object[] { project.getName() }));
-			double done = (double) state.getSpecifiedModelsCount() / state.getModelsCount();
-			view.getStatusLine(1).setText(MessageFormat.format(Messages.DashboardMediator_Progress, new Object[] { new Double(done) }));
-		}
-		setModelName(view.getDGMFigure(), state.getDGM());
-		setModelName(view.getGDMFigure(), state.getGDM());
-		setModelName(view.getDMFigure(), state.getDM());
-		setModelName(view.getTDMFigure(), state.getTDM());
-		setModelName(view.getMMFigure(), state.getMM());
-		setModelName(view.getGMFigure(), state.getGM());
-		optionFigures.get(DashboardFacade.OPTION_RCP).setSelected(state.getOption(DashboardFacade.OPTION_RCP));
-		view.repaint(); // update hyperlinks
-	}
-
-	protected void setModelName(ModelFigure figure, URI uri) {
-		figure.setName(uri == null ? null : uri.lastSegment());
-		figure.setFullName(uri == null ? null : uri.toString());
-	}
-
-	protected abstract class SelectFileAction implements DashboardAction {
-
-		public void init(DashboardFacade context) {
-		}
-
-		public boolean isEnabled() {
-			return project != null;
-		}
-
-		public void run() {
-			IFile file = getURI() == null ? null : URIUtil.getFile(getURI());
-			file = FileSelector.selectFile(shell, getFigure().getDescription(), null, file, getFileExtension());
-			if (file == null) {
-				return;
-			}
-			setURI(URI.createPlatformResourceURI(file.getFullPath().toString(), true));
-			updateStatus();
-		}
-
-		protected abstract ModelFigure getFigure();
-
-		protected abstract URI getURI();
-
-		protected abstract void setURI(URI uri);
-
-		protected abstract String getFileExtension();
-	}
-
-	protected abstract class EditFileAction implements DashboardAction {
-
-		public void init(DashboardFacade context) {
-		}
-
-		public boolean isEnabled() {
-			return project != null && getURI() != null;
-		}
-
-		public void run() {
-			IWorkbench workbench = PlatformUI.getWorkbench();
-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-			IWorkbenchPage page = workbenchWindow.getActivePage();
-			IFile modelFile = URIUtil.getFile(getURI());
-			try {
-				String fileName = modelFile.getFullPath().toString();
-				String editorId = workbench.getEditorRegistry().getDefaultEditor(fileName).getId();
-				page.openEditor(new FileEditorInput(modelFile), editorId);
-			} catch (PartInitException pie) {
-				String msg = MessageFormat.format(Messages.DashboardMediator_FailToOpen, new Object[] { getURI() });
-				MessageDialog.openError(workbenchWindow.getShell(), msg, pie.getMessage());
-			}
-		}
-
-		protected abstract URI getURI();
-	}
-
-	protected abstract class RunWizardAction implements DashboardAction {
-
-		private static final int SIZING_WIZARD_WIDTH = 500;
-
-		private static final int SIZING_WIZARD_HEIGHT = 500;
-
-		public void init(DashboardFacade context) {
-		}
-
-		public boolean isEnabled() {
-			return project != null;
-		}
-
-		public void run() {
-			final IWizard wizard = createWizard();
-			if (wizard instanceof IWorkbenchWizard) {
-				((IWorkbenchWizard) wizard).init(PlatformUI.getWorkbench(), getSelection());
-			}
-			WizardDialog dialog = new WizardDialog(shell, wizard) {
-
-				protected void finishPressed() {
-					wizardFinished(wizard);
-					super.finishPressed();
-				}
-			};
-			dialog.create();
-			dialog.getShell().setSize(Math.max(SIZING_WIZARD_WIDTH, dialog.getShell().getSize().x), SIZING_WIZARD_HEIGHT);
-			dialog.open();
-		}
-
-		protected IStructuredSelection getSelection() {
-			List<IFile> selection = new ArrayList<IFile>();
-			addFile(selection, state.getDM());
-			addFile(selection, state.getDGM());
-			addFile(selection, state.getGDM());
-			addFile(selection, state.getTDM());
-			addFile(selection, state.getMM());
-			addFile(selection, state.getGM());
-			return new StructuredSelection(selection);
-		}
-
-		protected void addFile(List<IFile> files, URI uri) {
-			if (uri == null) {
-				return;
-			}
-			IFile file = URIUtil.getFile(uri);
-			if (file != null) {
-				files.add(file);
-			}
-		}
-
-		protected abstract IWizard createWizard();
-
-		protected void wizardFinished(IWizard wizard) {
-		}
-	}
-
-	private class SelectDGMAction extends SelectFileAction {
-
-		protected ModelFigure getFigure() {
-			return DashboardMediator.this.view.getDGMFigure();
-		}
-
-		protected URI getURI() {
-			return state.getDGM();
-		}
-
-		protected void setURI(URI uri) {
-			state.setDGM(uri);
-		}
-
-		protected String getFileExtension() {
-			return "genmodel"; //$NON-NLS-1$
-		}
-	}
-
-	private class SelectGDMAction extends SelectFileAction {
-
-		protected ModelFigure getFigure() {
-			return DashboardMediator.this.view.getGDMFigure();
-		}
-
-		protected URI getURI() {
-			return state.getGDM();
-		}
-
-		protected void setURI(URI uri) {
-			state.setGDM(uri);
-		}
-
-		protected String getFileExtension() {
-			return "gmfgraph"; //$NON-NLS-1$
-		}
-	}
-
-	private class SelectDMAction extends SelectFileAction {
-
-		protected ModelFigure getFigure() {
-			return DashboardMediator.this.view.getDMFigure();
-		}
-
-		protected URI getURI() {
-			return state.getDM();
-		}
-
-		protected void setURI(URI uri) {
-			state.setDM(uri);
-		}
-
-		protected String getFileExtension() {
-			return "ecore"; //$NON-NLS-1$
-		}
-	}
-
-	private class SelectTDMAction extends SelectFileAction {
-
-		protected ModelFigure getFigure() {
-			return DashboardMediator.this.view.getTDMFigure();
-		}
-
-		protected URI getURI() {
-			return state.getTDM();
-		}
-
-		protected void setURI(URI uri) {
-			state.setTDM(uri);
-		}
-
-		protected String getFileExtension() {
-			return "gmftool"; //$NON-NLS-1$
-		}
-	}
-
-	private class SelectMMAction extends SelectFileAction {
-
-		protected ModelFigure getFigure() {
-			return DashboardMediator.this.view.getMMFigure();
-		}
-
-		protected URI getURI() {
-			return state.getMM();
-		}
-
-		protected void setURI(URI uri) {
-			state.setMM(uri);
-		}
-
-		protected String getFileExtension() {
-			return "gmfmap"; //$NON-NLS-1$
-		}
-	}
-
-	private class SelectGMAction extends SelectFileAction {
-
-		protected ModelFigure getFigure() {
-			return DashboardMediator.this.view.getGMFigure();
-		}
-
-		protected URI getURI() {
-			return state.getGM();
-		}
-
-		protected void setURI(URI uri) {
-			state.setGM(uri);
-		}
-
-		protected String getFileExtension() {
-			return "gmfgen"; //$NON-NLS-1$
-		}
-	}
-
-	private class EditDGMAction extends EditFileAction {
-
-		protected URI getURI() {
-			return state.getDGM();
-		}
-	}
-
-	private class EditGDMAction extends EditFileAction {
-
-		protected URI getURI() {
-			return state.getGDM();
-		}
-	}
-
-	private class EditDMAction extends EditFileAction {
-
-		protected URI getURI() {
-			return state.getDM();
-		}
-	}
-
-	private class EditTDMAction extends EditFileAction {
-
-		protected URI getURI() {
-			return state.getTDM();
-		}
-	}
-
-	private class EditMMAction extends EditFileAction {
-
-		protected URI getURI() {
-			return state.getMM();
-		}
-	}
-
-	private class EditGMAction extends EditFileAction {
-
-		protected URI getURI() {
-			return state.getGM();
-		}
-	}
-
-	private class CreateGDMAction extends RunWizardAction {
-
-		protected IWizard createWizard() {
-			return new GMFGraphModelWizard();
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((GMFGraphModelWizard) wizard).getModelFile();
-			state.setGDM(file);
-			updateStatus();
-		}
-	}
-
-	private class CreateDMAction extends RunWizardAction {
-
-		protected IWizard createWizard() {
-			return new EcoreModelWizard();
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((EcoreModelWizard) wizard).getModelFile();
-			state.setDM(file);
-			updateStatus();
-		}
-	}
-
-	private class CreateTDMAction extends RunWizardAction {
-
-		protected IWizard createWizard() {
-			return new GMFToolModelWizard();
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((GMFToolModelWizard) wizard).getModelFile();
-			state.setTDM(file);
-			updateStatus();
-		}
-	}
-
-	private class CreateMMAction extends RunWizardAction {
-
-		protected IWizard createWizard() {
-			return new GMFMapModelWizard();
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((GMFMapModelWizard) wizard).getModelFile();
-			state.setMM(file);
-			updateStatus();
-		}
-	}
-
-	private class CreateGMAction extends RunWizardAction {
-
-		protected IWizard createWizard() {
-			return new GMFGenModelWizard();
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((GMFGenModelWizard) wizard).getModelFile();
-			state.setGM(file);
-			updateStatus();
-		}
-	}
-
-	private class ReloadDGMAction implements DashboardAction {
-
-		public void init(DashboardFacade context) {
-		}
-
-		public boolean isEnabled() {
-			return state.getDGM() != null;
-		}
-
-		public void run() {
-			IFile file = URIUtil.getFile(state.getDGM());
-			GenModelReloadActionDelegate action = new GenModelReloadActionDelegate();
-			IAction uiAction = new Action() {
-			};
-			action.selectionChanged(uiAction, new StructuredSelection(file));
-			action.run(uiAction);
-			updateStatus();
-		}
-	}
-
-	private class DeriveDGMAction extends RunWizardAction {
-
-		public boolean isEnabled() {
-			return super.isEnabled() && state.getDM() != null;
-		}
-
-		protected IWizard createWizard() {
-			return new OpenEMFModelWizard();
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((OpenEMFModelWizard) wizard).getModelFile();
-			state.setDGM(file);
-			updateStatus();
-		}
-
-		protected IStructuredSelection getSelection() {
-			return new StructuredSelection(URIUtil.getFile(state.getDM()));
-		}
-	}
-
-	private static class OpenEMFModelWizard extends EMFModelWizard {
-
-		public IFile getModelFile() {
-			IPath path = genModelContainerPath.append(genModelFileName);
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-		}
-	}
-
-	private class DeriveGDMAction extends RunWizardAction {
-
-		public boolean isEnabled() {
-			return super.isEnabled() && state.getDM() != null;
-		}
-
-		protected IWizard createWizard() {
-			GMFGraphSimpleModelWizard wizard = new GMFGraphSimpleModelWizard();
-			wizard.setMode(WizardOperationMode.DETECT);
-			return wizard;
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((GMFGraphSimpleModelWizard) wizard).getModelFile();
-			state.setGDM(file);
-			updateStatus();
-		}
-	}
-
-	private class DeriveTDMAction extends RunWizardAction {
-
-		public boolean isEnabled() {
-			return super.isEnabled() && state.getDM() != null;
-		}
-
-		protected IWizard createWizard() {
-			GMFToolSimpleModelWizard wizard = new GMFToolSimpleModelWizard();
-			wizard.setMode(WizardOperationMode.DETECT);
-			return wizard;
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((GMFToolSimpleModelWizard) wizard).getModelFile();
-			state.setTDM(file);
-			updateStatus();
-		}
-	}
-
-	private class CombineMMAction extends RunWizardAction {
-
-		public boolean isEnabled() {
-			return project != null && state.getGDM() != null && state.getDM() != null && state.getTDM() != null;
-		}
-
-		protected IWizard createWizard() {
-			return new GMFMapGuideModelWizard();
-		}
-
-		protected void wizardFinished(IWizard wizard) {
-			IFile file = ((GMFMapGuideModelWizard) wizard).getModelFile();
-			state.setMM(file);
-			updateStatus();
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardPart.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardPart.java
deleted file mode 100644
index 82673fa0c6f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/DashboardPart.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.draw2d.FigureCanvas;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.util.IPropertyChangeListener;
-import org.eclipse.jface.util.PropertyChangeEvent;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardState;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.IMemento;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IViewSite;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.part.ViewPart;
-
-/**
- * @author dstadnik
- */
-public class DashboardPart extends ViewPart {
-
-	private static final String ACTIVE_PROJECT_KEY = "activeProject"; //$NON-NLS-1$
-
-	private static final String SYNC_SELECTION_KEY = "syncSelection"; //$NON-NLS-1$
-
-	private FigureCanvas canvas;
-
-	private DashboardMediator mediator;
-
-	private ISelectionListener projectUpdater;
-
-	/**
-	 * Reflects current workbench selection even if synchronization is off.
-	 */
-	private IProject activeProject;
-
-	private String dashboardInitialProjectName;
-
-	private boolean syncSelection = true;
-
-	public void init(IViewSite site, IMemento memento) throws PartInitException {
-		super.init(site, memento);
-		if (memento != null) {
-			dashboardInitialProjectName = memento.getString(ACTIVE_PROJECT_KEY);
-			String syncSelectionValue = memento.getString(SYNC_SELECTION_KEY);
-			if (syncSelectionValue != null) {
-				syncSelection = Boolean.valueOf(syncSelectionValue).booleanValue();
-			}
-		}
-		IAction syncSelectionAction = new Action(Messages.DashboardPart_Synchronize, IAction.AS_CHECK_BOX) {
-		};
-		syncSelectionAction.setToolTipText(Messages.DashboardPart_SynchronizeSelection);
-		ImageDescriptor synchImage = Plugin.getDefault().getImageRegistry().getDescriptor(Plugin.SYNC_ICON);
-		if (synchImage != null) {
-			syncSelectionAction.setImageDescriptor(synchImage);
-		}
-		syncSelectionAction.setChecked(syncSelection);
-		syncSelectionAction.addPropertyChangeListener(new IPropertyChangeListener() {
-
-			public void propertyChange(PropertyChangeEvent event) {
-				if (IAction.CHECKED.equals(event.getProperty())) {
-					syncSelection = ((Boolean) event.getNewValue()).booleanValue();
-					if (syncSelection && mediator != null && activeProject != mediator.getProject()) {
-						updateDashboardProject(activeProject);
-					}
-				}
-			}
-		});
-		site.getActionBars().getToolBarManager().add(syncSelectionAction);
-	}
-
-	public void createPartControl(Composite parent) {
-		canvas = new FigureCanvas(parent);
-		mediator = new DashboardMediator(parent.getShell());
-		DashboardFigure contents = new DashboardFigure();
-		mediator.setView(contents);
-		canvas.setContents(contents);
-		getSite().getWorkbenchWindow().getSelectionService().addSelectionListener(projectUpdater = new ISelectionListener() {
-
-			public void selectionChanged(IWorkbenchPart part, ISelection selection) {
-				updateActiveProject(selection);
-			}
-		});
-		updateActiveProject(getSite().getWorkbenchWindow().getSelectionService().getSelection());
-		if (mediator.getProject() == null && dashboardInitialProjectName != null) {
-			IProject dashboardProject = ResourcesPlugin.getWorkspace().getRoot().getProject(dashboardInitialProjectName);
-			if (dashboardProject.exists()) {
-				updateDashboardProject(dashboardProject);
-			}
-		}
-		Plugin.getDefault().getDashboardActionRegistry().registerMediator(mediator);
-	}
-
-	public void saveState(IMemento memento) {
-		super.saveState(memento);
-		if (mediator != null && mediator.getProject() != null) {
-			memento.putString(ACTIVE_PROJECT_KEY, mediator.getProject().getName());
-			if (!syncSelection) {
-				memento.putString(SYNC_SELECTION_KEY, String.valueOf(syncSelection));
-			}
-		}
-	}
-
-	public void dispose() {
-		if (mediator != null) {
-			Plugin.getDefault().getDashboardActionRegistry().unregisterMediator(mediator);
-			mediator = null;
-		}
-		if (projectUpdater != null) {
-			getSite().getWorkbenchWindow().getSelectionService().removeSelectionListener(projectUpdater);
-			projectUpdater = null;
-		}
-		super.dispose();
-	}
-
-	public void setFocus() {
-		if (canvas != null) {
-			canvas.setFocus();
-		}
-	}
-
-	protected void updateActiveProject(ISelection selection) {
-		if (!(selection instanceof IStructuredSelection)) {
-			return;
-		}
-		IProject newActiveProject = null;
-		for (Iterator<?> it = ((IStructuredSelection) selection).iterator(); it.hasNext();) {
-			Object element = it.next();
-			IProject project = null;
-			if (element instanceof IResource) {
-				project = ((IResource) element).getProject();
-			} else if (element instanceof IAdaptable) {
-				IResource resource = (IResource) ((IAdaptable) element).getAdapter(IResource.class);
-				if (resource != null) {
-					project = resource.getProject();
-				}
-			}
-			if (project == null) {
-				continue;
-			}
-			if (project.equals(activeProject)) {
-				// if current active project is selected do not change it
-				return;
-			}
-			if (newActiveProject == null) {
-				// new active project is the first selected project
-				newActiveProject = project;
-			}
-		}
-		if (newActiveProject != null) {
-			activeProject = newActiveProject;
-			if (syncSelection && mediator != null) {
-				updateDashboardProject(newActiveProject);
-			}
-		}
-	}
-
-	protected void updateDashboardProject(IProject project) {
-		mediator.setProjectAndState(project, new DashboardState(project));
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/FlowActionFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/FlowActionFigure.java
deleted file mode 100644
index 2f9ef3b6354..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/FlowActionFigure.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-
-/**
- * @author dstadnik
- */
-public class FlowActionFigure extends RectangleFigure implements ActionContainer {
-
-	public FlowActionFigure() {
-		setLayoutManager(new ToolbarLayout());
-	}
-
-	public void addAction(IFigure actionFigure) {
-		add(actionFigure);
-	}
-
-	public void addAction(IFigure actionFigure, boolean std) {
-		add(actionFigure);
-	}
-
-	public void removeAction(IFigure actionFigure, boolean std) {
-		remove(actionFigure);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/FlowFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/FlowFigure.java
deleted file mode 100644
index f9cae925221..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/FlowFigure.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import org.eclipse.draw2d.ArrowLocator;
-import org.eclipse.draw2d.Connection;
-import org.eclipse.draw2d.ConnectionAnchor;
-import org.eclipse.draw2d.ConnectionLocator;
-import org.eclipse.draw2d.ConnectionRouter;
-import org.eclipse.draw2d.DelegatingLayout;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Polyline;
-import org.eclipse.draw2d.RotatableDecoration;
-import org.eclipse.draw2d.geometry.Point;
-import org.eclipse.draw2d.geometry.PointList;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author dstadnik
- */
-public class FlowFigure extends Polyline implements Connection {
-
-	private RotatableDecoration startArrow, endArrow;
-
-	public FlowFigure() {
-		setLayoutManager(new DelegatingLayout());
-		addPoint(new Point(0, 0));
-		addPoint(new Point(100, 100));
-	}
-
-	/**
-	 * Returns the bounds which holds all the points in this polyline connection. Returns any previously existing bounds, else calculates by unioning all the children's dimensions.
-	 * 
-	 * @return the bounds
-	 */
-	public Rectangle getBounds() {
-		if (bounds == null) {
-			super.getBounds();
-			for (int i = 0; i < getChildren().size(); i++) {
-				IFigure child = (IFigure) getChildren().get(i);
-				bounds.union(child.getBounds());
-			}
-		}
-		return bounds;
-	}
-
-	/**
-	 * @return the source decoration (may be null)
-	 */
-	protected RotatableDecoration getSourceDecoration() {
-		return startArrow;
-	}
-
-	/**
-	 * @return the target decoration (may be null)
-	 */
-	protected RotatableDecoration getTargetDecoration() {
-		return endArrow;
-	}
-
-	public void setPoints(PointList points) {
-		super.setPoints(points);
-		layout(); // update arrows
-	}
-
-	public void layout() {
-		Rectangle oldBounds = bounds;
-		super.layout();
-		bounds = null;
-		if (!getBounds().contains(oldBounds)) {
-			getParent().translateToParent(oldBounds);
-			getUpdateManager().addDirtyRegion(getParent(), oldBounds);
-		}
-		repaint();
-		fireFigureMoved();
-	}
-
-	/**
-	 * Sets the decoration to be used at the start of the {@link Connection}.
-	 * 
-	 * @param dec
-	 *            the new source decoration
-	 */
-	public void setSourceDecoration(RotatableDecoration dec) {
-		if (startArrow == dec) {
-			return;
-		}
-		if (startArrow != null) {
-			remove(startArrow);
-		}
-		startArrow = dec;
-		if (startArrow != null) {
-			add(startArrow, new ArrowLocator(this, ConnectionLocator.SOURCE));
-		}
-	}
-
-	/**
-	 * Sets the decoration to be used at the end of the {@link Connection}.
-	 * 
-	 * @param dec
-	 *            the new target decoration
-	 */
-	public void setTargetDecoration(RotatableDecoration dec) {
-		if (endArrow == dec) {
-			return;
-		}
-		if (endArrow != null) {
-			remove(endArrow);
-		}
-		endArrow = dec;
-		if (endArrow != null) {
-			add(endArrow, new ArrowLocator(this, ConnectionLocator.TARGET));
-		}
-	}
-
-	// fake connection methods
-
-	public ConnectionRouter getConnectionRouter() {
-		return null;
-	}
-
-	public void setConnectionRouter(ConnectionRouter router) {
-	}
-
-	public Object getRoutingConstraint() {
-		return null;
-	}
-
-	public void setRoutingConstraint(Object cons) {
-	}
-
-	public ConnectionAnchor getSourceAnchor() {
-		return null;
-	}
-
-	public void setSourceAnchor(ConnectionAnchor anchor) {
-	}
-
-	public ConnectionAnchor getTargetAnchor() {
-		return null;
-	}
-
-	public void setTargetAnchor(ConnectionAnchor anchor) {
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/HyperlinkFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/HyperlinkFigure.java
deleted file mode 100644
index 3f02b4e3f66..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/HyperlinkFigure.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import org.eclipse.draw2d.ColorConstants;
-import org.eclipse.draw2d.Cursors;
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MouseEvent;
-import org.eclipse.draw2d.MouseListener;
-import org.eclipse.draw2d.MouseMotionListener;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardAction;
-import org.eclipse.swt.graphics.Color;
-
-/**
- * @author dstadnik
- */
-public class HyperlinkFigure extends Label {
-
-	private DashboardAction action;
-
-	private boolean underlined;
-
-	public HyperlinkFigure(DashboardAction action) {
-		this.action = action;
-		hookMouse();
-	}
-
-	protected void paintFigure(Graphics graphics) {
-		Color color = graphics.getForegroundColor();
-		if (action.isEnabled()) {
-			graphics.setForegroundColor(ColorConstants.blue);
-		} else {
-			graphics.setForegroundColor(ColorConstants.gray);
-		}
-		super.paintFigure(graphics);
-		if (underlined) {
-			Rectangle bounds = getBounds();
-			int y = bounds.y + bounds.height - 1;
-			graphics.drawLine(bounds.x, y, bounds.x + bounds.width, y);
-		}
-		graphics.setForegroundColor(color);
-	}
-
-	protected void hookMouse() {
-		addMouseListener(new MouseListener() {
-
-			public void mouseDoubleClicked(MouseEvent me) {
-			}
-
-			public void mousePressed(MouseEvent me) {
-				if (action.isEnabled()) {
-					action.run();
-				}
-			}
-
-			public void mouseReleased(MouseEvent me) {
-			}
-
-		});
-		addMouseMotionListener(new MouseMotionListener() {
-
-			public void mouseDragged(MouseEvent me) {
-			}
-
-			public void mouseEntered(MouseEvent me) {
-				setCursor(Cursors.HAND);
-				underlined = true;
-				repaint();
-			}
-
-			public void mouseExited(MouseEvent me) {
-				underlined = false;
-				setCursor(null);
-				repaint();
-			}
-
-			public void mouseHover(MouseEvent me) {
-			}
-
-			public void mouseMoved(MouseEvent me) {
-			}
-		});
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/Messages.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/Messages.java
deleted file mode 100644
index a8a3e5f8565..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/Messages.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard.messages"; //$NON-NLS-1$
-
-	public static String DashboardFigure_DGM;
-
-	public static String DashboardFigure_GDM;
-
-	public static String DashboardFigure_DM;
-
-	public static String DashboardFigure_TDM;
-
-	public static String DashboardFigure_MM;
-
-	public static String DashboardFigure_GM;
-
-	public static String DashboardMediator_Select;
-
-	public static String DashboardMediator_Edit;
-
-	public static String DashboardMediator_Project;
-
-	public static String DashboardMediator_Progress;
-
-	public static String DashboardMediator_FailToOpen;
-
-	public static String DashboardMediator_Reload;
-
-	public static String DashboardMediator_Create;
-
-	public static String DashboardMediator_Derive;
-
-	public static String DashboardMediator_Combine;
-
-	public static String DashboardMediator_SelectProject;
-
-	public static String DashboardMediator_Transform;
-
-	public static String DashboardMediator_RCP;
-
-	public static String DashboardPart_Synchronize;
-
-	public static String DashboardPart_SynchronizeSelection;
-
-	public static String ModelFigure_NoName;
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/ModelFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/ModelFigure.java
deleted file mode 100644
index 9baa0e5968e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/ModelFigure.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.draw2d.Figure;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.Label;
-import org.eclipse.draw2d.MarginBorder;
-import org.eclipse.draw2d.RectangleFigure;
-import org.eclipse.draw2d.ToolbarLayout;
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.graphics.Image;
-
-/**
- * @author dstadnik
- */
-public class ModelFigure extends RectangleFigure implements ActionContainer {
-
-	private IFigure labelsPlate;
-
-	private IFigure actionsPlate;
-
-	private IFigure stdActionsPlate;
-
-	private List<SeparatorFigure> separators;
-
-	public ModelFigure() {
-		separators = new ArrayList<SeparatorFigure>();
-		ToolbarLayout layout = new ToolbarLayout();
-		layout.setMinorAlignment(ToolbarLayout.ALIGN_CENTER);
-		setLayoutManager(layout);
-
-		labelsPlate = new Figure();
-		ToolbarLayout labelsLayout = new ToolbarLayout();
-		labelsPlate.setLayoutManager(labelsLayout);
-		add(labelsPlate);
-
-		SeparatorFigure s1 = new SeparatorFigure();
-		separators.add(s1);
-		add(s1);
-
-		actionsPlate = new Figure();
-		ToolbarLayout actionsLayout = new ToolbarLayout();
-		actionsLayout.setStretchMinorAxis(false);
-		actionsPlate.setLayoutManager(actionsLayout);
-		add(actionsPlate);
-
-		stdActionsPlate = new Figure();
-		ToolbarLayout stdActionsLayout = new ToolbarLayout(true);
-		stdActionsLayout.setSpacing(2);
-		stdActionsPlate.setLayoutManager(stdActionsLayout);
-		actionsPlate.add(stdActionsPlate);
-
-		Label descriptionFigure = new Label();
-		descriptionFigure.setFont(JFaceResources.getBannerFont());
-		addLabel(descriptionFigure);
-		Label nameFigure = new Label();
-		addLabel(nameFigure);
-		setName(null); // init
-	}
-
-	public void setSpacing(int spacing) {
-		setBorder(new MarginBorder(spacing, 0, spacing, 0));
-		for (SeparatorFigure separator : separators) {
-			separator.setPreferredSize(new Dimension(0, spacing + separator.getLineWidth()));
-		}
-		labelsPlate.setBorder(new MarginBorder(0, spacing, 0, spacing));
-		actionsPlate.setBorder(new MarginBorder(0, spacing, 0, spacing));
-	}
-
-	public void addLabel(IFigure labelFigure) {
-		labelsPlate.add(labelFigure);
-	}
-
-	public void removeLabel(IFigure labelFigure) {
-		labelsPlate.remove(labelFigure);
-	}
-
-	public final void addAction(IFigure actionFigure) {
-		addAction(actionFigure, true);
-	}
-
-	public void addAction(IFigure actionFigure, boolean std) {
-		Label bullet = new Label();
-		// bullet.setText("-");
-		if (std) {
-			if (!stdActionsPlate.getChildren().isEmpty()) {
-				bullet.setText("/"); //$NON-NLS-1$
-			}
-			stdActionsPlate.add(bullet);
-			stdActionsPlate.add(actionFigure);
-		} else {
-			IFigure plate = new Figure();
-			ToolbarLayout layout = new ToolbarLayout(true);
-			layout.setSpacing(3);
-			plate.setLayoutManager(layout);
-			plate.add(bullet);
-			plate.add(actionFigure);
-			actionsPlate.add(plate);
-		}
-	}
-
-	public void removeAction(IFigure actionFigure, boolean std) {
-		if (std) {
-			int ix = stdActionsPlate.getChildren().indexOf(actionFigure);
-			IFigure bullet = (IFigure) stdActionsPlate.getChildren().get(ix);
-			stdActionsPlate.remove(actionFigure);
-			stdActionsPlate.remove(bullet);
-		} else {
-			actionsPlate.remove(actionFigure.getParent());
-		}
-	}
-
-	protected Label getLabel(int i) {
-		return (Label) labelsPlate.getChildren().get(i);
-	}
-
-	public String getDescription() {
-		return getLabel(0).getText();
-	}
-
-	public void setDescription(String description) {
-		getLabel(0).setText(description);
-	}
-
-	public void setIcon(Image icon) {
-		getLabel(0).setIcon(icon);
-	}
-
-	public void setName(String name) {
-		if (name == null || name.trim().length() == 0) {
-			name = Messages.ModelFigure_NoName;
-		}
-		getLabel(1).setText(name);
-	}
-
-	public void setFullName(String name) {
-		if (name == null || name.trim().length() == 0) {
-			setToolTip(null);
-		} else {
-			Label tooltip = new Label(name);
-			setToolTip(tooltip);
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/Plugin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/Plugin.java
deleted file mode 100644
index 059f5a14535..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/Plugin.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * @author dstadnik
- */
-public class Plugin extends AbstractUIPlugin {
-
-	public static final String GMF_LOGO_IMAGE = "/icons/viewban/logo.png"; //$NON-NLS-1$
-
-	public static final String SYNC_ICON = "/icons/cview16/synced.gif"; //$NON-NLS-1$
-
-	public static final String DGM_ICON = "/icons/full/obj16/GenModelModelFile.gif"; //$NON-NLS-1$
-
-	public static final String GDM_ICON = "/icons/full/obj16/GMFGraphModelFile.gif"; //$NON-NLS-1$
-
-	public static final String DM_ICON = "/icons/full/obj16/EcoreModelFile.gif"; //$NON-NLS-1$
-
-	public static final String TDM_ICON = "/icons/full/obj16/GMFToolModelFile.gif"; //$NON-NLS-1$
-
-	public static final String MM_ICON = "/icons/full/obj16/GMFMapModelFile.gif"; //$NON-NLS-1$
-
-	public static final String GM_ICON = "/icons/full/obj16/GMFGenModelFile.gif"; //$NON-NLS-1$
-
-	private static Plugin plugin;
-
-	private DashboardActionRegistry daRegistry;
-
-	public void start(BundleContext context) throws Exception {
-		plugin = this;
-		super.start(context);
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		if (daRegistry != null) {
-			daRegistry.dispose();
-			daRegistry = null;
-		}
-		super.stop(context);
-		plugin = null;
-	}
-
-	public static Plugin getDefault() {
-		return plugin;
-	}
-
-	protected void initializeImageRegistry(ImageRegistry reg) {
-		loadImage(reg, GMF_LOGO_IMAGE);
-		loadImage(reg, SYNC_ICON);
-		loadImage(reg, DGM_ICON, "org.eclipse.emf.codegen.ecore.ui"); //$NON-NLS-1$
-		loadImage(reg, GDM_ICON, "org.eclipse.papyrus.gmf.graphdef.edit"); //$NON-NLS-1$
-		loadImage(reg, DM_ICON, "org.eclipse.emf.ecore.editor"); //$NON-NLS-1$
-		loadImage(reg, TDM_ICON, "org.eclipse.papyrus.gmf.tooldef.edit"); //$NON-NLS-1$
-		loadImage(reg, MM_ICON, "org.eclipse.papyrus.gmf.map.edit"); //$NON-NLS-1$
-		loadImage(reg, GM_ICON, "org.eclipse.papyrus.gmf.codegen.edit"); //$NON-NLS-1$
-	}
-
-	protected void loadImage(ImageRegistry registry, String id) {
-		loadImage(registry, id, getBundle().getSymbolicName());
-	}
-
-	protected void loadImage(ImageRegistry registry, String id, String bundleId) {
-		ImageDescriptor descriptor = imageDescriptorFromPlugin(bundleId, id);
-		if (descriptor != null) {
-			registry.put(id, descriptor);
-		}
-	}
-
-	public static String getBundleString(String key) {
-		return Platform.getResourceBundle(getDefault().getBundle()).getString(key);
-	}
-
-	public static String getBundleString(String key, Object[] args) {
-		String val = getBundleString(key);
-		if (val == null) {
-			return key;
-		}
-		return MessageFormat.format(val, args);
-	}
-
-	public DashboardActionRegistry getDashboardActionRegistry() {
-		if (daRegistry == null) {
-			daRegistry = new DashboardActionRegistry();
-		}
-		return daRegistry;
-	}
-
-	public static IStatus createStatus(int statusCode, String message, Exception ex) {
-		return new Status(statusCode, getPluginID(), 0, message, ex);
-	}
-
-	public static IStatus createError(String message, Exception ex) {
-		return createStatus(IStatus.ERROR, message, ex);
-	}
-
-	public static IStatus createWarning(String message) {
-		return createStatus(IStatus.WARNING, message, null);
-	}
-
-	public static IStatus createInfo(String message) {
-		return createStatus(IStatus.INFO, message, null);
-	}
-
-	public static String getPluginID() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/SeparatorFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/SeparatorFigure.java
deleted file mode 100644
index d74fce3e5fd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/SeparatorFigure.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard;
-
-import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.Shape;
-import org.eclipse.draw2d.geometry.Rectangle;
-
-/**
- * @author dstadnik
- */
-public class SeparatorFigure extends Shape {
-
-	protected void outlineShape(Graphics graphics) {
-		Rectangle r = getBounds();
-		int x = r.x + lineWidth / 2;
-		int y = r.y + lineWidth / 2;
-		int w = r.width - Math.max(1, lineWidth);
-		int h = r.height - Math.max(1, lineWidth);
-		graphics.drawLine(x, y + h / 2, x + w, y + h / 2);
-	}
-
-	protected void fillShape(Graphics graphics) {
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/actions/TransformMap2GenModelAction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/actions/TransformMap2GenModelAction.java
deleted file mode 100644
index 91ae4e28b4d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/actions/TransformMap2GenModelAction.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui.dashboard.actions;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.dialogs.ErrorDialog;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardAction;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardFacade;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardState;
-import org.eclipse.papyrus.gmf.internal.bridge.transform.TransformOptions;
-import org.eclipse.papyrus.gmf.internal.bridge.transform.TransformToGenModelOperation;
-
-/**
- * @author dstadnik
- */
-public class TransformMap2GenModelAction implements DashboardAction {
-
-	private DashboardFacade context;
-
-	public void init(DashboardFacade context) {
-		this.context = context;
-	}
-
-	public boolean isEnabled() {
-		DashboardState state = context.getState();
-		if (context.isStrict()) {
-			if (state.getDM() == null || state.getDGM() == null || state.getTDM() == null) {
-				return false;
-			}
-		}
-		return state.getMM() != null;
-	}
-
-	public void run() {
-		DashboardState state = context.getState();
-		URI mm = state.getMM();
-		URI gm = state.getGM();
-		if (gm == null) {
-			gm = mm.trimFileExtension().appendFileExtension("gmfgen"); //$NON-NLS-1$
-			state.setGM(gm);
-		}
-		IStatus result = Status.OK_STATUS;
-		try {
-			final ResourceSet rs = new ResourceSetImpl();
-			TransformToGenModelOperation op = new TransformToGenModelOperation(rs);
-			configureOptions(op.getOptions());
-			op.loadMappingModel(mm, new NullProgressMonitor());
-			op.loadGenModel(state.getDGM(), new NullProgressMonitor());
-			op.setGenURI(gm);
-			result = op.executeTransformation(new NullProgressMonitor());
-		} catch (CoreException ce) {
-			result = ce.getStatus();
-		} finally {
-			context.updateStatus();
-		}
-		ErrorDialog.openError(context.getShell(), null, null, result, IStatus.ERROR | IStatus.WARNING);
-	}
-
-	protected void configureOptions(TransformOptions options) {
-		options.setUseRuntimeFigures(true);
-		options.setUseMapMode(true);
-		options.setGenerateRCP(context.getState().getOption(DashboardFacade.OPTION_RCP));
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/messages.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/messages.properties
deleted file mode 100644
index afeb713b16e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui.dashboard/src/org/eclipse/papyrus/gmf/internal/bridge/ui/dashboard/messages.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-ModelFigure_NoName=<not specified>
-DashboardFigure_DGM=Domain Gen Model
-DashboardFigure_GDM=Graphical Def Model
-DashboardFigure_DM=Domain Model
-DashboardFigure_TDM=Tooling Def Model
-DashboardFigure_MM=Mapping Model
-DashboardFigure_GM=Diagram Editor Gen Model
-DashboardMediator_Select=Select
-DashboardMediator_Edit=Edit
-DashboardMediator_Project=Project: {0}
-DashboardMediator_Progress=Progress: {0,number,percent} done
-DashboardMediator_FailToOpen=Unable to open editor for {0}
-DashboardMediator_Reload=Reload
-DashboardMediator_Create=Create
-DashboardMediator_Derive=Derive
-DashboardMediator_Combine=Combine
-DashboardMediator_SelectProject=Select a project in workspace
-DashboardMediator_Transform=Transform
-DashboardMediator_RCP=RCP
-DashboardPart_Synchronize=Synchronize
-DashboardPart_SynchronizeSelection=Synchronize with workbench selection
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.options b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.options
deleted file mode 100644
index f2d7c296dfa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.options
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# set to false to fully overwrite any existing gmfgen model, without any attempt to keep old values
-org.eclipse.papyrus.gmf.bridge.ui/reconcile=true
-
-#
-# when there are content object(s) in the target .gmfgen resource in addition to GenEditorGenerator,
-# some of them may have references to GenEditorGenerator being replaced with new instance. Though we 
-# do our best to update these references (using Reconciler rules), some of them may not get updated 
-# and lead to exceptions during resource serialization. You may force to ignore such references with 
-# this option (reference will be lost and you'll need to set its value manually afterwards) 
-org.eclipse.papyrus.gmf.bridge.ui/transform/ignore-dangling-on-save=false
-
-#
-# Turn this option on if you'd like to get console output of QVTO Map2Gen transformation
-# into System.err (e.g. log() statements from within Map2Gen.qvto)
-# Note, this option is likely to move to oeg.bridge plugin 
-org.eclipse.papyrus.gmf.bridge.ui/transform/print-qvto-console=false
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.project
deleted file mode 100644
index 790abe7e2a9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.bridge.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index e36c8150ae1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding//src/org/eclipse/papyrus/gmf/internal/bridge/transform/messages.properties=8859_1
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 5277f78ff9b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,37 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.bridge.ui;singleton:=true
-Bundle-Version: 1.5.1.qualifier
-Bundle-Activator: org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jdt.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.emf.ecore.edit;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.papyrus.gmf.bridge;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.gmf.graphdef.edit;bundle-version="[2.0.0,3.1.0)",
- org.eclipse.papyrus.gmf.tooldef.edit;bundle-version="[2.0.0,3.1.0)",
- org.eclipse.papyrus.gmf.map.edit;bundle-version="[2.0.0,3.1.0)",
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.emf.importer;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.m2m.qvt.oml.runtime;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.papyrus.gmf.internal.bridge.resolver;x-internal:=true,
- org.eclipse.papyrus.gmf.internal.bridge.transform;
-  x-friends:="org.eclipse.papyrus.gmf.bridge.ui.dashboard,
-   org.eclipse.papyrus.gmf.codegen.ui,
-   org.eclipse.gmf.tests,
-   org.eclipse.papyrus.gmf.codegen.lite.ui,
-   org.eclipse.gmf.tooling.simplemap.bridge.ui",
- org.eclipse.papyrus.gmf.internal.bridge.ui;x-friends:="org.eclipse.papyrus.gmf.bridge.ui.dashboard,org.eclipse.gmf.doc.ui,org.eclipse.papyrus.gmf.codegen.ui",
- org.eclipse.papyrus.gmf.internal.bridge.wizards;x-friends:="org.eclipse.papyrus.gmf.bridge.ui.dashboard,org.eclipse.gmf.doc.ui,org.eclipse.papyrus.gmf.codegen.ui",
- org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;x-friends:="org.eclipse.gmf.doc.ui",
- org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;x-internal:=true,
- org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/build.properties
deleted file mode 100644
index 5961de77ab0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               icons/,\
-               plugin.properties,\
-               about.html,\
-               .options
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/checked.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/checked.gif
deleted file mode 100644
index 9cacb96dca9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/checked.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/grayed.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/grayed.gif
deleted file mode 100644
index 5986babd278..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/grayed.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/label.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/label.gif
deleted file mode 100644
index 84d778cbe7a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/label.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/link.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/link.gif
deleted file mode 100644
index e5a02a5e11c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/link.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/node.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/node.gif
deleted file mode 100644
index 7905b47dc12..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/node.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/unchecked.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/unchecked.gif
deleted file mode 100644
index f6b9f8a590c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/cview16/unchecked.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFGraphModelFile.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFGraphModelFile.gif
deleted file mode 100644
index f47b7ffdbe2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFGraphModelFile.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFMapModelFile.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFMapModelFile.gif
deleted file mode 100644
index dc44e5423ed..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFMapModelFile.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFToolModelFile.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFToolModelFile.gif
deleted file mode 100644
index 074518f0f1c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/GMFToolModelFile.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/NewGMFProject.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/NewGMFProject.gif
deleted file mode 100644
index 7c98a92fd97..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/icons/obj16/NewGMFProject.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/plugin.properties
deleted file mode 100644
index d058694352e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/plugin.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-###############################################################################
-pluginName = Papyrus GMF Tooling UI
-providerName=Eclipse Modeling Project
-
-
-wizardCategoryName=Graphical Modeling Framework
-defaultWizardsCategoryName=Default
-
-
-_UI_GMFMapGuideModelWizard_label = Guide Mapping Model Creation
-_UI_GMFMapGuideModelWizard_description = Create a new mapping model with contents inferred from existing domain, graphical and tooling definition models
-_UI_GMFGraphSimpleModelWizard_label = Simple Graphical Definition Model
-_UI_GMFGraphSimpleModelWizard_description = Create a new graphical definition model with basic contents for the given domain model
-_UI_GMFToolSimpleModelWizard_label = Simple Tooling Definition Model
-_UI_GMFToolSimpleModelWizard_description = Create a new tooling definition model with basic contents for the given domain model
-
-reconcileWizardsCategoryName=Reconcile
-_UI_GMFGraphReconcileModelWizard_label = Reconcile Graphical Definition Model
-_UI_GMFGraphReconcileModelWizard_description = Reconcile existing graphical definition model with changes in domain model
-_UI_GMFToolReconcileModelWizard_label = Reconcile Tooling Definition Model
-_UI_GMFToolReconcileModelWizard_description = Reconcile existing tooling definition model with changes in domain model
-
-newProjectWizard.name=Graphical editor project
-newProjectWizard.desc=Creates new blank GMF project
-showDashboardPage.name=Show Dashboard
-showDashboardPage.desc=Show dashboard view for the created project
-showDashboardPage.text=Show dashboard view for the created project
-
-transform.action=Create generator model...
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/plugin.xml
deleted file mode 100644
index 416f24cde6a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/plugin.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.newWizards">
-    <category
-      id = "org.eclipse.gmf.tooling.wizardCategory"
-      name="%wizardCategoryName">
-    </category>
-    <category
-          id="org.eclipse.gmf.tooling.wizardsDefault"
-          name="%defaultWizardsCategoryName"
-          parentCategory="org.eclipse.gmf.tooling.wizardCategory"/>
-    <category
-          id="org.eclipse.gmf.tooling.wizardsReconcile"
-          name="%reconcileWizardsCategoryName"
-          parentCategory="org.eclipse.gmf.tooling.wizardCategory">
-    </category>
-    <wizard
-          category="org.eclipse.gmf.tooling.wizardCategory"
-          class="org.eclipse.papyrus.gmf.internal.bridge.wizards.NewGMFProjectWizard"
-          icon="icons/obj16/NewGMFProject.gif"
-          id="org.eclipse.gmf.tooling.newProjectWizard"
-          name="%newProjectWizard.name"
-          project="true">
-       <description>%newProjectWizard.desc</description>
-    </wizard>
-    <wizard
-      id = "org.eclipse.papyrus.gmf.internal.codegen.wizards.GMFGraphSimpleModelWizardID"
-      name = "%_UI_GMFGraphSimpleModelWizard_label"
-      class = "org.eclipse.papyrus.gmf.internal.bridge.wizards.GMFGraphSimpleModelWizard"
-      category = "org.eclipse.gmf.tooling.wizardCategory"
-      icon = "icons/obj16/GMFGraphModelFile.gif">
-      <description>%_UI_GMFGraphSimpleModelWizard_description</description>
-      <selection class = "org.eclipse.core.resources.IResource" />
-    </wizard>
-    <wizard
-      id = "org.eclipse.papyrus.gmf.internal.codegen.wizards.GMFToolSimpleModelWizardID"
-      name = "%_UI_GMFToolSimpleModelWizard_label"
-      class = "org.eclipse.papyrus.gmf.internal.bridge.wizards.GMFToolSimpleModelWizard"
-      category = "org.eclipse.gmf.tooling.wizardCategory"
-      icon = "icons/obj16/GMFToolModelFile.gif">
-      <description>%_UI_GMFToolSimpleModelWizard_description</description>
-      <selection class = "org.eclipse.core.resources.IResource" />
-    </wizard>
-    <wizard
-          category="org.eclipse.gmf.tooling.wizardCategory"
-          class="org.eclipse.papyrus.gmf.internal.bridge.wizards.GMFMapGuideModelWizard"
-          icon="icons/obj16/GMFMapModelFile.gif"
-          id="org.eclipse.papyrus.gmf.internal.codegen.wizards.GMFMapGuideModelWizardID"
-          name="%_UI_GMFMapGuideModelWizard_label">
-       <description>
-          %_UI_GMFMapGuideModelWizard_description
-       </description>
-       <selection
-             class="org.eclipse.core.resources.IResource">
-       </selection>
-    </wizard>
-    <wizard
-          category="org.eclipse.gmf.tooling.wizardsReconcile"
-          class="org.eclipse.papyrus.gmf.internal.bridge.wizards.GMFGraphReconcileModelWizard"
-          icon="icons/obj16/GMFGraphModelFile.gif"
-          id="org.eclipse.papyrus.gmf.internal.codegen.wizards.GMFGraphReconcileModelWizardID"
-          name="%_UI_GMFGraphReconcileModelWizard_label">
-       <description>
-          %_UI_GMFGraphReconcileModelWizard_description
-       </description>
-       <selection
-             class="org.eclipse.core.resources.IResource">
-       </selection>
-    </wizard>
-    <wizard
-      id = "org.eclipse.papyrus.gmf.internal.codegen.wizards.GMFToolReconcileModelWizardID"
-      name = "%_UI_GMFToolReconcileModelWizard_label"
-      class = "org.eclipse.papyrus.gmf.internal.bridge.wizards.GMFToolReconcileModelWizard"
-      category = "org.eclipse.gmf.tooling.wizardsReconcile"
-      icon = "icons/obj16/GMFToolModelFile.gif">
-      <description>%_UI_GMFToolReconcileModelWizard_description</description>
-      <selection class = "org.eclipse.core.resources.IResource" />
-    </wizard>
-  </extension>
-
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <objectContribution
-            adaptable="true"
-            id="gmf.codegen.ui.transformToGenModelFile"
-            nameFilter="*.gmfmap"
-            objectClass="org.eclipse.core.resources.IFile">
-         <action
-               class="org.eclipse.papyrus.gmf.internal.bridge.transform.TransformToGenModelAction"
-               enablesFor="1"
-               id="gmf.bridge.ui.transformToGenModelFileAction"
-               label="%transform.action"
-               menubarPath="additions">
-         </action>
-      </objectContribution>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer class="org.eclipse.papyrus.gmf.internal.bridge.transform.TransformOptions"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/pom.xml
deleted file mode 100644
index c8e91f736ab..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/pom.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- * Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.bridge.ui</artifactId>
-	<version>1.5.1-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/ContainmentClosure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/ContainmentClosure.java
deleted file mode 100644
index 7b9986f5400..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/ContainmentClosure.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.resolver;
-
-import java.lang.ref.WeakReference;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * @author dstadnik
- */
-public class ContainmentClosure {
-
-	private WeakReference<EClass> rootRef = new WeakReference<EClass>(null); // : EClass
-
-	private WeakReference<EPackage> scopeRef = new WeakReference<EPackage>(null); // : EPackage
-
-	private WeakReference<Set<EClass>> closureRef = new WeakReference<Set<EClass>>(null); // : Set : EClass
-
-	public ContainmentClosure() {
-	}
-
-	/**
-	 * Checks whether type is contained within the containment closure of the root type.
-	 */
-	public synchronized boolean contains(EClass root, EClass type, EPackage scope) {
-		assert root != null;
-		assert type != null;
-		assert scope != null;
-		Set<EClass> closure = closureRef.get();
-		if (rootRef.get() != root || scopeRef.get() != scope || closure == null) {
-			closure = build(root, scope);
-			rootRef = new WeakReference<EClass>(root);
-			scopeRef = new WeakReference<EPackage>(scope);
-			closureRef = new WeakReference<Set<EClass>>(closure);
-		}
-		return closure.contains(type);
-	}
-
-	private static Set<EClass> build(EClass type, EPackage scope) {
-		assert type != null;
-		Set<EClass> closure = new HashSet<EClass>();
-		Set<EClass> roots = new HashSet<EClass>(); // types that should be investigated
-		roots.add(type);
-		while (!roots.isEmpty()) {
-			Set<EClass> localRoots = roots;
-			roots = new HashSet<EClass>();
-			for (Iterator<EClass> it = localRoots.iterator(); it.hasNext();) {
-				EClass root = it.next();
-				for (Iterator<EReference> it1 = root.getEAllContainments().iterator(); it1.hasNext();) {
-					EClass refType = it1.next().getEReferenceType();
-					if (closure.contains(refType)) {
-						continue; // do not traverse loops
-					}
-					closure.add(refType);
-					roots.add(refType);
-					Collection<EClass> subtypes = getSubtypes(refType, scope);
-					if (subtypes != null) {
-						for (Iterator<EClass> it2 = subtypes.iterator(); it2.hasNext();) {
-							EClass subtype = it2.next();
-							if (closure.contains(subtype)) {
-								continue; // do not traverse loops
-							}
-							closure.add(subtype);
-							roots.add(subtype);
-						}
-					}
-				}
-			}
-		}
-		return closure;
-	}
-
-	private static Collection<EClass> getSubtypes(EClass type, EPackage scope) {
-		Collection<EClass> subtypes = null;
-		for (Iterator<EObject> it = scope.eAllContents(); it.hasNext();) {
-			EObject next = it.next();
-			if (next instanceof EClass) {
-				EClass nextType = (EClass) next;
-				if (type != nextType && type.isSuperTypeOf(nextType)) {
-					if (subtypes == null) {
-						subtypes = new HashSet<EClass>();
-					}
-					subtypes.add(nextType);
-				}
-			}
-		}
-		return subtypes;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/NodePattern.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/NodePattern.java
deleted file mode 100644
index 5053e8a5009..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/NodePattern.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.resolver;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * @author dstadnik
- */
-public class NodePattern extends TypePattern {
-
-	private EReference[] refLinks;
-
-	public NodePattern(EClass type, EAttribute[] labels, EReference[] refLinks) {
-		super(type, labels);
-		this.refLinks = refLinks;
-	}
-
-	public EReference[] getRefLinks() {
-		return refLinks;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/StructureResolver.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/StructureResolver.java
deleted file mode 100644
index cac695c10ae..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/StructureResolver.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.resolver;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * @author dstadnik
- */
-public class StructureResolver {
-
-	private Vocabulary nodeVocabulary;
-
-	private Vocabulary linkVocabulary;
-
-	private Vocabulary linkSourceVocabulary;
-
-	private Vocabulary linkTargetVocabulary;
-
-	public StructureResolver() {
-		nodeVocabulary = new Vocabulary();
-		nodeVocabulary.add(new String[] { "node", "item" }); //$NON-NLS-1$  //$NON-NLS-2$
-		linkVocabulary = new Vocabulary();
-		linkVocabulary.add(new String[] { "link", "connection", "relation", "dependency", "flow" }); //$NON-NLS-1$  //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
-		linkSourceVocabulary = new Vocabulary();
-		linkSourceVocabulary.add(new String[] { "source", "src", "from" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-		linkTargetVocabulary = new Vocabulary();
-		linkTargetVocabulary.add(new String[] { "destination", "dst", "dest", "to" }); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
-	}
-
-	protected boolean guessNode(EClass type) {
-		return nodeVocabulary.containsWords(type.getName());
-	}
-
-	protected boolean guessLink(EClass type) {
-		return linkVocabulary.containsWords(type.getName());
-	}
-
-	protected EReference guessLinkSource(EReference[] refs) {
-		for (int i = 0; i < refs.length; i++) {
-			if (linkSourceVocabulary.containsWords(refs[i].getName())) {
-				return refs[i];
-			}
-		}
-		return null;
-	}
-
-	protected EReference guessLinkTarget(EReference[] refs) {
-		for (int i = 0; i < refs.length; i++) {
-			if (linkTargetVocabulary.containsWords(refs[i].getName())) {
-				return refs[i];
-			}
-		}
-		return null;
-	}
-
-	public TypePattern resolve(EClass type, EPackage scope) {
-		if (type.isAbstract() || type.isInterface()) {
-			return null;
-		}
-		EReference[] containments = getContainments(type, scope);
-		if (containments.length == 0) {
-			// skip diagram node and other unattached types
-			return null;
-		}
-		EAttribute[] labels = getLabels(type);
-		EReference[] refs = getEAllPotentialRefs(type, true);
-		// heuristics : type without refs is a node
-		// heuristics : type that has containment feature(s) is likely a node
-		// heuristics : guess node by vocabulary
-		if (refs.length == 0 || !type.getEAllContainments().isEmpty() || guessNode(type)) {
-			refs = getEAllPotentialRefs(type, false);
-			return new NodePattern(type, labels, refs);
-		}
-		EReference source;
-		EReference target;
-		if (refs.length == 1) {
-			// heuristics : one ref is target; source is container
-			source = null;
-			target = refs[0];
-		} else {
-			// heuristics : guess source and target refs by vocabulary
-			source = guessLinkSource(refs);
-			target = guessLinkTarget(refs);
-			if (source == null) {
-				source = target == refs[0] ? refs[1] : refs[0];
-			}
-			if (target == null) {
-				target = source == refs[1] ? refs[0] : refs[1];
-			}
-		}
-		return new TypeLinkPattern(type, labels, source, target);
-	}
-
-	protected EAttribute[] getLabels(EClass type) {
-		List<EAttribute> attrs = new ArrayList<EAttribute>();
-		for (Iterator<EAttribute> it = type.getEAllAttributes().iterator(); it.hasNext();) {
-			attrs.add(it.next());
-		}
-		return attrs.toArray(new EAttribute[attrs.size()]);
-	}
-
-	/**
-	 * Finds all potential references. Such references are not containers, containments,
-	 * derived and have type from the same package as the host type; thus they may
-	 * connect types as links on diagram surface.
-	 */
-	protected EReference[] getEAllPotentialRefs(EClass type, boolean forLink) {
-		List<EReference> refs = new ArrayList<EReference>();
-		for (Iterator<EReference> it = type.getEAllReferences().iterator(); it.hasNext();) {
-			EReference ref = it.next();
-			EClass refType = ref.getEReferenceType();
-			if (forLink && (refType.isSuperTypeOf(type) || ref.isMany())) {
-				continue;
-			}
-			boolean samePackage = refType.getEPackage().equals(type.getEPackage());
-			if (!ref.isDerived() && !ref.isContainer() && !ref.isContainment() && samePackage) {
-				refs.add(ref);
-			}
-		}
-		return refs.toArray(new EReference[refs.size()]);
-	}
-
-	/**
-	 * Returns list of references that contain this type.
-	 */
-	protected EReference[] getContainments(EClass type, EPackage scope) {
-		List<EReference> refs = new ArrayList<EReference>();
-		for (Iterator<EObject> it = scope.eAllContents(); it.hasNext();) {
-			EObject element = it.next();
-			if (element instanceof EReference) {
-				EReference ref = (EReference) element;
-				if (ref.isContainment() && ref.getEReferenceType().isSuperTypeOf(type)) {
-					refs.add(ref);
-				}
-			}
-		}
-		return refs.toArray(new EReference[refs.size()]);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/TypeLinkPattern.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/TypeLinkPattern.java
deleted file mode 100644
index 210b4d57b30..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/TypeLinkPattern.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.resolver;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * @author dstadnik
- */
-public class TypeLinkPattern extends TypePattern {
-
-	private EReference source;
-
-	private EReference target;
-
-	public TypeLinkPattern(EClass type, EAttribute[] labels, EReference source, EReference target) {
-		super(type, labels);
-		this.source = source;
-		this.target = target;
-	}
-
-	public EReference getSource() {
-		return source;
-	}
-
-	public EReference getTarget() {
-		return target;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/TypePattern.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/TypePattern.java
deleted file mode 100644
index 43475194803..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/TypePattern.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.resolver;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * @author dstadnik
- */
-public abstract class TypePattern {
-
-	private EClass type;
-
-	private EAttribute[] labels;
-
-	public TypePattern(EClass node, EAttribute[] labels) {
-		this.type = node;
-		this.labels = labels;
-	}
-
-	public EClass getType() {
-		return type;
-	}
-
-	public EAttribute[] getLabels() {
-		return labels;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/Vocabulary.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/Vocabulary.java
deleted file mode 100644
index ea976de35e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/resolver/Vocabulary.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.resolver;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-/**
- * @author dstadnik
- */
-public class Vocabulary {
-
-	private Set<String> words = new HashSet<String>();
-
-	public void add(String[] words) {
-		for (int i = 0; i < words.length; i++) {
-			if (words[i] != null) {
-				this.words.add(words[i].toLowerCase());
-			}
-		}
-	}
-
-	public void add(String word) {
-		if (word != null) {
-			words.add(word.toLowerCase());
-		}
-	}
-
-	public boolean containsWords(String s) {
-		s = s.toLowerCase();
-		for (Iterator<String> it = words.iterator(); it.hasNext();) {
-			String word = it.next();
-			if (s.indexOf(word) >= 0) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GMFGenModelDiagnosticPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GMFGenModelDiagnosticPage.java
deleted file mode 100644
index f50cae3dd79..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GMFGenModelDiagnosticPage.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Borland Software Corporation - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.emf.common.util.Diagnostic;
-
-
-class GMFGenModelDiagnosticPage extends ModelDiagnosticPage {
-
-	GMFGenModelDiagnosticPage(String pageName) {
-		super(pageName);
-		setTitle(Messages.TransformToGenModelWizard_title_gmfgendiagnostic);
-		setDescription(Messages.TransformToGenModelWizard_descr_gmfgendiagnostic);
-	}
-
-	@Override
-	protected boolean getIgnoreOption() {
-		return getOperation().getOptions().getIgnoreGMFGenValidation();
-	}
-
-	@Override
-	protected Diagnostic getValidationResult() {
-		return getOperation().getGMFGenValidationResult();
-	}
-
-	@Override
-	protected void setIgnoreOption(boolean ignore) {
-		getOperation().getOptions().setIgnoreGMFGenValidation(ignore);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GMFGenNewFileCreationPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GMFGenNewFileCreationPage.java
deleted file mode 100644
index 1e7447a14d7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GMFGenNewFileCreationPage.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ProjectScope;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.osgi.service.prefs.Preferences;
-
-class GMFGenNewFileCreationPage extends WizardNewFileCreationPage {
-
-	static final String EXT_GMFGEN = "gmfgen"; //$NON-NLS-1$
-
-	private ResourceGroupEmulator resourceGroupEmulator;
-
-	public GMFGenNewFileCreationPage(IStructuredSelection selection) {
-		super(GMFGenNewFileCreationPage.class.getSimpleName(), selection);
-		setTitle(Messages.TransformToGenModelWizard_title_gmfgen);
-		setDescription(Messages.TransformToGenModelWizard_descr_gmfgen);
-	}
-
-	@Override
-	public void createControl(Composite parent) {
-		resourceGroupEmulator = new ResourceGroupEmulator();
-		super.createControl(parent);
-		validateFileExists();
-	}
-
-	protected boolean validatePage() {
-		if (emulateValidate()) {
-			// Make sure the file ends in ".gmfgen".
-			//
-			String enteredExt = new Path(getFileName()).getFileExtension();
-			if (enteredExt == null || !enteredExt.equals(EXT_GMFGEN)) {
-				String pattern = Messages.GMFGenNewFileCreationPage_e_filename;
-				setErrorMessage(MessageFormat.format(pattern, new Object[] { EXT_GMFGEN }));
-				return false;
-			} else {
-				validateFileExists();
-				// TODO provide an option (prefpage or e.g. CTRL on kbd while wizard starts) whether toolsmith like
-				// to keep project-relative settings (for those who hate /project/.settings/ folder, as I do)
-				// e.g. Platform.getPreferenceService().getBoolean("oeg.bridge.ui", "transf-settings-per-gmfgen", true, null)
-				Preferences contextOptions = new ProjectScope(getModelFile().getProject()).getNode(getFileName());
-				((TransformToGenModelWizard) getWizard()).getTransformOperation().getOptions().setContext(contextOptions);
-				return true;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	private void validateFileExists() {
-		IPath resourcePath = getContainerFullPath().append(getFileName());
-		if (isFileExists(resourcePath)) {
-			setMessage(Messages.ResourceGroup_nameExists, IMessageProvider.WARNING);
-		}
-	}
-
-	public IFile getModelFile() {
-		return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
-	}
-
-	private boolean emulateValidate() {
-		boolean valid = true;
-
-		if (!resourceGroupEmulator.validateControls()) {
-			// if blank name then fail silently
-			if (resourceGroupEmulator.getProblemType() == ResourceGroupEmulator.PROBLEM_RESOURCE_EMPTY || resourceGroupEmulator.getProblemType() == ResourceGroupEmulator.PROBLEM_CONTAINER_EMPTY) {
-				setMessage(resourceGroupEmulator.getProblemMessage());
-				setErrorMessage(null);
-			} else {
-				setErrorMessage(resourceGroupEmulator.getProblemMessage());
-			}
-			valid = false;
-		}
-
-		String resourceName = getFileName();
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IStatus result = workspace.validateName(resourceName, IResource.FILE);
-		if (!result.isOK()) {
-			setErrorMessage(result.getMessage());
-			return false;
-		}
-
-		IStatus linkedResourceStatus = null;
-		if (valid) {
-			linkedResourceStatus = validateLinkedResource();
-			if (linkedResourceStatus.getSeverity() == IStatus.ERROR) {
-				valid = false;
-			}
-		}
-		// validateLinkedResource sets messages itself
-		if (valid && (linkedResourceStatus == null || linkedResourceStatus.isOK())) {
-			setMessage(null);
-			setErrorMessage(null);
-		}
-		return valid;
-	}
-
-	boolean isFileExists(IPath resourcePath) {
-		if (resourcePath == null) {
-			return false;
-		}
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		return (workspace.getRoot().getFolder(resourcePath).exists() || workspace.getRoot().getFile(resourcePath).exists());
-	}
-
-	// XXX: remove after fix of https://bugs.eclipse.org/bugs/show_bug.cgi?id=172000
-	private class ResourceGroupEmulator {
-
-		static final int PROBLEM_NONE = 0;
-
-		static final int PROBLEM_RESOURCE_EMPTY = 1;
-
-		static final int PROBLEM_RESOURCE_EXIST = 2;
-
-		static final int PROBLEM_PATH_INVALID = 4;
-
-		static final int PROBLEM_CONTAINER_EMPTY = 5;
-
-		static final int PROBLEM_PROJECT_DOES_NOT_EXIST = 6;
-
-		static final int PROBLEM_NAME_INVALID = 7;
-
-		static final int PROBLEM_PATH_OCCUPIED = 8;
-
-		private boolean allowExistingResources = true;
-
-		private String problemMessage = "";//$NON-NLS-1$
-
-		private int problemType = PROBLEM_NONE;
-
-		ResourceGroupEmulator() {
-			// just create
-		}
-
-		boolean validateControls() {
-			// don't attempt to validate controls until they have been created
-			try {
-				getFileName();
-			} catch (Exception e) {
-				return false;
-			}
-			problemType = PROBLEM_NONE;
-			problemMessage = "";//$NON-NLS-1$
-
-			if (!validateContainer() || !validateResourceName()) {
-				return false;
-			}
-
-			IPath path = getContainerFullPath().append(getFileName());
-			return validateFullResourcePath(path);
-		}
-
-		private boolean validateContainer() {
-			IPath path = getContainerFullPath();
-			if (path == null) {
-				problemType = PROBLEM_CONTAINER_EMPTY;
-				problemMessage = Messages.ResourceGroup_folderEmpty;
-				return false;
-			}
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-			String projectName = path.segment(0);
-			if (projectName == null || !workspace.getRoot().getProject(projectName).exists()) {
-				problemType = PROBLEM_PROJECT_DOES_NOT_EXIST;
-				problemMessage = Messages.ResourceGroup_noProject;
-				return false;
-			}
-			// path is invalid if any prefix is occupied by a file
-			IWorkspaceRoot root = workspace.getRoot();
-			while (path.segmentCount() > 1) {
-				if (root.getFile(path).exists()) {
-					problemType = PROBLEM_PATH_OCCUPIED;
-					problemMessage = NLS.bind(Messages.ResourceGroup_pathOccupied, path.makeRelative());
-					return false;
-				}
-				path = path.removeLastSegments(1);
-			}
-			return true;
-		}
-
-		private boolean validateResourceName() {
-			String resourceName = getFileName();
-
-			if (resourceName.length() == 0) {
-				problemType = PROBLEM_RESOURCE_EMPTY;
-				problemMessage = NLS.bind(Messages.ResourceGroup_emptyName, Messages.WizardNewFileCreationPage_file);
-				return false;
-			}
-
-			if (!Path.ROOT.isValidPath(resourceName)) {
-				problemType = PROBLEM_NAME_INVALID;
-				problemMessage = NLS.bind(Messages.ResourceGroup_invalidFilename, resourceName);
-				return false;
-			}
-			return true;
-		}
-
-		private boolean validateFullResourcePath(IPath resourcePath) {
-			IWorkspace workspace = ResourcesPlugin.getWorkspace();
-
-			IStatus result = workspace.validatePath(resourcePath.toString(), IResource.FOLDER);
-			if (!result.isOK()) {
-				problemType = PROBLEM_PATH_INVALID;
-				problemMessage = result.getMessage();
-				return false;
-			}
-
-			if (!allowExistingResources && isFileExists(resourcePath)) {
-				problemType = PROBLEM_RESOURCE_EXIST;
-				problemMessage = Messages.ResourceGroup_nameExists;
-				return false;
-			}
-			return true;
-		}
-
-		String getProblemMessage() {
-			return problemMessage;
-		}
-
-		int getProblemType() {
-			return problemType;
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GenModelConfigurationPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GenModelConfigurationPage.java
deleted file mode 100644
index 5e80593410c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GenModelConfigurationPage.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.importer.ui.EMFModelWizard;
-import org.eclipse.emf.importer.ui.GenModelReloadActionDelegate;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.PlatformUI;
-
-
-class GenModelConfigurationPage extends ModelConfigurationPage {
-	
-	private static final String FILE_EXT_ECORE = "ecore"; //$NON-NLS-1$
-	private Button createWizardBtn;
-	private Button createDefaultBtn;
-	private Button refreshStaleBtn;
-	
-	GenModelConfigurationPage(String pageId, ResourceLocationProvider rlp, ResourceSet resourceSet) {
-		super(pageId, rlp, resourceSet);
-		setTitle(Messages.TransformToGenModelWizard_title_genmodel);
-		setDescription(Messages.TransformToGenModelWizard_descr_genmodel);
-		setModelFileExtension("genmodel"); //$NON-NLS-1$
-	}
-	
-	@Override
-	protected void createAdditionalControls(Composite parent) {
-		Composite createComposite = new Composite(parent, SWT.NONE);
-		createComposite.setLayout(new GridLayout(2, true));
-		createComposite.setLayoutData(createGridData());
-
-		createWizardBtn = new Button(createComposite, SWT.PUSH);
-		createWizardBtn.setText(Messages.GenModelConfigurationPage_btn_new_wizard);
-		setButtonLayoutData(createWizardBtn);
-
-		createDefaultBtn = new Button(createComposite, SWT.PUSH);
-		createDefaultBtn.setText(Messages.GenModelConfigurationPage_btn_create_default);
-		setButtonLayoutData(createDefaultBtn);
-
-		refreshStaleBtn = new Button(createComposite, SWT.PUSH);
-		refreshStaleBtn.setText(Messages.GenModelConfigurationPage_btn_refresh_stale);
-		setButtonLayoutData(refreshStaleBtn);
-
-		SelectionAdapter selectionAdapter = new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				handleSelection(e.widget);
-			}
-		};
-		createWizardBtn.addSelectionListener(selectionAdapter);
-		createDefaultBtn.addSelectionListener(selectionAdapter);
-		refreshStaleBtn.addSelectionListener(selectionAdapter);
-	}
-
-	private GridData createGridData() {
-		GridData gd = new GridData();
-		gd.horizontalAlignment = GridData.FILL;
-		gd.grabExcessHorizontalSpace = true;
-		return gd;
-	}
-	
-	void handleSelection(Widget w) {
-		if (createDefaultBtn.equals(w)){
-			createDefault();
-		} else if (createWizardBtn.equals(w)) {
-			launchWizard();
-		} else if (refreshStaleBtn.equals(w)) {
-			refreshGenmodel();
-		}
-	}
-
-	@Override
-	protected void initControls() {
-		super.initControls();
-		if (getURI() == null) {
-			findGenmodel();
-		} else {
-			updateControls();
-		}
-	}
-	
-	void findGenmodel() {
-		try {
-			GenModel genModel = getOperation().findGenmodel();
-			if (genModel != null) {
-				Resource r = genModel.eResource();
-				URI genURI = r.getURI();
-				setURI(genURI);
-				updateURI();
-			} else {
-				setPageComplete(true);
-				updateControls();
-			}
-		} catch (CoreException e) {
-			setErrorMessage(e.getMessage());
-			updateControls();
-		}
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.papyrus.gmf.internal.common.ui.ModelSelectionPage#resourceChanged()
-	 */
-	@Override
-	protected void resourceChanged() {
-		super.resourceChanged();
-		updateControls();
-		setPageComplete(getResource() != null);
-	}
-
-	private void updateControls() {
-		GenModelDetector gmd = getOperation().getGenModelDetector();
-		if (gmd!= null) {
-			createDefaultBtn.setEnabled(gmd.canCreateDefault());
-		}
-		IStatus stale = getOperation().getStaleGenmodelStatus();
-		if (stale != null && !stale.isOK()) {
-			setStatusMessage(stale);
-			refreshStaleBtn.setEnabled((getURI() != null));
-		} else {
-			refreshStaleBtn.setEnabled(false);
-		}
-	}
-
-	@Override
-	protected Resource doLoadResource(IProgressMonitor monitor) throws CoreException {
-		GenModel genModel = getOperation().loadGenModel(getURI(), monitor);
-		if (genModel == null) {
-			return null;
-		}
-		return genModel.eResource();
-	}
-
-	private void createDefault() {
-		try {
-			ITransformToGenModelOperation to = getOperation();
-			GenModelDetector gmd = to.getGenModelDetector();
-			TransformToGenModelWizard wizard = (TransformToGenModelWizard) getWizard();
-			IFile mapFile = wizard.getMapFile();
-			String pluginID = mapFile.getProject().getName();
-			URI genURI = gmd.createDefault(pluginID, mapFile);
-			setURI(genURI);
-			updateURI();
-		} catch (CoreException e) {
-			setErrorMessage(e.getMessage());
-		}
-	}
-	
-	private void launchWizard() {
-		TransformToGenModelWizard wizard = (TransformToGenModelWizard) getWizard();
-		IFile mapFile = wizard.getMapFile();
-		IFile genmodel = createWithWizard(getShell(), mapFile);
-		if (genmodel != null) {
-			setURI(URI.createPlatformResourceURI(genmodel.getFullPath().toString(), true));
-			updateURI();
-		}
-	}
-	
-	private static IFile createWithWizard(Shell shell, IFile patternResource) {
-		final IFile[] result = new IFile[1];
-		EMFModelWizard wizard = new EMFModelWizard() {
-			@Override
-			public boolean performFinish() {
-				result[0] = ResourcesPlugin.getWorkspace().getRoot().getFile(genModelContainerPath.append(genModelFileName));
-				return super.performFinish();
-			}
-		};
-		wizard.init(PlatformUI.getWorkbench(), createSelectionForEMFWizard(patternResource));
-		if (Window.OK == new WizardDialog(shell, wizard).open()) {
-			assert result[0] != null;
-			return result[0];
-		}
-		return null;
-	}
-	private static StructuredSelection createSelectionForEMFWizard(IFile patternResource) {
-		final IContainer parent = patternResource.getParent();
-		IFile neighbour = parent.getFile(new Path(patternResource.getName()).removeFileExtension().addFileExtension(FILE_EXT_ECORE));
-		if (neighbour.exists()) {
-			return new StructuredSelection(neighbour);
-		} else {
-			return new StructuredSelection(patternResource);
-		}
-	}
-
-	private void refreshGenmodel() {
-		IPath p = new Path(getURI().path()).removeFirstSegments(1);
-		IFile genModelFile = ResourcesPlugin.getWorkspace().getRoot().getFile(p);
-		GenModelReloadActionDelegate action = new GenModelReloadActionDelegate();
-		IAction uiAction = new Action() {
-			//empty
-		};
-		action.selectionChanged(uiAction, new StructuredSelection(genModelFile));
-		action.run(uiAction);
-		updateURI();
-	}
-
-	private ITransformToGenModelOperation getOperation() {
-		TransformToGenModelWizard wizard = (TransformToGenModelWizard) getWizard();
-		return wizard.getTransformOperation();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GenModelDetector.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GenModelDetector.java
deleted file mode 100644
index 1461e103132..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/GenModelDetector.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Alexander Fedorov (Borland) - #148836 - transform action as wizard
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import java.io.IOException;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.BasicGenModelAccess;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.DummyGenModel;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.FileGenModelAccess;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.GenModelAccess;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-
-/**
- * Interact with user to retrieve genmodel for the domain model. XXX detect
- * stale genmodels and reconcile them based on user's decision
- * 
- * @author artem
- */
-public class GenModelDetector {
-	private final Mapping myMapping;
-	private GenModelAccess myGMAccess;
-	private Collection<EPackage> myPackages;
-
-	public GenModelDetector(Mapping mapping) {
-		if (mapping == null) {
-			throw new IllegalArgumentException("Could not detect with null Mapping");
-		}
-		myMapping = mapping;
-	}
-	
-	public IStatus detect() {
-		myPackages = findEPackages(myMapping);
-		if (myPackages.isEmpty()) {
-			myGMAccess = new GenModelAccess.Adapter(null);
-			return Status.OK_STATUS;
-		} else if (myPackages.size() == 1) {
-			final EPackage solePack = myPackages.iterator().next();
-			BasicGenModelAccess gma = new BasicGenModelAccess(solePack);
-			gma.initDefault();
-			return apply(gma);
-		} else {
-			return Plugin.createError(Messages.GenModelDetector_e_not_found, null);
-		}
-	}
-
-	public IStatus advise(URI genModelURI) {
-		if (genModelURI == null) {
-			throw new IllegalArgumentException("Null GenModel URI");
-		}
-		GenModelAccess gma = new FileGenModelAccess(genModelURI);
-		return apply(gma);
-	}
-
-	public IStatus advise(IFile workspaceFile) {
-		if (workspaceFile == null) {
-			throw new IllegalArgumentException("Null GenModel file");
-		}
-		GenModelAccess gma = new FileGenModelAccess(workspaceFile);
-		return apply(gma);
-	}
-	
-	private Collection<EPackage> findEPackages(Mapping mapping) {
-		Collection<EPackage> packages = new HashSet<EPackage>();
-		for (EObject next : EcoreUtil.ExternalCrossReferencer.find(mapping).keySet()) {
-			if (next instanceof EClass) {
-				packages.add(((EClass) next).getEPackage());
-			}
-		}
-		for (Iterator<EPackage> it = packages.iterator(); it.hasNext();) {
-			EPackage next = it.next();
-			if (next.getESuperPackage() != null && EcoreUtil.isAncestor(packages, next.getESuperPackage())) {
-				it.remove();
-			}
-		}
-		return packages;
-	}
-
-	private IStatus apply(GenModelAccess gma) {
-		IStatus load = gma.load(new ResourceSetImpl());
-		if (load.isOK()) {
-			gma.unload();
-			myGMAccess = gma;
-			return Status.OK_STATUS;
-		} else {
-			return load;
-		}
-	}
-	
-	private EPackage getPrimaryPackage() {
-		if (myPackages == null || myPackages.size() == 0) {
-			return null;
-		}
-		return myPackages.iterator().next();
-	}
-	
-	public boolean canCreateDefault() {
-		return myPackages != null && myPackages.size() == 1;
-	}
-	
-	public URI createDefault(String pluginID, IFile patternResource) throws CoreException {
-		DummyGenModel gma = new DummyGenModel(getPrimaryPackage(), null);
-		gma.setPluginID(pluginID);
-		GenModel model = gma.create();
-		IPath path = patternResource.getFullPath().removeFileExtension().addFileExtension("genmodel"); //$NON-NLS-1$
-		URI uri = URI.createPlatformResourceURI(path.toString(), true);
-		Resource res = new ResourceSetImpl().createResource(uri, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-		res.getContents().add(model);
-		try {
-			res.save(null);
-			return uri;
-		} catch (IOException ex) {
-			IStatus error = Plugin.createError(Messages.GenModelDetector_e_save, ex);
-			throw new CoreException(error);
-		}
-	}
-
-	public GenModel get(ResourceSet resSet) {
-		if (myGMAccess == null) {
-			throw new IllegalStateException(Messages.GenModelDetector_e_no_genmodelaccess);
-		}
-		IStatus s = myGMAccess.load(resSet);
-		if (!s.isOK()) {
-			throw new IllegalStateException(s.getMessage());
-		}
-		return myGMAccess.model();
-	}
-	
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ITransformToGenModelOperation.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ITransformToGenModelOperation.java
deleted file mode 100644
index 3f09cb123eb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ITransformToGenModelOperation.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2013, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-
-public interface ITransformToGenModelOperation {
-
-	public TransformOptions getOptions();
-
-	public ResourceSet getResourceSet();
-
-	public Diagnostic getGMFGenValidationResult();
-
-	public Diagnostic getMapmodelValidationResult();
-
-	public GenModel findGenmodel() throws CoreException;
-
-	public GenModelDetector getGenModelDetector();
-
-	public void setGenURI(URI gmfGen);
-
-	public IStatus executeTransformation(IProgressMonitor pm);
-
-	public Mapping loadMappingModel(URI uri, IProgressMonitor pm) throws CoreException;
-
-	public IStatus getStaleGenmodelStatus();
-	
-	public GenModel loadGenModel(URI uri, IProgressMonitor pm) throws CoreException;
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/MapModelConfigurationPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/MapModelConfigurationPage.java
deleted file mode 100644
index eb8613572e8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/MapModelConfigurationPage.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-
-
-public class MapModelConfigurationPage extends ModelConfigurationPage {
-	
-	public MapModelConfigurationPage(String pageId, ResourceLocationProvider rlp, ResourceSet resourceSet) {
-		super(pageId, rlp, resourceSet);
-		setTitle(Messages.TransformToGenModelWizard_title_mapmodel);
-		setDescription(Messages.TransformToGenModelWizard_descr_mapmodel);
-		setModelFileExtension("gmfmap"); //$NON-NLS-1$
-	}
-
-	@Override
-	protected Resource doLoadResource(IProgressMonitor monitor) throws CoreException {
-		ITransformToGenModelOperation o = getOperation();
-		Mapping mapping = o.loadMappingModel(getURI(), monitor);
-		return mapping.eResource();
-	}
-
-	ITransformToGenModelOperation getOperation() {
-		TransformToGenModelWizard wizard = (TransformToGenModelWizard) getWizard();
-		return wizard.getTransformOperation();
-	}
-	
-	@Override
-	protected void resourceChanged() {
-		super.resourceChanged();
-		Diagnostic load = getOperation().getMapmodelValidationResult();
-		if (load != null) {
-			if ((load.getSeverity() == IStatus.WARNING) || (load.getSeverity() == IStatus.INFO) ) {
-				setStatusMessage(TransformToGenModelOperation.getFirst(load));
-			}
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/MapModelDiagnosticPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/MapModelDiagnosticPage.java
deleted file mode 100644
index 79bd3fe9df1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/MapModelDiagnosticPage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.emf.common.util.Diagnostic;
-
-
-class MapModelDiagnosticPage extends ModelDiagnosticPage {
-	
-	MapModelDiagnosticPage(String pageName) {
-		super(pageName);
-		setTitle(Messages.TransformToGenModelWizard_title_mapdiagnostic);
-		setDescription(Messages.TransformToGenModelWizard_descr_mapdiagnostic);
-	}
-
-	@Override
-	protected boolean getIgnoreOption() {
-		return getOperation().getOptions().getIgnoreMapModelValidation();
-	}
-
-	@Override
-	protected Diagnostic getValidationResult() {
-		return getOperation().getMapmodelValidationResult();
-	}
-
-	@Override
-	protected void setIgnoreOption(boolean ignore) {
-		getOperation().getOptions().setIgnoreMapModelValidation(ignore);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/Messages.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/Messages.java
deleted file mode 100644
index c865be1b3e4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/Messages.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.osgi.util.NLS;
-
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.gmf.internal.bridge.transform.messages"; //$NON-NLS-1$
-
-	public static String GenModelConfigurationPage_btn_create_default;
-
-	public static String GenModelConfigurationPage_btn_new_wizard;
-
-	public static String GenModelConfigurationPage_btn_refresh_stale;
-
-	public static String GenModelDetector_e_no_genmodelaccess;
-
-	public static String GenModelDetector_e_not_found;
-
-	public static String GenModelDetector_e_save;
-
-	public static String GMFGenNewFileCreationPage_e_filename;
-
-	public static String MapModelDiagnosticPage_btn_ignore_text;
-
-	public static String StaleGenModelDetector_stale;
-
-	public static String TransformToGenModelOperation_e_generator_creation;
-
-	public static String TransformToGenModelOperation_e_genmodel_load;
-
-	public static String TransformToGenModelOperation_e_genmodel_load_cancelled;
-
-	public static String TransformToGenModelOperation_e_load_mapping_model;
-
-	public static String TransformToGenModelOperation_e_map_load_cancelled;
-
-	public static String TransformToGenModelOperation_e_mapping_invalid;
-
-	public static String TransformToGenModelOperation_e_null_gmfgen_uri;
-
-	public static String TransformToGenModelOperation_e_null_map_uri;
-
-	public static String TransformToGenModelOperation_e_null_mapping;
-
-	public static String TransformToGenModelOperation_e_wrong_root_element;
-
-	public static String TransformToGenModelOperation_task_detect;
-
-	public static String TransformToGenModelOperation_task_generate;
-
-	public static String TransformToGenModelOperation_task_load;
-
-	public static String TransformToGenModelOperation_task_reconcile;
-
-	public static String TransformToGenModelOperation_task_save;
-
-	public static String TransformToGenModelOperation_task_validate;
-
-	public static String TransformToGenModelWizard_descr_genmodel;
-
-	public static String TransformToGenModelWizard_descr_gmfgen;
-
-	public static String TransformToGenModelWizard_descr_mapdiagnostic;
-
-	public static String TransformToGenModelWizard_descr_mapmodel;
-
-	public static String TransformToGenModelWizard_descr_options;
-
-	public static String TransformToGenModelWizard_e_operation_cancelled;
-
-	public static String TransformToGenModelWizard_title_genmodel;
-
-	public static String TransformToGenModelWizard_title_gmfgen;
-
-	public static String TransformToGenModelWizard_title_mapdiagnostic;
-
-	public static String TransformToGenModelWizard_title_mapmodel;
-
-	public static String TransformToGenModelWizard_title_options;
-
-	public static String TransformToGenModelWizard_title_wizard;
-
-	public static String TransformToGenModelWizard_descr_gmfgendiagnostic;
-
-	public static String TransformToGenModelWizard_title_gmfgendiagnostic;
-
-	public static String ValidationHelper_e_marker_creation;
-
-	public static String ValidationHelper_task_validate;
-
-	public static String ViewmapProducerWizardPage_btn_mapmode;
-
-	public static String ViewmapProducerWizardPage_btn_rcp;
-
-	public static String ViewmapProducerWizardPage_btn_runtime;
-
-	public static String ViewmapProducerWizardPage_i_not_recommended;
-	
-	//XXX: remove after fix of https://bugs.eclipse.org/bugs/show_bug.cgi?id=172000
-	public static String ResourceGroup_nameExists;
-	public static String ResourceGroup_folderEmpty;
-	public static String ResourceGroup_noProject;
-	public static String ResourceGroup_emptyName;
-	public static String ResourceGroup_invalidFilename;
-	public static String ResourceGroup_pathOccupied;
-	public static String WizardNewFileCreationPage_file;
-	public static String ViewmapProducerWizardPage_btnUseModeledViewmap_text;
-
-	
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	private Messages() {
-		//
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ModelConfigurationPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ModelConfigurationPage.java
deleted file mode 100644
index 30b5c9b02a0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ModelConfigurationPage.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.common.ui.ModelSelectionPage;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-public class ModelConfigurationPage extends ModelSelectionPage {
-
-	public ModelConfigurationPage(String pageId, ResourceLocationProvider rlp, ResourceSet resourceSet) {
-		super(pageId, rlp, resourceSet);
-	}
-
-	@Override
-	protected Resource loadResource() {
-		Resource current = getResource();
-		if (current != null) {
-			current.getResourceSet().getResources().remove(current);
-		}
-
-		final Resource[] result = new Resource[1];
-		WorkspaceModifyOperation initializeOperation = new WorkspaceModifyOperation() {
-
-			protected void execute(IProgressMonitor progressMonitor) throws CoreException {
-				IProgressMonitor monitor = null;
-				try {
-					monitor = (progressMonitor != null) ? new SubProgressMonitor(progressMonitor, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK) : new NullProgressMonitor();
-					setStatusMessage(Status.OK_STATUS);
-					result[0] = doLoadResource(monitor);
-				} catch (CoreException exception) {
-					throw exception;
-				} catch (Exception exception) {
-					throw new CoreException(Plugin.createError(exception.getMessage(), exception));
-				} finally {
-					if (monitor != null) {
-						monitor.done();
-					}
-				}
-			}
-		};
-
-		try {
-			getContainer().run(false, false, initializeOperation);
-			setStatusMessage(Status.OK_STATUS);
-		} catch (InvocationTargetException e) {
-			Throwable target = e.getTargetException();
-			if (target instanceof CoreException) {
-				CoreException ce = (CoreException) target;
-				setStatusMessage(ce.getStatus());
-			} else {
-				setStatusMessage(Plugin.createError(target.getMessage(), target));
-			}
-		} catch (InterruptedException e) {
-			setStatusMessage(Status.CANCEL_STATUS);
-		}
-		return result[0];
-	}
-
-	protected Resource doLoadResource(IProgressMonitor monitor) throws CoreException {
-		try {
-			Resource r = super.loadResource();
-			return r;
-		} catch (Exception e) {
-			throw new CoreException(Plugin.createError(e.getMessage(), e));
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	void setStatusMessage(IStatus status) {
-		if (status == null || status.isOK()) {
-			setMessage(null);
-			setErrorMessage(null);
-		} else if (IStatus.INFO == status.getSeverity()) {
-			setMessage(status.getMessage(), IMessageProvider.INFORMATION);
-			setErrorMessage(null);
-		} else if (IStatus.WARNING == status.getSeverity()) {
-			setMessage(status.getMessage(), IMessageProvider.WARNING);
-			setErrorMessage(null);
-		} else if (IStatus.ERROR == status.getSeverity()) {
-			setMessage(null);
-			setErrorMessage(status.getMessage());
-		} else if (IStatus.CANCEL == status.getSeverity()) {
-			setMessage(null);
-			setErrorMessage(status.getMessage());
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ModelDiagnosticPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ModelDiagnosticPage.java
deleted file mode 100644
index 9789e4e0051..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ModelDiagnosticPage.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.emf.common.ui.DiagnosticComposite;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-
-abstract class ModelDiagnosticPage extends WizardPage {
-	
-	private DiagnosticComposite myDiagnosticComposite;
-	private Button myIgnoreButton;
-
-
-	ModelDiagnosticPage(String pageName) {
-		super(pageName);
-	}
-
-	void applyValidation() {
-		boolean ignore = myIgnoreButton.getSelection();
-		setIgnoreOption(ignore);
-		setPageComplete(ignore);
-	}
-
-	public void createControl(Composite parent) {
-		Composite plate = new Composite(parent, SWT.NONE);
-		{
-			GridLayout layout = new GridLayout();
-			plate.setLayout(layout);
-
-			GridData data = new GridData();
-			data.verticalAlignment = GridData.FILL;
-			data.horizontalAlignment = GridData.FILL;
-			data.grabExcessHorizontalSpace = true;
-			plate.setLayoutData(data);
-		}
-		createDiagnosticComposite(plate);
-		createIgnoreButton(plate);
-		setControl(plate);
-
-	}
-
-	private void createDiagnosticComposite(Composite parent) {
-		myDiagnosticComposite = new DiagnosticComposite(parent, SWT.NONE);
-		myDiagnosticComposite.initialize(null);
-		myDiagnosticComposite.setShowRootDiagnostic(true);
-		myDiagnosticComposite.setSeverityMask(Diagnostic.ERROR);
-		GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
-		myDiagnosticComposite.setLayoutData(data);
-	}
-	
-	private void createIgnoreButton(Composite parent) {
-		myIgnoreButton = new Button(parent, SWT.CHECK);
-		myIgnoreButton.setText(Messages.MapModelDiagnosticPage_btn_ignore_text);
-		setButtonLayoutData(myIgnoreButton);
-		myIgnoreButton.addSelectionListener(new SelectionAdapter(){
-			
-			@Override
-			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
-				applyValidation();
-			}
-			
-		});
-	}
-
-	protected abstract boolean getIgnoreOption();
-
-	protected ITransformToGenModelOperation getOperation() {
-		TransformToGenModelWizard wizard = (TransformToGenModelWizard) getWizard();
-		return wizard.getTransformOperation();
-	}
-	
-	protected abstract Diagnostic getValidationResult();
-
-	private void initControls() {
-		Diagnostic diagnostic = getValidationResult();
-		myDiagnosticComposite.setDiagnostic(diagnostic);
-		boolean ignore = getIgnoreOption();
-		myIgnoreButton.setSelection(ignore);
-		setPageComplete(ignore);
-	}
-
-	protected abstract void setIgnoreOption(boolean ignore);
-
-	@Override
-	public void setVisible(boolean visible) {
-		if (visible) {
-			initControls();
-		}
-		super.setVisible(visible);
-	}
-	
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/StaleGenModelDetector.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/StaleGenModelDetector.java
deleted file mode 100644
index adc01000d99..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/StaleGenModelDetector.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Alexander Fedorov (Borland) - #148836 - transform action as wizard
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import java.text.MessageFormat;
-import java.util.Date;
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-
-/**
- * @author artem
- */
-public class StaleGenModelDetector {
-
-	private final GenModel myGenModel;
-
-	public StaleGenModelDetector(GenModel genModel) {
-		if (genModel == null) {
-			throw new IllegalArgumentException("Could not detect with null GenModel");
-		}
-		myGenModel = genModel;
-	}
-
-	/**
-	 * Uses local time stamp to detect staleness, though would be better to use IResource#modificationStamp 
-	 * to tell whether resource has changed or not  
-	 * @return warning status if staleness detected, ok otherwise.
-	 */
-	public IStatus detect() {
-		if (myGenModel.eResource() == null) {
-			return Status.OK_STATUS;
-		}
-		URI genModelURI = myGenModel.eResource().getURI();
-		if (!isFileURI(genModelURI)) {
-			return Status.OK_STATUS;
-		}
-		HashSet<URI> ecoreURIs = new HashSet<URI>(); 
-		for (GenPackage next : myGenModel.getAllGenAndUsedGenPackagesWithClassifiers()) {
-			if (next.getEcorePackage().eResource() != null) {
-				final URI uri = next.getEcorePackage().eResource().getURI();
-				if (isFileURI(uri)) {
-					// check only file uris
-					// though we don't check non-file uris, it's not bad to make sure at least  
-					// files are up to date
-					ecoreURIs.add(uri);
-				}
-			}
-		}
-		Date genModelTimeStamp = timestamp(genModelURI);
-		for (URI uri : ecoreURIs) {
-			Date ts = timestamp(uri);
-			/* HACK
-			 * @see ModelImporter#saveGenModelAndEPackages
-			 * saves both ecore and genmodel files regardless of the fact .ecore was not modified,
-			 * hence, we adjust the timestamp to avoid false stale detection
-			 */
-			if (new Date(genModelTimeStamp.getTime() + 3000).before(ts)) {
-				String format = Messages.StaleGenModelDetector_stale;
-				String msg = MessageFormat.format(format, uri, ts, genModelTimeStamp);
-				return Plugin.createWarning(msg);
-			}
-		}
-		return Status.OK_STATUS;
-	}
-
-	private static boolean isFileURI(URI uri) {
-		return "platform".equals(uri.scheme()) && "resource".equals(uri.segment(0)); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	private static Date timestamp(URI uri) {
-		IFile f = getFile(uri);
-		if (!f.exists()) {
-			return new Date(0);
-		}
-		return new Date(f.getLocalTimeStamp());
-	}
-
-	private static IFile getFile(URI platformFileUri) {
-		IPath p = new Path(platformFileUri.path()).removeFirstSegments(1);
-		return ResourcesPlugin.getWorkspace().getRoot().getFile(p);
-	}
-	
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformOptions.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformOptions.java
deleted file mode 100644
index 4d88f4feeb6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformOptions.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - refactored to use osgi Preferences and context-sensitive scope
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
-import org.eclipse.core.runtime.preferences.DefaultScope;
-import org.eclipse.core.runtime.preferences.InstanceScope;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.osgi.service.prefs.BackingStoreException;
-import org.osgi.service.prefs.Preferences;
-
-
-public class TransformOptions extends AbstractPreferenceInitializer {
-	
-	private static final String PREF_GENERATE_RCP = "generate_rcp"; //$NON-NLS-1$
-	private static final String PREF_USE_MAP_MODE = "use_map_mode"; //$NON-NLS-1$
-	private static final String PREF_USE_RUNTIME_FIGURES = "use_runtime_figures"; //$NON-NLS-1$
-	private static final String PREF_USE_IN_TRANSFORMATION_CODE_GEN = "use_in_transfo_code_gen"; //$NON-NLS-1$
-	private static final String PREF_IGNORE_MAPMODEL_VALIDATION = "ignore_mapmodel_validation"; //$NON-NLS-1$
-	private static final String PREF_IGNORE_GMFGEN_VALIDATION = "ignore_gmfgen_validation"; //$NON-NLS-1$
-	private static final String PREF_FIGURE_TEMPLATES = "dynamic_figure_templates"; //$NON-NLS-1$
-	private static final String PREF_MAIN_TRANSFORM = "main-qvto"; //$NON-NLS-1$
-	private static final String PREF_PRE_RECONCILE_TRANSFORM = "pre-reconcile-qvto"; //$NON-NLS-1$
-	private static final String PREF_POST_RECONCILE_TRANSFORM = "post-reconcile-qvto"; //$NON-NLS-1$
-	
-	private static String[] PROP_NAMES = new String[] {
-		PREF_GENERATE_RCP, 
-		PREF_USE_MAP_MODE, 
-		PREF_USE_IN_TRANSFORMATION_CODE_GEN,
-		PREF_USE_RUNTIME_FIGURES,
-		PREF_IGNORE_MAPMODEL_VALIDATION,
-		PREF_IGNORE_GMFGEN_VALIDATION,
-		PREF_FIGURE_TEMPLATES,
-		PREF_MAIN_TRANSFORM,
-		PREF_PRE_RECONCILE_TRANSFORM,
-		PREF_POST_RECONCILE_TRANSFORM,
-		};
-
-	private Preferences myContextPrefs; // may be null
-	private Preferences myGlobalPrefs;
-	// null value indicates value was not yet accessed, to indicate value removal, use dedicated myNoValueToken 
-	private final HashMap<String,String> myInMemPrefs = new HashMap<String,String>();
-	// explicit "no-value" value to indicate absence of the key
-	// need this when global preferences have e.g. postReconcileTr set, but current transformation cleaned the option, 
-	// hence key absence in the myInMemPrefs map is non-indicative
-	private final String myNoValueToken = new String("no value"); //$NON-NLS-1$
-	
-	public TransformOptions() {
-	}
-
-	public void setContext(Preferences contextPrefs) {
-		if (myContextPrefs != contextPrefs) {
-			myContextPrefs = contextPrefs;
-			reset();
-		}
-	}
-
-	public void reset() {
-		myInMemPrefs.clear();
-	}
-	
-	public void flush() {
-		try {
-			for (String k : myInMemPrefs.keySet()) {
-				// Is it reasonable to always record last used options as global
-				// (so that next time wizard shows up, last-used options will be used, not defaults)?
-				String v = myInMemPrefs.get(k);
-				if (v != myNoValueToken) { // XXX might be reasonable also check for null, though should never happen
-					getGlobalPrefs().put(k, v);
-				}
-			}
-			getGlobalPrefs().flush();
-			if (myContextPrefs != null) {
-				// global preferences may change in the future, so record all values
-				for (String k : PROP_NAMES) {
-					String v = getWithContexts(k);
-					if (v != null && v != myNoValueToken) {
-						myContextPrefs.put(k, v);
-					} else {
-						myContextPrefs.remove(k);
-					}
-				}
-				myContextPrefs.flush();
-			}
-		} catch (BackingStoreException ex) {
-			Plugin.log(ex);
-		}
-	}
-	
-	public boolean getGenerateRCP() {
-		return getBoolean(PREF_GENERATE_RCP);
-	}
-
-	public boolean getUseMapMode() {
-		return getBoolean(PREF_USE_MAP_MODE);
-	}
-
-	public boolean getUseRuntimeFigures() {
-		return getBoolean(PREF_USE_RUNTIME_FIGURES);
-	}
-	
-	public boolean getUseInTransformationCodeGen() {
-		return getBoolean(PREF_USE_IN_TRANSFORMATION_CODE_GEN);
-	}
-
-	public boolean getIgnoreMapModelValidation() {
-		return getBoolean(PREF_IGNORE_MAPMODEL_VALIDATION);
-	}
-
-	public boolean getIgnoreGMFGenValidation() {
-		return getBoolean(PREF_IGNORE_GMFGEN_VALIDATION);
-	}
-
-	public URL getFigureTemplatesPath() {
-		return getURL(PREF_FIGURE_TEMPLATES);
-	}
-
-	public URL getMainTransformation() {
-		return getURL(PREF_MAIN_TRANSFORM);
-	}
-
-	public URL getPreReconcileTransform() {
-		return getURL(PREF_PRE_RECONCILE_TRANSFORM);
-	}
-
-	public URL getPostReconcileTransform() {
-		return getURL(PREF_POST_RECONCILE_TRANSFORM);
-	}
-
-	//
-	//
-	//
-	
-	public void setGenerateRCP(boolean value) {
-		myInMemPrefs.put(PREF_GENERATE_RCP, Boolean.toString(value));
-	}
-
-	public void setUseMapMode(boolean value) {
-		myInMemPrefs.put(PREF_USE_MAP_MODE, Boolean.toString(value));
-	}
-
-	public void setUseRuntimeFigures(boolean value) {
-		myInMemPrefs.put(PREF_USE_RUNTIME_FIGURES, Boolean.toString(value));
-	}
-
-	public void setIgnoreMapModelValidation(boolean value) {
-		myInMemPrefs.put(PREF_IGNORE_MAPMODEL_VALIDATION, Boolean.toString(value));
-	}
-
-	public void setIgnoreGMFGenValidation(boolean value) {
-		myInMemPrefs.put(PREF_IGNORE_GMFGEN_VALIDATION, Boolean.toString(value));
-	}
-	
-	public void setInTransformationCodeGen(boolean value) {
-		myInMemPrefs.put(PREF_USE_IN_TRANSFORMATION_CODE_GEN, Boolean.toString(value));
-	}
-
-	public void setFigureTemplatesPath(URL path) {
-		myInMemPrefs.put(PREF_FIGURE_TEMPLATES, path == null ? myNoValueToken : path.toString());
-	}
-
-	public void setTransformation(URL path) {
-		myInMemPrefs.put(PREF_MAIN_TRANSFORM, path == null ? myNoValueToken : path.toString());
-	}
-
-	public void setPreReconcileTransform(URL path) {
-		myInMemPrefs.put(PREF_PRE_RECONCILE_TRANSFORM, path == null ? myNoValueToken : path.toString());
-	}
-
-	public void setPostReconcileTransform(URL path) {
-		myInMemPrefs.put(PREF_POST_RECONCILE_TRANSFORM, path == null ? myNoValueToken : path.toString());
-	}
-
-	@Override
-	public void initializeDefaultPreferences() {
-		Preferences node = getDefaultPrefs();
-		node.putBoolean(PREF_GENERATE_RCP, false);
-		node.putBoolean(PREF_USE_MAP_MODE, true);
-		node.putBoolean(PREF_USE_RUNTIME_FIGURES, true);
-		node.putBoolean(PREF_IGNORE_MAPMODEL_VALIDATION, false);
-		node.putBoolean(PREF_IGNORE_GMFGEN_VALIDATION, false);
-		node.putBoolean(PREF_USE_IN_TRANSFORMATION_CODE_GEN, true);
-	}
-	
-	static boolean checkLiteOptionPresent() {
-		return Platform.getBundle("org.eclipse.papyrus.gmf.codegen.lite") != null; //$NON-NLS-1$
-	}
-
-	private String getWithContexts(String key) {
-		String v = myInMemPrefs.get(key);
-		if (v != null && v != myNoValueToken) {
-			return v;
-		}
-		if (v == myNoValueToken) {
-			return null;
-		}
-		ArrayList<Preferences> scopes = new ArrayList<Preferences>(3);
-		if (myContextPrefs != null) {
-			// there may be no context-specific scope
-			scopes.add(myContextPrefs);
-		} else {
-			// respect globals only if there's no context. Otherwise (if we chain both), globals may have postRecoTr set, while context not
-			// but chaining would give us a result as if it would have been set
-			scopes.add(getGlobalPrefs());
-		}
-		scopes.add(getDefaultPrefs());
-		// XXX alternative is to use default lookup order, with getString(Plugin.getPluginID, key, null, null))
-		// but seems like we don't care about other scopes than project, instance and default
-		return Platform.getPreferencesService().get(key, null, scopes.toArray(new Preferences[scopes.size()]));
-	}
-
-	private boolean getBoolean(String key) {
-		String value = getWithContexts(key);
-		assert value != null; // DefaultScope should never fail ;)
-		return Boolean.parseBoolean(value);
-	}
-
-	private URL getURL(String key) {
-		final String value = getWithContexts(key);
-		if (value == null || value.length() == 0) {
-			return null;
-		}
-		try {
-			return new URL(value);
-		} catch (MalformedURLException ex) {
-			Plugin.log(ex);
-		}
-		return null;
-	}
-
-	@SuppressWarnings("deprecation")
-	private Preferences getGlobalPrefs() {
-		if (myGlobalPrefs == null) {
-			// no real need to cache, though
-			myGlobalPrefs = new InstanceScope().getNode(Plugin.getPluginID());
-		}
-		return myGlobalPrefs;
-	}
-	
-	@SuppressWarnings("deprecation")
-	private static Preferences getDefaultPrefs() {
-		return new DefaultScope().getNode(Plugin.getPluginID());
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelAction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelAction.java
deleted file mode 100644
index 0835fb7143d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelAction.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * .gmfmap to .gmfgen
- * 
- * @author artem
- */
-public class TransformToGenModelAction implements IObjectActionDelegate {
-
-	private static final int WIZARD_WIDTH_INCH = 6;
-	private static final int WIZARD_HEIGHT_INCH = 6;
-
-	private IWorkbenchPart myPart;
-
-	private IStructuredSelection sselection;
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		myPart = targetPart;
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		final IStructuredSelection structuredSelection = ((IStructuredSelection) selection);
-		sselection = structuredSelection;
-	}
-
-	public void run(IAction action) {
-		final TransformToGenModelWizard wiz = createTransformToGenModelWizard();
-		wiz.setWindowTitle(action.getText());
-		wiz.init(PlatformUI.getWorkbench(), sselection);
-		WizardDialog wd = new WizardDialog(getShell(), wiz);
-		wd.create();
-		Rectangle mb = getShell().getMonitor().getClientArea();
-		Point dpi = getShell().getDisplay().getDPI();
-		if (Platform.OS_MACOSX.equals(Platform.getOS())) {
-			dpi = new Point(110, 110); // OSX DPI is always 72; 110 is a common value for modern LCD screens
-		}
-		int width = dpi.x * WIZARD_WIDTH_INCH;
-		int height = dpi.y * WIZARD_HEIGHT_INCH;
-		int x = mb.x + (mb.width - width) / 2;
-		if (x < mb.x) {
-			x = mb.x;
-		}
-		int y = mb.y + (mb.height - height) / 2;
-		if (y < mb.y) {
-			y = mb.y;
-		}
-		wd.getShell().setLocation(x, y);
-		wd.getShell().setSize(width, height);
-		wd.open();
-	}
-	
-	protected TransformToGenModelWizard createTransformToGenModelWizard(){
-		return new TransformToGenModelWizard();
-	}
-
-	private Shell getShell() {
-		return myPart.getSite().getShell();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelOperation.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelOperation.java
deleted file mode 100644
index d727bb6699a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelOperation.java
+++ /dev/null
@@ -1,599 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import java.io.IOException;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.EcoreUtil.ExternalCrossReferencer;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.m2m.qvt.oml.BasicModelExtent;
-import org.eclipse.m2m.qvt.oml.ExecutionContextImpl;
-import org.eclipse.m2m.qvt.oml.ExecutionDiagnostic;
-import org.eclipse.m2m.qvt.oml.TransformationExecutor;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.graphdef.codegen.MapModeCodeGenStrategy;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.BasicDiagramRunTimeModelHelper;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.DiagramGenModelTransformer;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.DiagramRunTimeModelHelper;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.GenModelProducer;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.InnerClassViewmapProducer;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.ModeledViewmapProducer;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.QVTDiagramGenModelTransformer;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.ViewmapProducer;
-import org.eclipse.papyrus.gmf.internal.bridge.naming.gen.GenNamingMediatorImpl;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.codegen.util.GMFGenConfig;
-import org.eclipse.papyrus.gmf.internal.common.migrate.ModelLoadHelper;
-import org.eclipse.papyrus.gmf.internal.common.reconcile.Reconciler;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-
-//[artem] XXX Why it's in the bridge.ui??? 
-public class TransformToGenModelOperation implements ITransformToGenModelOperation {
-
-	private URI myGMFGenModelURI;
-
-	private TransformOptions myOptions;
-
-	private Mapping myMapping;
-
-	private GenModelDetector myGMDetector;
-
-	private GenModel myGenModel;
-
-	private Diagnostic myMapmodelValidationResult = Diagnostic.CANCEL_INSTANCE;
-
-	private Diagnostic myGMFGenValidationResult = Diagnostic.CANCEL_INSTANCE;
-
-	private IStatus myStaleGenmodelStatus = Status.CANCEL_STATUS;
-
-	private final ResourceSet myResourceSet;
-
-	public TransformToGenModelOperation(ResourceSet rs) {
-		assert rs != null;
-		myResourceSet = rs;
-		this.myOptions = new TransformOptions();
-	}
-
-	public TransformOptions getOptions() {
-		return myOptions;
-	}
-
-	public URI getGenURI() {
-		return this.myGMFGenModelURI;
-	}
-
-	public void setGenURI(URI gmfGen) {
-		this.myGMFGenModelURI = gmfGen;
-	}
-
-	public GenModel getGenModel() {
-		return this.myGenModel;
-	}
-
-	public final ResourceSet getResourceSet() {
-		return myResourceSet;
-	}
-
-	Mapping getMapping() {
-		return this.myMapping;
-	}
-
-	private void setMapping(Mapping m, Diagnostic validationResult) {
-		this.myMapping = m;
-		this.myMapmodelValidationResult = validationResult;
-		myGMDetector = (m != null) ? new GenModelDetector(m) : null;
-		myGenModel = null;
-	}
-
-	private void setGMFGenValidationResult(Diagnostic validationResult) {
-		this.myGMFGenValidationResult = validationResult;
-	}
-
-	public GenModelDetector getGenModelDetector() {
-		return myGMDetector;
-	}
-
-	public Diagnostic getGMFGenValidationResult() {
-		return this.myGMFGenValidationResult;
-	}
-
-	public Diagnostic getMapmodelValidationResult() {
-		return this.myMapmodelValidationResult;
-	}
-
-	public IStatus getStaleGenmodelStatus() {
-		return this.myStaleGenmodelStatus;
-	}
-
-	public Mapping loadMappingModel(URI uri, IProgressMonitor pm) throws CoreException {
-		Mapping content = null;
-		Diagnostic validation = Diagnostic.CANCEL_INSTANCE;
-		IProgressMonitor monitor = null;
-		try {
-			if (uri == null) {
-				throw new IllegalArgumentException(Messages.TransformToGenModelOperation_e_null_map_uri);
-			}
-			monitor = (pm != null) ? new SubProgressMonitor(pm, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK) : new NullProgressMonitor();
-			String cancelMessage = Messages.TransformToGenModelOperation_e_map_load_cancelled;
-			monitor.beginTask("", 100); //$NON-NLS-1$
-			subTask(monitor, 0, Messages.TransformToGenModelOperation_task_load, cancelMessage);
-			ModelLoadHelper loadHelper = new ModelLoadHelper(getResourceSet(), uri);
-			if (!loadHelper.isOK()) {
-				throw new CoreException(loadHelper.getStatus());
-			}
-			subTask(monitor, 20, Messages.TransformToGenModelOperation_task_validate, cancelMessage);
-			content = findMappingFromMappingModelRoot(loadHelper.getContentsRoot());
-			if (content == null) {
-				String msg = MessageFormat.format(Messages.TransformToGenModelOperation_e_wrong_root_element, loadHelper.getContentsRoot().getClass().getName());
-				throw new CoreException(Plugin.createError(msg, null));
-			}
-			validation = ValidationHelper.validate(content, true, monitor);
-			monitor.worked(60);
-			if (Diagnostic.CANCEL == validation.getSeverity()) {
-				throw new CoreException(Plugin.createCancel(cancelMessage));
-			}
-			return content;
-		} catch (CoreException e) {
-			throw e;
-		} catch (Exception e) {
-			IStatus error = Plugin.createError(Messages.TransformToGenModelOperation_e_load_mapping_model, e);
-			throw new CoreException(error);
-		} finally {
-			setMapping(content, validation);
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	protected Mapping findMappingFromMappingModelRoot(EObject mappingModelRoot) {
-		return mappingModelRoot instanceof Mapping ? (Mapping)mappingModelRoot : null;
-	}
-
-	public GenModel findGenmodel() throws CoreException {
-		IStatus detect;
-		try {
-			checkMapping();
-			GenModelDetector gmd = getGenModelDetector();
-			detect = gmd.detect();
-			if (detect.isOK()) {
-				GenModel genModel = gmd.get(getResourceSet());
-				this.myGenModel = genModel;
-				return genModel;
-			}
-		} catch (Exception e) {
-			IStatus error = Plugin.createError(Messages.TransformToGenModelOperation_e_mapping_invalid, e);
-			throw new CoreException(error);
-		}
-		throw new CoreException(detect);
-	}
-
-	public GenModel loadGenModel(URI uri, IProgressMonitor pm) throws CoreException {
-		IProgressMonitor monitor = null;
-		try {
-			checkMapping();
-			monitor = (pm != null) ? new SubProgressMonitor(pm, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK) : new NullProgressMonitor();
-			String cancelMessage = Messages.TransformToGenModelOperation_e_genmodel_load_cancelled;
-			monitor.beginTask("", 100); //$NON-NLS-1$
-			monitor.subTask(Messages.TransformToGenModelOperation_task_detect);
-			GenModelDetector gmd = getGenModelDetector();
-			IStatus status = Status.OK_STATUS;
-			if (uri == null) {
-				status = gmd.detect();
-			} else {
-				status = gmd.advise(uri);
-			}
-			if (!status.isOK()) {
-				throw new CoreException(status);
-			}
-			subTask(monitor, 30, Messages.TransformToGenModelOperation_task_load, cancelMessage);
-			GenModel genModel = gmd.get(getResourceSet());
-			if (genModel == null) {
-				if (uri == null) {
-					this.myStaleGenmodelStatus = Status.CANCEL_STATUS;
-					this.myGenModel = null;
-					return null;
-				}
-				IStatus notFound = Plugin.createError(Messages.GenModelDetector_e_not_found, null);
-				throw new CoreException(notFound);
-			}
-			subTask(monitor, 40, Messages.TransformToGenModelOperation_task_validate, cancelMessage);
-			StaleGenModelDetector staleDetector = new StaleGenModelDetector(genModel);
-			IStatus stale = staleDetector.detect();
-			this.myGenModel = genModel;
-			this.myStaleGenmodelStatus = stale;
-			return genModel;
-
-		} catch (CoreException e) {
-			throw e;
-		} catch (Exception e) {
-			IStatus error = Plugin.createError(Messages.TransformToGenModelOperation_e_genmodel_load, e);
-			throw new CoreException(error);
-		} finally {
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	public IStatus executeTransformation(IProgressMonitor pm) {
-		IProgressMonitor monitor = null;
-		Diagnostic validation = Diagnostic.CANCEL_INSTANCE;
-		try {
-			if (getGenURI() == null) {
-				throw new IllegalStateException(Messages.TransformToGenModelOperation_e_null_gmfgen_uri);
-			}
-			checkMapping();
-			monitor = (pm != null) ? new SubProgressMonitor(pm, 1, SubProgressMonitor.PREPEND_MAIN_LABEL_TO_SUBTASK) : new NullProgressMonitor();
-			monitor.beginTask("", 100); //$NON-NLS-1$
-			if (monitor.isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-			final VisualIdentifierDispenserProvider idDispenser = getVisualIdDispenser();
-			idDispenser.acquire();
-
-			GenModelProducer t = createGenModelProducer(idDispenser);
-
-			monitor.subTask(Messages.TransformToGenModelOperation_task_generate);
-			GenEditorGenerator genEditor = t.process(getMapping(), new SubProgressMonitor(monitor, 20));
-			if (monitor.isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-			monitor.subTask(Messages.TransformToGenModelOperation_task_reconcile);
-			if (Plugin.needsReconcile()) {
-				handlePreReconcileHooks(genEditor);
-				reconcile(genEditor);
-				handlePostReconcileHooks(genEditor);
-			}
-			if (hasExtensionTransformation(getMapping().eResource().getURI())) {
-				executeExtensionTransformation(getMapping().eResource().getURI(), genEditor);
-			}
-			GenNamingMediatorImpl namer = new GenNamingMediatorImpl();
-			namer.setMode(GenNamingMediatorImpl.Mode.COLLECT_NAMES);
-			namer.traverse(genEditor); // collect reconciled names
-			namer.setMode(GenNamingMediatorImpl.Mode.DISPENSE_NAMES);
-			namer.traverse(genEditor); // dispense names to new elements
-
-			monitor.worked(20);
-			if (monitor.isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-			monitor.subTask(Messages.TransformToGenModelOperation_task_save);
-			save(genEditor);
-			monitor.worked(20);
-			if (monitor.isCanceled()) {
-				return Status.CANCEL_STATUS;
-			}
-			monitor.subTask(Messages.TransformToGenModelOperation_task_validate);
-			try {
-				validation = ValidationHelper.validate(genEditor, true, monitor);
-			} catch (RuntimeException re) {
-				validation = BasicDiagnostic.toDiagnostic(re);
-			}
-			if (Diagnostic.CANCEL != validation.getSeverity()) {
-				idDispenser.release();
-			}
-			return Status.OK_STATUS;
-		} catch (CoreException ex) {
-			return ex.getStatus();
-		} catch (Exception ex) {
-			String message = ex.getMessage();
-			if (message == null) {
-				message = Messages.TransformToGenModelOperation_e_generator_creation;
-			}
-			return Plugin.createError(message, ex);
-		} finally {
-			setGMFGenValidationResult(validation);
-			if (monitor != null) {
-				monitor.done();
-			}
-		}
-	}
-
-	protected boolean hasExtensionTransformation(URI uri) {
-		final URI transfURI = uri.trimFileExtension().appendFileExtension("qvto");
-		final TransformationExecutor executor = new TransformationExecutor(transfURI);
-		Diagnostic diag = executor.loadTransformation();
-		return diag.getCode() == Diagnostic.OK;
-	}
-
-	protected void executeExtensionTransformation(URI uri, GenEditorGenerator result) {
-		final URI transfURI = uri.trimFileExtension().appendFileExtension("qvto");
-		final TransformationExecutor executor = new TransformationExecutor(transfURI);
-		final ExecutionContextImpl context = new ExecutionContextImpl();
-		executor.execute(context, new BasicModelExtent(Arrays.asList(new GenEditorGenerator[] { result })));
-	}
-
-	protected void handlePreReconcileHooks(GenEditorGenerator result) {
-		if (getOptions().getPreReconcileTransform() != null) {
-			URI transfURI = URI.createURI(getOptions().getPreReconcileTransform().toExternalForm());
-			final TransformationExecutor executor = new TransformationExecutor(transfURI);
-			final ExecutionContextImpl context = new ExecutionContextImpl();
-			executor.execute(context, new BasicModelExtent(Arrays.asList(new GenEditorGenerator[] { result })));
-		}
-	}
-
-	protected void handlePostReconcileHooks(GenEditorGenerator result) {
-		if (getOptions().getPostReconcileTransform() != null) {
-			URI transfURI = URI.createURI(getOptions().getPostReconcileTransform().toExternalForm());
-			final TransformationExecutor executor = new TransformationExecutor(transfURI);
-			final ExecutionContextImpl context = new ExecutionContextImpl();
-			executor.execute(context, new BasicModelExtent(Arrays.asList(new GenEditorGenerator[] { result })));
-		}
-	}
-
-	private void checkMapping() {
-		if (getMapping() == null) {
-			throw new IllegalStateException(Messages.TransformToGenModelOperation_e_null_mapping);
-		}
-	}
-
-	static IStatus getFirst(Diagnostic d) {
-		if (d == null) {
-			return Status.OK_STATUS;
-		}
-		List<Diagnostic> children = d.getChildren();
-		if (children.isEmpty()) {
-			return BasicDiagnostic.toIStatus(d);
-		} else {
-			return BasicDiagnostic.toIStatus(children.get(0));
-		}
-	}
-
-	private DiagramRunTimeModelHelper detectRunTimeModel() {
-		return new BasicDiagramRunTimeModelHelper();
-	}
-
-	private ViewmapProducer detectTransformationOptions() {
-		boolean useModeledViewmaps = !getOptions().getUseInTransformationCodeGen();
-		if (useModeledViewmaps) {
-			return new ModeledViewmapProducer();
-		}
-
-		String runtimeToken = getOptions().getUseRuntimeFigures() ? "full" : "lite";
-		MapModeCodeGenStrategy mmStrategy = getOptions().getUseMapMode() ? MapModeCodeGenStrategy.DYNAMIC : MapModeCodeGenStrategy.STATIC;
-		URL dynamicFigureTemplates = getOptions().getFigureTemplatesPath();
-		return new InnerClassViewmapProducer(runtimeToken, mmStrategy, dynamicFigureTemplates == null ? null : new URL[] { dynamicFigureTemplates });
-	}
-
-	private VisualIdentifierDispenserProvider getVisualIdDispenser() {
-		return new VisualIdentifierDispenserProvider(getGenURI());
-	}
-
-	private GenModelProducer createGenModelProducer(VisualIdentifierDispenserProvider idDespenser) {
-		if (getOptions().getMainTransformation() != null) {
-			final ExecutionContextImpl context = new ExecutionContextImpl();
-			context.setConfigProperty("rcp", getOptions().getGenerateRCP());
-			context.setConfigProperty("useMapMode", getOptions().getUseMapMode());
-			context.setConfigProperty("useFullRunTime", getOptions().getUseRuntimeFigures());
-			context.setConfigProperty("useInTransformationCodeGen", getOptions().getUseInTransformationCodeGen());
-
-			final QVTDiagramGenModelTransformer transformer = new QVTDiagramGenModelTransformer(getResourceSet(), idDespenser.get());
-			transformer.setTransformationL(getOptions().getMainTransformation());
-
-			return new GenModelProducer() {
-
-				public GenEditorGenerator process(Mapping mapping, IProgressMonitor progress) throws CoreException {
-					progress.beginTask(null, 1);
-					try {
-						final BasicModelExtent output = new BasicModelExtent();
-						final ExecutionDiagnostic result = transformer.transform(mapping, getGenModel(), output, context);
-
-						if (Plugin.printTransformationConsole()) {
-							System.err.println(result.getMessage());
-						}
-						if (result.getSeverity() == Diagnostic.OK) {
-							List<EObject> outObjects = output.getContents();
-							return outObjects.get(0) instanceof GenEditorGenerator ? (GenEditorGenerator) outObjects.get(0) : null;
-						}
-						String errorMessage = result.getMessage();
-						if (errorMessage == null || errorMessage.isEmpty()) {
-							errorMessage = "Transformation has no out parameter of GenEditorGenerator type";
-						}
-						throw new CoreException(new Status(IStatus.ERROR, Plugin.getPluginID(), errorMessage));
-					} finally {
-						progress.done();
-					}
-				}
-			};
-		} else {
-			final DiagramRunTimeModelHelper drtModelHelper = detectRunTimeModel();
-			final ViewmapProducer viewmapProducer = detectTransformationOptions();
-			DiagramGenModelTransformer.Parameters opts = new DiagramGenModelTransformer.Parameters(drtModelHelper, viewmapProducer, idDespenser.get(), getOptions().getGenerateRCP());
-			final DiagramGenModelTransformer t = new DiagramGenModelTransformer(opts);
-			if (getGenModel() != null) {
-				t.setEMFGenModel(getGenModel());
-			}
-			return new GenModelProducer() {
-
-				public GenEditorGenerator process(Mapping mapping, IProgressMonitor progress) {
-					progress.beginTask(null, 1);
-					try {
-						t.transform(mapping);
-						return t.getResult();
-					} finally {
-						progress.done();
-					}
-				}
-			};
-		}
-	}
-
-	private void reconcile(GenEditorGenerator genBurdern) {
-		GenEditorGenerator old = null;
-		Resource resource = null;
-		try {
-			resource = getResourceSet().getResource(getGenURI(), false);
-			if (resource == null) {
-				resource = getResourceSet().createResource(getGenURI(), ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-				resource.load(getResourceSet().getLoadOptions());
-			}
-			List<EObject> contents = resource.getContents();
-			if (!contents.isEmpty() && contents.get(0) instanceof GenEditorGenerator) {
-				old = (GenEditorGenerator) contents.get(0);
-			}
-			if (old != null) {
-				new Reconciler(new GMFGenConfig()).reconcileTree(genBurdern, old);
-			}
-		} catch (IOException e) {
-			// can't load resource, means no old file, IGNORE the exception
-		} catch (RuntimeException e) {
-			Plugin.log(e);
-			old = null;
-		} finally {
-			if (resource != null) {
-				if (resource.isLoaded()) {
-					// not sure I need to unload given I'll remove the resource from resource set anyway, but it doesn't hurt? 
-					resource.unload();
-				}
-				// Need to remove created resource from resource set, not to affect further load attempts
-				// (e.g. the one in #save() method, with another content type)
-				// Another option would be use of correct content type here, but what 
-				// if loaded/reconciled model has old content type? 
-				getResourceSet().getResources().remove(resource);
-			}
-		}
-	}
-
-	private void save(GenEditorGenerator genBurdern) throws IOException {
-		HashMap<String, Object> saveOptions = new HashMap<String, Object>();
-		saveOptions.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-		Resource gmfgenRes = getResourceSet().getResource(getGenURI(), false);
-		try {
-			if (gmfgenRes == null) {
-				gmfgenRes = getResourceSet().createResource(getGenURI(), "org.eclipse.gmf.gen" /*GMFGen contentType, defined in oeg.codegen*/); //$NON-NLS-1$
-				gmfgenRes.load(getResourceSet().getLoadOptions());
-			}
-			updateExistingResource(gmfgenRes, genBurdern);
-			// one might want to ignore dangling href on save when there are more than one
-			// content object - there are chances we don't match them during reconcile and 
-			// failed update all the references.
-			if (gmfgenRes.getContents().size() > 1 && Plugin.ignoreDanglingHrefOnSave()) {
-				saveOptions.put(XMLResource.OPTION_PROCESS_DANGLING_HREF, XMLResource.OPTION_PROCESS_DANGLING_HREF_RECORD);
-			}
-			gmfgenRes.save(saveOptions);
-		} catch (IOException ex) {
-			// load failed, no file exists
-			gmfgenRes.getContents().add(genBurdern);
-			gmfgenRes.save(saveOptions);
-		} catch (RuntimeException ex) {
-			Plugin.log(ex);
-			// save anyway, for later examination
-			gmfgenRes.getContents().add(genBurdern);
-			gmfgenRes.save(saveOptions);
-		}
-	}
-
-	private static void updateExistingResource(Resource gmfgenRes, GenEditorGenerator genBurden) {
-		boolean editorGenFound = false;
-		for (int i = 0; !editorGenFound && i < gmfgenRes.getContents().size(); i++) {
-			if (gmfgenRes.getContents().get(i) instanceof GenEditorGenerator) {
-				if (gmfgenRes.getContents().size() > 1) {
-					// chances there are other content eobjects that reference 
-					// some parts of old GenEditorGenerator, hence need update
-					LinkedList<EObject> rest = new LinkedList<EObject>(gmfgenRes.getContents());
-					GenEditorGenerator oldEditorGenerator = (GenEditorGenerator) rest.remove(i);
-					updateExternalReferences(genBurden, oldEditorGenerator, rest);
-				}
-				gmfgenRes.getContents().set(i, genBurden); // replace with new one
-				editorGenFound = true;
-			}
-		}
-		if (!editorGenFound) {
-			gmfgenRes.getContents().add(genBurden);
-		}
-	}
-
-	private static void updateExternalReferences(GenEditorGenerator newEditorGenerator, final GenEditorGenerator oldEditorGenerator, List<EObject> allContentButOldGenerator) {
-		// find references from rest of the content to old generator
-		final Map<EObject, Collection<EStructuralFeature.Setting>> crossReferences = new ExternalCrossReferencer(allContentButOldGenerator) {
-
-			private static final long serialVersionUID = 4383601037841211175L;
-
-			@Override
-			protected boolean crossReference(EObject object, EReference reference, EObject crossReferencedEObject) {
-				return super.crossReference(object, reference, crossReferencedEObject) && EcoreUtil.isAncestor(oldEditorGenerator, crossReferencedEObject);
-			}
-
-			Map<EObject, Collection<EStructuralFeature.Setting>> find() {
-				return findExternalCrossReferences();
-			}
-		}.find();
-		// match new and old objects using reconciler without decisions
-		new Reconciler(new GMFGenConfig()) {
-
-			@Override
-			protected void handleNotMatchedCurrent(EObject current) {/* no-op */
-			};
-
-			@Override
-			protected EObject handleNotMatchedOld(EObject currentParent, EObject notMatchedOld) {
-				return null; /* no-op */
-			};
-
-			@Override
-			protected void reconcileVertex(EObject current, EObject old) {
-				if (!crossReferences.containsKey(old)) {
-					return;
-				}
-				// and replace old values with new
-				for (EStructuralFeature.Setting s : crossReferences.get(old)) {
-					EcoreUtil.replace(s, old, current);
-				}
-			}
-		}.reconcileTree(newEditorGenerator, oldEditorGenerator);
-	}
-
-	private static void subTask(IProgressMonitor monitor, int ticks, String name, String cancelMessage) throws CoreException {
-		if (monitor == null) {
-			return;
-		}
-		if (monitor.isCanceled()) {
-			IStatus cancel = Plugin.createCancel(cancelMessage);
-			throw new CoreException(cancel);
-		}
-		if (ticks > 0) {
-			monitor.worked(ticks);
-		}
-		if (name != null) {
-			monitor.subTask(name);
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelWizard.java
deleted file mode 100644
index 6354f88fb7c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/TransformToGenModelWizard.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.WizardUtil;
-import org.eclipse.papyrus.gmf.internal.common.URIUtil;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-
-public class TransformToGenModelWizard extends Wizard implements IWorkbenchWizard {
-	
-	private IStructuredSelection mySelection;
-
-	private GMFGenNewFileCreationPage newFileCreationPage;
-	private MapModelConfigurationPage mapModelPage;
-	private ModelDiagnosticPage mapDiagnosticPage;
-	private GenModelConfigurationPage genModelPage;
-	private ViewmapProducerWizardPage transformOptionPage;
-	private ModelDiagnosticPage genDiagnosticPage;
-	
-	private WizardPage myErrorContainer;
-	
-	private ITransformToGenModelOperation myOperation;
-	
-	@Override
-	public void addPages() {
-		final String defaultName = "My"; //$NON-NLS-1$
-		newFileCreationPage = new GMFGenNewFileCreationPage(mySelection);
-		IFile file = WizardUtil.findExistingFile(mySelection, GMFGenNewFileCreationPage.EXT_GMFGEN);
-		if (file != null) {
-			newFileCreationPage.setFileName(file.getName());
-		} else {
-			newFileCreationPage.setFileName(WizardUtil.getDefaultFileName(mySelection, defaultName, GMFGenNewFileCreationPage.EXT_GMFGEN));
-		}
-		addPage(newFileCreationPage);
-		
-		final ResourceSet resourceSet = getTransformOperation().getResourceSet();
-		ResourceLocationProvider rlp = new ResourceLocationProvider(mySelection);
-		mapModelPage = createMapModelConfigurationPage(MapModelConfigurationPage.class.getSimpleName(), rlp, resourceSet);
-		mapModelPage.setPageComplete(false);
-		mapModelPage.setModelRequired(true);
-		addPage(mapModelPage);
-		
-		mapDiagnosticPage = new MapModelDiagnosticPage(MapModelDiagnosticPage.class.getSimpleName());
-		addPage(mapDiagnosticPage);
-
-		genModelPage = new GenModelConfigurationPage(GenModelConfigurationPage.class.getSimpleName(), rlp, resourceSet);
-		genModelPage.setPageComplete(false);
-		genModelPage.setModelRequired(false);
-		addPage(genModelPage);
-
-		transformOptionPage = new ViewmapProducerWizardPage(ViewmapProducerWizardPage.class.getSimpleName());
-		transformOptionPage.setPageComplete(false);
-		addPage(transformOptionPage);
-		
-		genDiagnosticPage = new GMFGenModelDiagnosticPage(GMFGenModelDiagnosticPage.class.getSimpleName());
-		addPage(genDiagnosticPage);
-	}
-	
-	protected MapModelConfigurationPage createMapModelConfigurationPage(String pageId, ResourceLocationProvider rlp, ResourceSet resourceSet){
-		return new MapModelConfigurationPage(pageId, rlp, resourceSet);
-	}
-
-	private boolean checkGMFGenValidationResult() {
-		Diagnostic diagnostic = getTransformOperation().getGMFGenValidationResult();
-		return !(Diagnostic.ERROR == diagnostic.getSeverity());
-	}
-
-	protected ResourceSet createResourceSet() {
-		final ResourceSetImpl rs = new ResourceSetImpl();
-		rs.getURIConverter().getURIMap().putAll(EcorePlugin.computePlatformURIMap());
-		return rs;
-	}
-
-	@Override
-	public IWizardPage getNextPage(IWizardPage page) {
-		//clear error message
-		if (myErrorContainer != null) {
-			myErrorContainer.setErrorMessage(null);
-			myErrorContainer = null;
-		}
-		if (page == mapModelPage) {
-			Diagnostic diagnostic = getTransformOperation().getMapmodelValidationResult();
-			if (Diagnostic.ERROR == diagnostic.getSeverity()) {
-				//init genModelPage anyway
-				findNextPageAfterMapping();
-				return mapDiagnosticPage;
-			}
-			return findNextPageAfterMapping();
-		} else if (page == mapDiagnosticPage) {
-			return findNextPageAfterMapping();
-		} else if (page == transformOptionPage) {
-			if (checkGMFGenValidationResult()) {
-				return null;
-			}
-			return genDiagnosticPage;
-		}
-		return super.getNextPage(page);
-	}
-
-	private IWizardPage findNextPageAfterMapping() {
-		try {
-			GenModel genmmodel = getTransformOperation().findGenmodel();
-			if (genmmodel == null) {
-				genModelPage.setPageComplete(true);
-				return transformOptionPage;
-			}
-		} catch (CoreException e) {
-			genModelPage.setStatusMessage(e.getStatus());
-		}
-		return genModelPage;
-	}
-	
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.mySelection = selection;
-		setWindowTitle(Messages.TransformToGenModelWizard_title_wizard);
-		setNeedsProgressMonitor(true);
-		myOperation = createTransformOperation(createResourceSet());
-	}
-	
-	protected ITransformToGenModelOperation createTransformOperation(ResourceSet resourceSet){
-		return new TransformToGenModelOperation(resourceSet);
-	}
-
-	@Override
-	public boolean performFinish() {
-		if (getTransformOperation().getOptions().getIgnoreGMFGenValidation() && getContainer().getCurrentPage() == genDiagnosticPage) {
-			saveTransformOptions();
-			return true;
-		}
-		try {
-			final IStatus[] s = new IStatus[1];
-			IRunnableWithProgress iwr = new IRunnableWithProgress() {
-				public void run(IProgressMonitor monitor) {
-					ITransformToGenModelOperation op = getTransformOperation();
-					IFile target = getTargetFile();
-					op.setGenURI(URI.createPlatformResourceURI(target.getFullPath().toString(), true));
-					s[0] = op.executeTransformation(monitor);
-				}
-			};
-			getContainer().run(false, false, iwr);
-			if (s[0].isOK()) {
-				return processGMFGenValidationResult();
-			}
-			setErrorMessage(s[0].getMessage());
-			if (s[0].getException() != null) {
-				Plugin.log(s[0]);
-			}
-			return false;
-		} catch (InvocationTargetException ex) {
-			String message = Messages.TransformToGenModelOperation_e_generator_creation;
-			Throwable targetException = ex.getTargetException();
-			if (targetException != null) {
-				if (targetException.getMessage() != null) {
-					message = targetException.getMessage();
-				} else {
-					message += ": " + targetException.getClass().getName();
-				}
-			}
-			setErrorMessage(message);
-			Plugin.log(Plugin.createError(message, targetException));
-			return false;
-		} catch (InterruptedException ex){
-			setErrorMessage(Messages.TransformToGenModelWizard_e_operation_cancelled);
-			return false;
-		}
-	}
-	
-	private boolean processGMFGenValidationResult() {
-		if (checkGMFGenValidationResult()) {
-			setErrorMessage(null);
-			saveTransformOptions();
-			return true;
-		}
-		getContainer().showPage(genDiagnosticPage);
-		return false;
-	}
-	
-	private void saveTransformOptions() {
-		if (getTransformOperation() != null) {
-			getTransformOperation().getOptions().flush();
-		}
-	}
-	
-	@Override
-	public boolean performCancel() {
-		if (getTransformOperation() != null) {
-			getTransformOperation().getOptions().reset();
-		}
-		return super.performCancel();
-	}
-
-	ITransformToGenModelOperation getTransformOperation() {
-		return myOperation;
-	}
-	
-	IFile getTargetFile() {
-		return newFileCreationPage.getModelFile();
-	}
-	
-	IFile getMapFile() {
-		URI mapURI = mapModelPage.getURI();
-		if (mapURI != null) {
-			return URIUtil.getFile(mapURI);
-		}
-		return (IFile) mySelection.getFirstElement();
-	}
-
-	private void setErrorMessage(String message) {
-		WizardDialog wd = (WizardDialog) getContainer();
-		WizardPage wp = (WizardPage) wd.getCurrentPage();
-		if (wp != null) {
-			myErrorContainer = wp;
-			myErrorContainer.setErrorMessage(message);
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ViewmapProducerWizardPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ViewmapProducerWizardPage.java
deleted file mode 100644
index 6decf5e2797..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ViewmapProducerWizardPage.java
+++ /dev/null
@@ -1,385 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Fedorov (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) extra controls (templates, transformations)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.QVTDiagramGenModelTransformer;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.ExpandBar;
-import org.eclipse.swt.widgets.ExpandItem;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-
-/*
- * XXX: duplicates functionality of org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui.FigureGeneratorOptionsDialog
- */
-class ViewmapProducerWizardPage extends WizardPage {
-
-	private boolean myInitingControls;
-
-	private Button generateRCPButton;
-
-	private Button useMapModeButton;
-
-	private Button useRuntimeFiguresButton;
-
-	private Button useModeledViewmapButton;
-
-	private Text templatesPathText;
-
-	private Text qvtoFileControl;
-
-	private Text preReconcileTranfsormText;
-
-	private Text postReconcileTransformText;
-
-	private Button radioDGMT;
-
-	private Button radioQVT;
-
-	private Button radioCustomQVT;
-
-	private Button preReconcileTransformBtn;
-
-	private Button postReconcileTransformBtn;
-
-	private ExpandItem myTemplatePathItem;
-
-	private ExpandItem myTransformsItem;
-
-	private Composite composite;
-
-	protected ViewmapProducerWizardPage(String pageName) {
-		super(pageName);
-		setTitle(Messages.TransformToGenModelWizard_title_options);
-		setDescription(Messages.TransformToGenModelWizard_descr_options);
-	}
-
-	public void createControl(Composite parent) {
-		initializeDialogUnits(parent);
-
-		composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout());
-		createControls(composite);
-
-		setControl(composite);
-		Dialog.applyDialogFont(composite);
-	}
-
-	@Override
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			initControls();
-			validatePage();
-		}
-	}
-
-	private void createControls(Composite result) {
-		useMapModeButton = new Button(result, SWT.CHECK);
-		useMapModeButton.setText(Messages.ViewmapProducerWizardPage_btn_mapmode);
-		useMapModeButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_CENTER));
-
-		useRuntimeFiguresButton = new Button(result, SWT.CHECK);
-		useRuntimeFiguresButton.setText(Messages.ViewmapProducerWizardPage_btn_runtime);
-		useRuntimeFiguresButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_CENTER));
-
-		generateRCPButton = new Button(result, SWT.CHECK);
-		generateRCPButton.setText(Messages.ViewmapProducerWizardPage_btn_rcp);
-		generateRCPButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_CENTER));
-
-		useModeledViewmapButton = new Button(composite, SWT.CHECK);
-		useModeledViewmapButton.setText(Messages.ViewmapProducerWizardPage_btnUseModeledViewmap_text);
-		useModeledViewmapButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_CENTER));
-
-		SelectionListener selectionListener = new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				if (generateRCPButton == e.widget) {
-					getOperation().getOptions().setGenerateRCP(generateRCPButton.getSelection());
-				} else if (useMapModeButton == e.widget) {
-					getOperation().getOptions().setUseMapMode(useMapModeButton.getSelection());
-				} else if (useRuntimeFiguresButton == e.widget) {
-					getOperation().getOptions().setUseRuntimeFigures(useRuntimeFiguresButton.getSelection());
-				} else if (useModeledViewmapButton == e.widget) {
-					getOperation().getOptions().setInTransformationCodeGen(!useModeledViewmapButton.getSelection());
-				}
-				validatePage();
-			}
-		};
-
-		useMapModeButton.addSelectionListener(selectionListener);
-		useRuntimeFiguresButton.addSelectionListener(selectionListener);
-		generateRCPButton.addSelectionListener(selectionListener);
-		useModeledViewmapButton.addSelectionListener(selectionListener);
-
-		createAdvancedControls(result);
-		Composite glue = new Composite(result, SWT.NONE);
-		glue.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
-	}
-
-	private void createAdvancedControls(Composite result) {
-		Group parent = new Group(result, SWT.SHADOW_ETCHED_IN);
-		parent.setText("Provisional");
-		parent.setLayout(new FillLayout());
-		parent.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-		ExpandBar c = new ExpandBar(parent, SWT.NONE);
-		c.setBackground(parent.getBackground());
-		templatesPathText = new Text(c, SWT.SINGLE | SWT.BORDER);
-		Listener modifyListener = new Listener() {
-			public void handleEvent(Event event) {
-				validatePage();
-			}
-		};
-		templatesPathText.addListener(SWT.Modify, modifyListener);
-		myTemplatePathItem = new ExpandItem(c, SWT.NONE, 0);
-		myTemplatePathItem.setText("GMFGraph dynamic templates");
-		myTemplatePathItem.setHeight(templatesPathText.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-		myTemplatePathItem.setControl(templatesPathText);
-		//
-		Composite map2genControls = new Composite(c, SWT.NONE);
-		map2genControls.setLayout(new FillLayout(SWT.VERTICAL));
-		radioDGMT = new Button(map2genControls, SWT.RADIO);
-		radioDGMT.setText("Use Java transformation");
-		
-		radioQVT = new Button(map2genControls, SWT.RADIO);
-		radioQVT.setText("Use QVTO transformation");
-
-		radioCustomQVT = new Button(map2genControls, SWT.RADIO);
-		radioCustomQVT.setText("Use custom QVTO transformation:");
-
-		qvtoFileControl = new Text(map2genControls, SWT.SINGLE | SWT.BORDER);
-		
-		radioDGMT.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (event.widget == radioDGMT) {
-					qvtoFileControl.setEditable(false);
-					qvtoFileControl.setEnabled(false);
-					getOperation().getOptions().setTransformation(null);
-				}
-			}
-		});
-		radioQVT.addListener(SWT.Selection, new Listener() {
-			public void handleEvent(Event event) {
-				if (event.widget == radioQVT) {
-					qvtoFileControl.setEditable(false);
-					qvtoFileControl.setEnabled(false);
-					getOperation().getOptions().setTransformation(QVTDiagramGenModelTransformer.getDefaultTransformation());
-				}
-			}
-		});
-		radioCustomQVT.addListener(SWT.Selection, new Listener(){
-			public void handleEvent(Event event) {
-				if (event.widget == radioCustomQVT) {
-					qvtoFileControl.setEditable(true);
-					qvtoFileControl.setEnabled(true);
-					if (qvtoFileControl.getText() != null) {
-						getOperation().getOptions().setTransformation(checkTextFieldURI(qvtoFileControl));
-					}
-				}
-			}
-		});
-		qvtoFileControl.addListener(SWT.CHANGED, new Listener(){
-			public void handleEvent(Event event) {
-				if (event.widget == qvtoFileControl && radioCustomQVT.getSelection() && qvtoFileControl.getText() != null) {
-					getOperation().getOptions().setTransformation(checkTextFieldURI(qvtoFileControl));
-				}
-			}
-		});
-		preReconcileTransformBtn = new Button(map2genControls, SWT.CHECK);
-		preReconcileTransformBtn.setText("Extra in-place gmfgen transformation before a reconcile step");
-		preReconcileTranfsormText = new Text(map2genControls, SWT.SINGLE | SWT.BORDER);
-		postReconcileTransformBtn = new Button(map2genControls, SWT.CHECK);
-		postReconcileTransformBtn.setText("Extra in-place gmfgen transformation after a reconcile step");
-		postReconcileTransformText = new Text(map2genControls, SWT.SINGLE | SWT.BORDER);
-		
-		preReconcileTransformBtn.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (((Button)e.widget).getSelection()) {
-					preReconcileTranfsormText.setEditable(true);
-					preReconcileTranfsormText.setEnabled(true);
-					
-					if (preReconcileTranfsormText.getText() != null) {
-						getOperation().getOptions().setPreReconcileTransform(checkTextFieldURI(preReconcileTranfsormText));
-					}
-				} else {
-					preReconcileTranfsormText.setEditable(true);
-					preReconcileTranfsormText.setEnabled(true);
-					getOperation().getOptions().setPreReconcileTransform(null);
-				}
-			}
-		});
-		preReconcileTranfsormText.addListener(SWT.CHANGED, new Listener(){
-			public void handleEvent(Event event) {
-				if (preReconcileTransformBtn.getSelection() && preReconcileTranfsormText.getText() != null) {
-					getOperation().getOptions().setPreReconcileTransform(checkTextFieldURI(preReconcileTranfsormText));
-				}
-			}
-		});
-		postReconcileTransformBtn.addSelectionListener(new SelectionAdapter() {
-			@Override
-			public void widgetSelected(SelectionEvent e) {
-				if (((Button)e.widget).getSelection()) {
-					postReconcileTransformText.setEditable(true);
-					postReconcileTransformText.setEnabled(true);
-					
-					if (postReconcileTransformText.getText() != null) {
-						getOperation().getOptions().setPostReconcileTransform(checkTextFieldURI(postReconcileTransformText));
-					}
-				} else {
-					postReconcileTransformText.setEditable(true);
-					postReconcileTransformText.setEnabled(true);
-					getOperation().getOptions().setPostReconcileTransform(null);
-				}
-			}
-		});
-		postReconcileTransformText.addListener(SWT.CHANGED, new Listener(){
-			public void handleEvent(Event event) {
-				if (postReconcileTransformBtn.getSelection() && postReconcileTransformText.getText() != null) {
-					getOperation().getOptions().setPostReconcileTransform(checkTextFieldURI(postReconcileTransformText));
-				}
-			}
-		});
-		preReconcileTranfsormText.addListener(SWT.Modify, modifyListener);
-		postReconcileTransformText.addListener(SWT.Modify, modifyListener);
-		String hint = "Transformation should take single inout parameter of GMFGen model type, e.g.\n\nmodeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');\n\ntransformation %s(inout gmfgenModel : GMFGEN);\n\n main() {...}";
-		preReconcileTranfsormText.setToolTipText(String.format(hint, "PreReconcile"));
-		postReconcileTransformText.setToolTipText(String.format(hint, "PostReconcile"));
-		myTransformsItem = new ExpandItem(c, SWT.NONE, 1);
-		myTransformsItem.setText("Map to Gen transformation");
-		myTransformsItem.setHeight(map2genControls.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
-		myTransformsItem.setControl(map2genControls);
-	}
-
-	void validatePage() {
-		if (myInitingControls) {
-			return;
-		}
-		setStatus(Status.OK_STATUS);
-		boolean hasLite = TransformOptions.checkLiteOptionPresent();
-		if (hasLite) {
-			if (!useRuntimeFiguresButton.getSelection() && useMapModeButton.getSelection()) {
-				setStatus(Plugin.createInfo(Messages.ViewmapProducerWizardPage_i_not_recommended));
-			}
-		}
-		TransformOptions options = getOperation().getOptions();
-		// safe to set option value now as they get flushed into storage only on Wizard.performFinish
-		options.setFigureTemplatesPath(checkTextFieldURI(templatesPathText));
-	}
-
-	private URL checkTextFieldURI(Text widget) {
-		if (widget == null) {
-			return null;
-		}
-		if (!widget.isEnabled()) {
-			return null;
-		}
-		if (widget.getText().trim().length() > 0) {
-			try {
-				return new URL(guessAndResolvePathURL(widget.getText().trim()));
-			} catch (MalformedURLException ex) {
-				setStatus(Plugin.createWarning(ex.getMessage()));
-			}
-		}
-		return null;
-	}
-
-	private void initControls() {
-		myInitingControls = true;
-		try {
-			TransformOptions options = getOperation().getOptions();
-			generateRCPButton.setSelection(options.getGenerateRCP());
-			useRuntimeFiguresButton.setSelection(options.getUseRuntimeFigures());
-			useMapModeButton.setSelection(options.getUseMapMode());
-			useModeledViewmapButton.setSelection(!options.getUseInTransformationCodeGen());
-			if (null != options.getFigureTemplatesPath()) {
-				templatesPathText.setText(options.getFigureTemplatesPath().toString());
-				// reveal the value to avoid confusion.
-				// FIXME extract expand bar with template path as separate control and
-				// move expand logic there (based on setInitialValue event
-				myTemplatePathItem.setExpanded(true);
-			}
-
-			radioDGMT.setSelection(options.getMainTransformation() == null);
-			radioQVT.setSelection(!radioDGMT.getSelection() && !radioCustomQVT.getSelection());
-			radioCustomQVT.setSelection(!radioDGMT.getSelection() && !radioQVT.getSelection());
-			qvtoFileControl.setEnabled(radioCustomQVT.getSelection());
-			qvtoFileControl.setText(options.getMainTransformation() != null ? options.getMainTransformation().toString() : QVTDiagramGenModelTransformer.getDefaultTransformation().toString());
-			preReconcileTransformBtn.setSelection(options.getPreReconcileTransform() != null);
-			preReconcileTranfsormText.setEnabled(preReconcileTransformBtn.getSelection());
-			preReconcileTranfsormText.setText(options.getPreReconcileTransform() != null ? options.getPreReconcileTransform().toString() : ""); //$NON-NLS-1$
-			postReconcileTransformBtn.setSelection(options.getPostReconcileTransform() != null);
-			postReconcileTransformText.setEnabled(postReconcileTransformBtn.getSelection());
-			postReconcileTransformText.setText(options.getPostReconcileTransform() != null ? options.getPostReconcileTransform().toString() : ""); //$NON-NLS-1$
-			if (radioQVT.getSelection() || radioCustomQVT.getSelection() || preReconcileTransformBtn.getSelection() || postReconcileTransformBtn.getSelection()) {
-				myTransformsItem.setExpanded(true);
-			}
-		} finally {
-			myInitingControls = false;
-		}
-	}
-
-	private ITransformToGenModelOperation getOperation() {
-		return ((TransformToGenModelWizard) getWizard()).getTransformOperation();
-	}
-
-	private void setStatus(IStatus s) {
-		if (s.isOK()) {
-			setMessage(null);
-			setPageComplete(true);
-		} else {
-			setMessage(s.getMessage(), IMessageProvider.INFORMATION);
-			setPageComplete(s.getSeverity() < IStatus.WARNING);
-		}
-	}
-
-	private static String guessAndResolvePathURL(String path) {
-		assert path != null;
-		if (path.indexOf(':') == -1) {
-			try {
-				URI templatesURI = URI.createPlatformResourceURI(path, true);
-				return templatesURI.toString();
-			} catch (IllegalArgumentException ex) {
-				// IGNORE. URI#validate throws IAE if path is incorrect, e.g. once user typed in "platform:" - opaquePart is illegal
-			}
-		}
-		return path;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/VisualIdentifierDispenserProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/VisualIdentifierDispenserProvider.java
deleted file mode 100644
index 96f97973725..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/VisualIdentifierDispenserProvider.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.papyrus.gmf.internal.bridge.NaiveIdentifierDispenser;
-import org.eclipse.papyrus.gmf.internal.bridge.StatefulVisualIdentifierDispencer;
-import org.eclipse.papyrus.gmf.internal.bridge.VisualIdentifierDispenser;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.osgi.framework.Bundle;
-
-/**
- * holds additional logic to pre/post process dispensers
- * FIXME this class public only for use in codegen.ui for old transform action
- * TODO package-local as soon as old transform action is removed
- */
-public class VisualIdentifierDispenserProvider {
-	private VisualIdentifierDispenser dispenser;
-	private final URI myStateBaseURI;
-
-	// FIXME see class comment why public
-	public VisualIdentifierDispenserProvider(URI stateBaseURI) {
-		myStateBaseURI = stateBaseURI;
-	}
-
-	private VisualIdentifierDispenser initialize() {
-		Bundle tracePluginBundle = Platform.getBundle("org.eclipse.papyrus.gmf.bridge.trace"); //$NON-NLS-1$
-		if (tracePluginBundle != null) {
-			try {
-				Class<?> despenserClass = tracePluginBundle.loadClass("org.eclipse.papyrus.gmf.internal.bridge.trace.MergingIdentifierDispenser"); //$NON-NLS-1$
-				return (VisualIdentifierDispenser) despenserClass.newInstance();
-			} catch (ClassNotFoundException e) {
-				Plugin.log(Plugin.createError("MergingIdentifierDispenser was not found in org.eclipse.papyrus.gmf.bridge.trace bundle", e)); //$NON-NLS-1$
-			} catch (InstantiationException e) {
-				Plugin.log(Plugin.createError("MergingIdentifierDispenser was not instantiated", e)); //$NON-NLS-1$
-			} catch (IllegalAccessException e) {
-				Plugin.log(Plugin.createError("IllegalAccessException while instantiating MergingIdentifierDispenser", e)); //$NON-NLS-1$
-			} catch (ClassCastException ex) {
-				Plugin.log(Plugin.createError("MergingIdentifierDispenser was not instantiated", ex)); //$NON-NLS-1$
-			}
-		}
-		return new NaiveIdentifierDispenser();
-	}
-
-	public VisualIdentifierDispenser get() {
-		assert dispenser != null;
-		return dispenser;
-	}
-
-	public void acquire() {
-		assert dispenser == null;
-		dispenser = initialize();
-		if (dispenser instanceof StatefulVisualIdentifierDispencer) {
-			StatefulVisualIdentifierDispencer statefulDispencer = (StatefulVisualIdentifierDispencer) dispenser;
-			statefulDispencer.loadState(myStateBaseURI);
-		}
-	}
-
-	public void release() {
-		if (dispenser instanceof StatefulVisualIdentifierDispencer) {
-			((StatefulVisualIdentifierDispencer) dispenser).saveState();
-		}
-		dispenser = null;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/messages.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/messages.properties
deleted file mode 100644
index 5048609d84a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/messages.properties
+++ /dev/null
@@ -1,68 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-StaleGenModelDetector_stale=Resource {0} is newer ({1,date}) than genmodel ({2,date})
-GenModelDetector_e_not_found=Can't find genmodel
-GenModelDetector_e_save=Can't save created genmodel
-GenModelDetector_e_no_genmodelaccess=Need to apply GenModelAccess first
-GenModelConfigurationPage_btn_new_wizard=New EMF Model ...
-ValidationHelper_task_validate=Validating ...
-ValidationHelper_e_marker_creation=Marker creation failure
-TransformToGenModelOperation_e_map_load_cancelled=Mapping model loading was interrupted
-TransformToGenModelOperation_e_wrong_root_element=Wrong root element: {0}
-TransformToGenModelOperation_e_load_mapping_model=Errors while loading Mapping model
-TransformToGenModelOperation_task_load=Loading ...
-TransformToGenModelOperation_task_validate=Validating ...
-TransformToGenModelOperation_e_mapping_invalid=Invalid Mapping Model
-TransformToGenModelOperation_e_null_gmfgen_uri=Target gmfgen URI should be specified
-TransformToGenModelOperation_e_generator_creation=Errors while creating generator model
-TransformToGenModelWizard_e_operation_cancelled=Operation cancelled
-TransformToGenModelOperation_e_genmodel_load_cancelled=GenModel loading was interrupted
-TransformToGenModelOperation_task_detect=Detecting ...
-TransformToGenModelWizard_title_mapmodel=Select Mapping Model
-TransformToGenModelWizard_title_mapdiagnostic=Mapping Model Validation Result
-TransformToGenModelWizard_descr_mapmodel=Load Mapping Model
-TransformToGenModelWizard_descr_mapdiagnostic=Please review Mapping Model validation errors
-TransformToGenModelWizard_title_genmodel=Select GenModel
-TransformToGenModelWizard_descr_genmodel=Load GenModel or create new one
-TransformToGenModelOperation_e_genmodel_load=Failed to load GenModel
-TransformToGenModelOperation_e_null_mapping=Mapping model should be loaded
-TransformToGenModelOperation_e_null_map_uri=Mapping model URI should specified
-TransformToGenModelOperation_task_generate=Generating ...
-TransformToGenModelOperation_task_reconcile=Reconciling ...
-TransformToGenModelOperation_task_save=Saving ...
-TransformToGenModelWizard_title_options=Specify transformation options
-TransformToGenModelWizard_title_gmfgen=GMFGen Model
-TransformToGenModelWizard_title_wizard=Create generator model
-TransformToGenModelWizard_descr_options=Specify transformation options
-TransformToGenModelWizard_descr_gmfgen=Create a new GMFGen Model
-TransformToGenModelWizard_title_gmfgendiagnostic=GMFGen Model Validation Result
-TransformToGenModelWizard_descr_gmfgendiagnostic=Please review GMFGen Model validation errors
-ViewmapProducerWizardPage_btn_mapmode=Use IMapMode
-ViewmapProducerWizardPage_btn_runtime=Utilize enhanced features of GMF runtime
-ViewmapProducerWizardPage_btn_rcp=Generate RCP Application
-ViewmapProducerWizardPage_i_not_recommended=It is not recommended to use IMapMode for pure-GEF diagram editors
-ViewmapProducerWizardPage_btnUseModeledViewmap_text=Use Modeled Viewmap
-GenModelConfigurationPage_btn_create_default=Default GenModel...
-GenModelConfigurationPage_btn_refresh_stale=Refresh stale GenModel...
-GMFGenNewFileCreationPage_e_filename=The file name must end in ".{0}"
-
-MapModelDiagnosticPage_btn_ignore_text=Ignore validation errors
-
-#XXX: remove after fix of https://bugs.eclipse.org/bugs/show_bug.cgi?id=172000
-ResourceGroup_nameExists = The same name already exists.
-ResourceGroup_folderEmpty = No folder specified.
-ResourceGroup_noProject = The specified project does not exist.
-ResourceGroup_emptyName = The ''{0}'' name is empty.
-ResourceGroup_invalidFilename = ''{0}'' is not a valid file name.
-ResourceGroup_pathOccupied = A file already exists at that location: {0}
-WizardNewFileCreationPage_file = file
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/ui/Plugin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/ui/Plugin.java
deleted file mode 100644
index 2e5c633af14..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/ui/Plugin.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.ui;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.ContainmentClosure;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-public class Plugin extends AbstractUIPlugin {
-
-	public static final String CHECKED_ICON = "/icons/cview16/checked.gif"; //$NON-NLS-1$
-
-	public static final String UNCHECKED_ICON = "/icons/cview16/unchecked.gif"; //$NON-NLS-1$
-
-	public static final String GRAYED_ICON = "/icons/cview16/grayed.gif"; //$NON-NLS-1$
-
-	public static final String NODE_ICON = "/icons/cview16/node.gif"; //$NON-NLS-1$
-
-	public static final String LINK_ICON = "/icons/cview16/link.gif"; //$NON-NLS-1$
-
-	public static final String LABEL_ICON = "/icons/cview16/label.gif"; //$NON-NLS-1$
-
-	private static Plugin plugin;
-	private ContainmentClosure myContainmentClosure;
-
-	public Plugin() {
-		plugin = this;
-	}
-
-	public void stop(BundleContext context) throws Exception {
-		if (myContainmentClosure != null) {
-			myContainmentClosure = null;
-		}
-		super.stop(context);
-		plugin = null;
-	}
-
-	public ContainmentClosure getContaintmentClosure() {
-		if (myContainmentClosure == null) {
-			myContainmentClosure = new ContainmentClosure();
-		}
-		return myContainmentClosure;
-	}
-
-	public static IStatus createStatus(int statusCode, String message, Throwable ex) {
-		return new Status(statusCode, getPluginID(), 0, message, ex);
-	}
-
-	public static IStatus createError(String message, Throwable ex) {
-		return createStatus(IStatus.ERROR, message, ex);
-	}
-
-	public static IStatus createWarning(String message) {
-		return createStatus(IStatus.WARNING, message, null);
-	}
-
-	public static IStatus createInfo(String message) {
-		return createStatus(IStatus.INFO, message, null);
-	}
-
-	public static IStatus createCancel(String message) {
-		return createStatus(IStatus.CANCEL, message, null);
-	}
-
-	public static Plugin getDefault() {
-		return plugin;
-	}
-	
-	public static String getBundleString(String key) {
-		return Platform.getResourceBundle(getDefault().getBundle()).getString(key);
-	}
-
-	public static String getBundleString(String key, Object[] args) {
-		String val = getBundleString(key);
-		if (val == null) {
-			return key;
-		}
-		return MessageFormat.format(val, args);
-	}
-
-	protected void initializeImageRegistry(ImageRegistry reg) {
-		loadImage(reg, CHECKED_ICON);
-		loadImage(reg, UNCHECKED_ICON);
-		loadImage(reg, GRAYED_ICON);
-		loadImage(reg, NODE_ICON);
-		loadImage(reg, LINK_ICON);
-		loadImage(reg, LABEL_ICON);
-	}
-
-	protected void loadImage(ImageRegistry registry, String id) {
-		loadImage(registry, id, getBundle().getSymbolicName());
-	}
-
-	protected void loadImage(ImageRegistry registry, String id, String bundleId) {
-		ImageDescriptor descriptor = imageDescriptorFromPlugin(bundleId, id);
-		if (descriptor != null) {
-			registry.put(id, descriptor);
-		}
-	}
-
-	public static void log(CoreException ex) {
-		log(ex.getStatus());
-	}
-
-	public static void log(Exception ex) {
-		if (ex instanceof CoreException) {
-			log((CoreException) ex);
-		} else {
-			log(createError(ex.getMessage(), ex));
-		}
-	}
-
-	public static String getPluginID() {
-		return getDefault().getBundle().getSymbolicName();
-	}
-
-	public static void log(IStatus s) {
-		getDefault().getLog().log(s);
-	}
-
-	public static boolean needsReconcile() {
-		// no need to check for null, default value is true 
-		return !Boolean.FALSE.toString().equals(Platform.getDebugOption(getPluginID() + "/reconcile")); //$NON-NLS-1$
-	}
-
-	public static boolean ignoreDanglingHrefOnSave() {
-		String v = Platform.getDebugOption(getPluginID() + "/transform/ignore-dangling-on-save"); //$NON-NLS-1$
-		return v != null && !Boolean.FALSE.toString().equals(v);
-	}
-	public static boolean printTransformationConsole() {
-		String v = Platform.getDebugOption(getPluginID() + "/transform/print-qvto-console"); //$NON-NLS-1$
-		return v != null && !Boolean.FALSE.toString().equals(v);
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given plug-in relative path.
-	 * 
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static ImageDescriptor getImageDescriptor(String path) {
-		return AbstractUIPlugin.imageDescriptorFromPlugin(getPluginID(), path);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFGraphReconcileModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFGraphReconcileModelWizard.java
deleted file mode 100644
index 9da24716aef..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFGraphReconcileModelWizard.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
-
-/**
- * @author dstadnik
- */
-public class GMFGraphReconcileModelWizard extends GMFGraphSimpleModelWizard {
-
-	public GMFGraphReconcileModelWizard() {
-		setMode(WizardOperationMode.RECONCILE);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFGraphSimpleModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFGraphSimpleModelWizard.java
deleted file mode 100644
index 9b4793868fe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFGraphSimpleModelWizard.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 Borland Software Corp.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.presentation.GMFGraphModelWizard;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.StructureResolver;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.DefinitionPage;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.DomainModelSelectionPage;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.DomainModelSourceImpl;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.GraphDefBuilder;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.StructureBuilder;
-import org.eclipse.papyrus.gmf.internal.common.URIUtil;
-import org.eclipse.papyrus.gmf.internal.common.ui.ModelSelectionPage;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-
-/**
- * @author dstadnik
- */
-public class GMFGraphSimpleModelWizard extends GMFGraphModelWizard {
-
-	protected ModelSelectionPage graphicalModelSelectionPage;
-
-	protected DefinitionPage graphicalDefinitionPage;
-
-	protected WizardOperationMode mode = new WizardOperationMode("gmfgraph", WizardOperationMode.CREATE); //$NON-NLS-1$
-
-	public void setMode(String mode) {
-		this.mode.setMode(mode);
-	}
-
-	/**
-	 * Returns true if wizard operates in reconcile mode.
-	 * Resource must be available if returns true.
-	 */
-	protected boolean isInReconcileMode() {
-		return graphicalModelSelectionPage != null && graphicalModelSelectionPage.getResource() != null;
-	}
-
-	public boolean performFinish() {
-		if (isInReconcileMode()) {
-			reconcileModel();
-			try {
-				WizardUtil.saveModel(getContainer(), graphicalModelSelectionPage.getResource());
-			} catch (Exception exception) {
-				Plugin.log(exception);
-				return false;
-			}
-			IFile modelFile = getModelFile();
-			if (modelFile != null) {
-				WizardUtil.openEditor(modelFile);
-			}
-			return true;
-		} else {
-			return super.performFinish();
-		}
-	}
-
-	protected EObject createInitialModel() {
-		GraphDefBuilder builder = new GraphDefBuilder(null);
-		return builder.process(graphicalDefinitionPage.getModel());
-	}
-
-	protected void reconcileModel() {
-		Canvas existingCanvas = null;
-		for (EObject element : graphicalModelSelectionPage.getResource().getContents()) {
-			if (element instanceof Canvas) {
-				existingCanvas = (Canvas) element;
-				break;
-			}
-		}
-		GraphDefBuilder builder = new GraphDefBuilder(existingCanvas);
-		Canvas canvas = builder.process(graphicalDefinitionPage.getModel());
-		if (canvas != null && existingCanvas != canvas) {
-			graphicalModelSelectionPage.getResource().getContents().add(canvas);
-		}
-	}
-
-	public void addPages() {
-		ResourceLocationProvider rloc = new ResourceLocationProvider(selection);
-		ResourceSet resourceSet = new ResourceSetImpl();
-		if (mode.detectReconcile(rloc)) {
-			graphicalModelSelectionPage = new ModelSelectionPage("GraphicalModelSelectionPage", rloc, resourceSet, "gmfgraph"); //$NON-NLS-1$ //$NON-NLS-2$
-			graphicalModelSelectionPage.setPageComplete(false);
-			graphicalModelSelectionPage.setModelRequired(true);
-			graphicalModelSelectionPage.setTitle(Messages.SimpleModelWizardGraphModelSelectionPageTitle);
-			graphicalModelSelectionPage.setDescription(Messages.SimpleModelWizardGraphModelSelectionPageDesc);
-			addPage(graphicalModelSelectionPage);
-		} else {
-			super.addPages();
-			if (selection != null && !selection.isEmpty()) {
-				Object selected = selection.getFirstElement();
-				if (selected instanceof IFile) {
-					newFileCreationPage.setFileName(WizardUtil.getDefaultFileName((IFile) selected, "gmfgraph")); //$NON-NLS-1$
-				}
-			}
-		}
-
-		DomainModelSelectionPage domainModelSelectionPage = new DomainModelSelectionPage("DomainModelSelectionPage", rloc, resourceSet); //$NON-NLS-1$
-		domainModelSelectionPage.setTitle(Messages.SimpleModelWizardDomainModelSelectionPageTitle);
-		domainModelSelectionPage.setDescription(Messages.SimpleModelWizardDomainModelSelectionPageDesc);
-		addPage(domainModelSelectionPage);
-
-		graphicalDefinitionPage = new DefinitionPage("GraphicalDefinitionPage", new StructureBuilder(new StructureResolver(), true), domainModelSelectionPage) { //$NON-NLS-1$
-
-			protected DomainModelSourceImpl createDomainModelSource(EPackage contents, EClass diagramElement) {
-				if (isInReconcileMode()) {
-					return new DomainModelSourceImpl(contents, diagramElement) {
-
-						public boolean isDisabled(EObject domainElement) {
-							return GraphDefBuilder.getDiagramElement(graphicalModelSelectionPage.getResource().getAllContents(), domainElement) != null;
-						}
-					};
-				}
-				return super.createDomainModelSource(contents, diagramElement);
-			}
-		};
-		graphicalDefinitionPage.setTitle(Messages.SimpleModelWizardGraphDefinitionPageTitle);
-		graphicalDefinitionPage.setDescription(Messages.SimpleModelWizardGraphDefinitionPageDesc);
-		addPage(graphicalDefinitionPage);
-	}
-
-	public IFile getModelFile() {
-		if (isInReconcileMode()) {
-			return URIUtil.getFile(graphicalModelSelectionPage.getResource().getURI());
-		}
-		return super.getModelFile();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFMapGuideModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFMapGuideModelWizard.java
deleted file mode 100644
index a55c7a083e6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFMapGuideModelWizard.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Observable;
-import java.util.Observer;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.EntriesPage;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.Messages;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.NewMapFileCreationPage;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.WizardInput;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.presentation.MapRefModelPages;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-
-/**
- * @author artem
- */
-public class GMFMapGuideModelWizard extends Wizard implements INewWizard {
-
-	protected IStructuredSelection mySelection;
-
-	protected final WizardInput myHolder;
-
-	protected final MapRefModelPages refPages;
-
-	private IWorkbench myWorkbench;
-
-	private ToolRegistry myRegistry;
-
-	public GMFMapGuideModelWizard() {
-		setNeedsProgressMonitor(true);
-		setWindowTitle(Messages.wizardTitle);
-		myHolder = new WizardInput() {
-
-			public EPackage getDomainModel() {
-				return refPages.getDomainModel();
-			}
-
-			public Canvas getCanvasDef() {
-				return refPages.getCanvas();
-			}
-
-			public ToolRegistry getToolDef() {
-				if (isNewBlankToolDef()) {
-					return myRegistry;
-				}
-				Palette palette = refPages.getPalette();
-				if (palette == null) {
-					return null;
-				}
-				return (ToolRegistry) palette.eContainer();
-			}
-
-			public boolean isNewBlankToolDef() {
-				return refPages.shouldCreateNewToolingModel(false);
-			}
-		};
-		refPages = new MapRefModelPages(true, myHolder.getResourceSet()) {
-
-			/*
-			 * graph page is the last since tooling should be selected
-			 * prior to canvas update; see WizardInput.feedDefaultMapping()
-			 */
-			public void addPages(Wizard wizard, ISelection selection) {
-				ResourceLocationProvider rloc = new ResourceLocationProvider(selection);
-				addDomainPage(wizard, rloc);
-				addToolPage(wizard, rloc);
-				addGraphPage(wizard, rloc);
-			}
-		};
-	}
-
-	public void addPages() {
-		addNewFilePage();
-		refPages.addPages(this, mySelection);
-		refPages.getDomainModelSelectionPage().setModelRequired(true);
-		refPages.getGraphModelSelectionPage().setModelRequired(true);
-		refPages.getToolModelSelectionPage().setModelRequired(true);
-		refPages.getDomainModelExt().addObserver(new Observer() {
-
-			public void update(Observable o, Object arg) {
-				CanvasMapping cm = myHolder.getMapping().getDiagram();
-				cm.setDomainModel((EPackage) arg);
-			}
-		});
-		refPages.getDomainElementExt().addObserver(new Observer() {
-
-			public void update(Observable o, Object arg) {
-				CanvasMapping cm = myHolder.getMapping().getDiagram();
-				cm.setDomainMetaElement((EClass) arg);
-			}
-		});
-		refPages.getCanvasExt().addObserver(new Observer() {
-
-			public void update(Observable o, Object arg) {
-				CanvasMapping cm = myHolder.getMapping().getDiagram();
-				cm.setDiagramCanvas((Canvas) arg);
-				myHolder.feedDefaultMapping();
-			}
-		});
-		refPages.allowNewToolingModel();
-		refPages.getCreateNewToolingModelExt().addObserver(new Observer() {
-
-			public void update(Observable o, Object arg) {
-				if (((Boolean) arg).booleanValue()) {
-					createBlankToolDef();
-				}
-			}
-		});
-		addDoMapPage();
-	}
-
-	public URI createBlankToolDef() {
-		checkUnload(myRegistry);
-		myRegistry = null;
-		IPath toolDefFile = myHolder.getMappingFile().getFullPath().removeFileExtension().addFileExtension(WizardInput.TOOLDEF_FILE_EXT);
-		String baseName = myHolder.getMappingFile().getFullPath().removeFileExtension().lastSegment();
-		int i = 1;
-		final IWorkspace wr = myHolder.getMappingFile().getProject().getWorkspace();
-		while (wr.getRoot().findMember(toolDefFile) != null) {
-			toolDefFile = toolDefFile.removeLastSegments(1).append(baseName + i).addFileExtension(WizardInput.TOOLDEF_FILE_EXT);
-			i++;
-		}
-		URI toolDefURI = URI.createPlatformResourceURI(toolDefFile.toString(), true);
-		myRegistry = GMFToolFactory.eINSTANCE.createToolRegistry();
-		myRegistry.setPalette(GMFToolFactory.eINSTANCE.createPalette());
-		myHolder.getResourceSet().createResource(toolDefURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE).getContents().add(myRegistry);
-		return toolDefURI;
-	}
-
-	private void checkUnload(EObject eobj) {
-		if (eobj == null) {
-			return;
-		}
-		if (eobj.eResource().getResourceSet() == myHolder.getResourceSet() && eobj.eResource().isLoaded()) {
-			eobj.eResource().unload();
-		}
-	}
-
-	protected void addNewFilePage() {
-		addPage(new NewMapFileCreationPage(mySelection, myHolder));
-	}
-
-	protected void addDoMapPage() {
-		addPage(new EntriesPage(myHolder));
-	}
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		myWorkbench = workbench;
-		mySelection = selection;
-	}
-
-	public boolean performFinish() {
-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-
-			protected void execute(IProgressMonitor progressMonitor) {
-				try {
-					Map<String, Object> options = new HashMap<String, Object>();
-					options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
-					if (myHolder.isNewBlankToolDef()) {
-						myHolder.getToolDef().eResource().save(options);
-					}
-					myHolder.getMapping().eResource().save(options);
-				} catch (Exception ex) {
-					Plugin.log(ex);
-				} finally {
-					progressMonitor.done();
-				}
-			}
-		};
-
-		try {
-			getContainer().run(false, false, operation);
-			WizardUtil.selectReveal(myWorkbench, new StructuredSelection(getModelFile()));
-			WizardUtil.openInEditor(myWorkbench, getModelFile());
-		} catch (InvocationTargetException ex) {
-			return false;
-		} catch (InterruptedException ex) {
-			return false;
-		} catch (PartInitException ex) {
-			Plugin.log(ex);
-		}
-		return true;
-	}
-
-	public IFile getModelFile() {
-		return myHolder.getMappingFile();
-	}
-
-	public WizardInput getWizardInput() {
-		return myHolder;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFToolReconcileModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFToolReconcileModelWizard.java
deleted file mode 100644
index d549ca6b23b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFToolReconcileModelWizard.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
-
-/**
- * @author dstadnik
- */
-public class GMFToolReconcileModelWizard extends GMFToolSimpleModelWizard {
-
-	public GMFToolReconcileModelWizard() {
-		setMode(WizardOperationMode.RECONCILE);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFToolSimpleModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFToolSimpleModelWizard.java
deleted file mode 100644
index 3d5cbd37bbc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/GMFToolSimpleModelWizard.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 Borland Software Corp.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.StructureResolver;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.DefinitionPage;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.DomainModelSelectionPage;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.DomainModelSourceImpl;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.StructureBuilder;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.ToolDefBuilder;
-import org.eclipse.papyrus.gmf.internal.common.URIUtil;
-import org.eclipse.papyrus.gmf.internal.common.ui.ModelSelectionPage;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-import org.eclipse.papyrus.gmf.tooldef.presentation.GMFToolModelWizard;
-
-/**
- * @author dstadnik
- */
-public class GMFToolSimpleModelWizard extends GMFToolModelWizard {
-
-	protected ModelSelectionPage toolingModelSelectionPage;
-
-	protected DefinitionPage toolingDefinitionPage;
-
-	protected WizardOperationMode mode = new WizardOperationMode("gmftool", WizardOperationMode.CREATE); //$NON-NLS-1$
-
-	public void setMode(String mode) {
-		this.mode.setMode(mode);
-	}
-
-	/**
-	 * Returns true if wizard operates in reconcile mode.
-	 * Resource must be available if returns true.
-	 */
-	protected boolean isInReconcileMode() {
-		return toolingModelSelectionPage != null && toolingModelSelectionPage.getResource() != null;
-	}
-
-	public boolean performFinish() {
-		if (isInReconcileMode()) {
-			reconcileModel();
-			try {
-				WizardUtil.saveModel(getContainer(), toolingModelSelectionPage.getResource());
-			} catch (Exception exception) {
-				Plugin.log(exception);
-				return false;
-			}
-			IFile modelFile = getModelFile();
-			if (modelFile != null) {
-				WizardUtil.openEditor(modelFile);
-			}
-			return true;
-		} else {
-			return super.performFinish();
-		}
-	}
-
-	protected EObject createInitialModel() {
-		ToolDefBuilder builder = new ToolDefBuilder(null);
-		return builder.process(toolingDefinitionPage.getModel());
-	}
-
-	protected void reconcileModel() {
-		ToolRegistry existingToolRegistry = null;
-		for (EObject element : toolingModelSelectionPage.getResource().getContents()) {
-			if (element instanceof ToolRegistry) {
-				existingToolRegistry = (ToolRegistry) element;
-				break;
-			}
-		}
-		ToolDefBuilder builder = new ToolDefBuilder(existingToolRegistry);
-		ToolRegistry toolRegistry = builder.process(toolingDefinitionPage.getModel());
-		if (toolRegistry != null && existingToolRegistry != toolRegistry) {
-			toolingModelSelectionPage.getResource().getContents().add(toolRegistry);
-		}
-	}
-
-	public void addPages() {
-		ResourceLocationProvider rloc = new ResourceLocationProvider(selection);
-		ResourceSet resourceSet = new ResourceSetImpl();
-		if (mode.detectReconcile(rloc)) {
-			toolingModelSelectionPage = new ModelSelectionPage("ToolingModelSelectionPage", rloc, resourceSet, "gmftool"); //$NON-NLS-1$ //$NON-NLS-2$
-			toolingModelSelectionPage.setPageComplete(false);
-			toolingModelSelectionPage.setModelRequired(true);
-			toolingModelSelectionPage.setTitle(Messages.SimpleModelWizardToolModelSelectionPageTitle);
-			toolingModelSelectionPage.setDescription(Messages.SimpleModelWizardToolModelSelectionPageDesc);
-			addPage(toolingModelSelectionPage);
-		} else {
-			super.addPages();
-			if (selection != null && !selection.isEmpty()) {
-				Object selected = selection.getFirstElement();
-				if (selected instanceof IFile) {
-					newFileCreationPage.setFileName(WizardUtil.getDefaultFileName((IFile) selected, "gmftool")); //$NON-NLS-1$
-				}
-			}
-		}
-
-		DomainModelSelectionPage domainModelSelectionPage = new DomainModelSelectionPage("DomainModelSelectionPage", rloc, resourceSet); //$NON-NLS-1$
-		domainModelSelectionPage.setTitle(Messages.SimpleModelWizardDomainModelSelectionPageTitle);
-		domainModelSelectionPage.setDescription(Messages.SimpleModelWizardDomainModelSelectionPageDesc);
-		addPage(domainModelSelectionPage);
-
-		toolingDefinitionPage = new DefinitionPage("ToolingDefinitionPage", new StructureBuilder(new StructureResolver(), false), domainModelSelectionPage) { //$NON-NLS-1$
-
-			protected DomainModelSourceImpl createDomainModelSource(EPackage contents, EClass diagramElement) {
-				if (isInReconcileMode()) {
-					return new DomainModelSourceImpl(contents, diagramElement) {
-
-						public boolean isDisabled(EObject domainElement) {
-							return ToolDefBuilder.getCreationTool(toolingModelSelectionPage.getResource().getAllContents(), domainElement) != null;
-						}
-					};
-				}
-				return super.createDomainModelSource(contents, diagramElement);
-			}
-		};
-		toolingDefinitionPage.setTitle(Messages.SimpleModelWizardToolDefinitionPageTitle);
-		toolingDefinitionPage.setDescription(Messages.SimpleModelWizardToolDefinitionPageDesc);
-		addPage(toolingDefinitionPage);
-	}
-
-	public IFile getModelFile() {
-		if (isInReconcileMode()) {
-			return URIUtil.getFile(toolingModelSelectionPage.getResource().getURI());
-		}
-		return super.getModelFile();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/Messages.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/Messages.java
deleted file mode 100644
index db522aeebe6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/Messages.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author dstadnik
- */
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.gmf.internal.bridge.wizards.messages"; //$NON-NLS-1$
-
-	private Messages() {
-	}
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	public static String SimpleModelWizardDomainModelSelectionPageTitle;
-
-	public static String SimpleModelWizardDomainModelSelectionPageDesc;
-
-	public static String SimpleModelWizardGraphModelSelectionPageTitle;
-
-	public static String SimpleModelWizardGraphModelSelectionPageDesc;
-
-	public static String SimpleModelWizardGraphDefinitionPageTitle;
-
-	public static String SimpleModelWizardGraphDefinitionPageDesc;
-
-	public static String SimpleModelWizardToolDefinitionPageDesc;
-
-	public static String SimpleModelWizardToolDefinitionPageTitle;
-
-	public static String SimpleModelWizardToolModelSelectionPageDesc;
-
-	public static String SimpleModelWizardToolModelSelectionPageTitle;
-
-	public static String WizardUtilUnableToOpenEditor;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/NewGMFProjectWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/NewGMFProjectWizard.java
deleted file mode 100644
index 8094c58b736..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/NewGMFProjectWizard.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
-
-import org.eclipse.emf.codegen.ecore.ui.EmptyProjectWizard;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.ShowDashboardPage;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.WizardNewProjectCreationPage;
-
-/**
- * Quick way to introduce GMF Project wizard. XXX Get rid of EmptyProjectWizard
- * and ecore.ui dependency once you know what could be added here.
- * 
- * @author artem
- */
-public class NewGMFProjectWizard extends EmptyProjectWizard {
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		super.init(workbench, selection);
-		setWindowTitle(Plugin.getBundleString("newProjectWizard.name")); //$NON-NLS-1$
-	}
-
-	private static final String SD_PROPERTY = "show_dashboard"; //$NON-NLS-1$
-
-	private boolean showDashboard;
-
-	private ShowDashboardPage sdp;
-
-	private String initialProjectName;
-
-	public NewGMFProjectWizard() {
-		super();
-		showDashboard = Plugin.getDefault().getPreferenceStore().getBoolean(SD_PROPERTY);
-	}
-
-	public void addPages() {
-		super.addPages();
-		WizardNewProjectCreationPage page = (WizardNewProjectCreationPage) getPage("NewProjectCreationPage");  //$NON-NLS-1$
-		if (page != null) {
-			page.setInitialProjectName(initialProjectName);
-			page.setDescription(Plugin.getBundleString("newProjectWizard.desc")); //$NON-NLS-1$
-			page.setTitle(Plugin.getBundleString("newProjectWizard.name")); //$NON-NLS-1$
-		}
-		sdp = new ShowDashboardPage("Show Dashboard", showDashboard); //$NON-NLS-1$
-		sdp.setTitle(Plugin.getBundleString("showDashboardPage.name")); //$NON-NLS-1$
-		sdp.setDescription(Plugin.getBundleString("showDashboardPage.desc")); //$NON-NLS-1$
-		addPage(sdp);
-	}
-
-	public void setShowDashboard(boolean showDashboard) {
-		this.showDashboard = showDashboard;
-	}
-
-	public boolean performFinish() {
-		showDashboard = sdp.isShowDashboard();
-		Plugin.getDefault().getPreferenceStore().setValue(SD_PROPERTY, showDashboard);
-		boolean created = super.performFinish();
-		if (!created) {
-			return false;
-		}
-		if (showDashboard) {
-			getShell().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					openDashboardView();
-				}
-			});
-		}
-		return created;
-	}
-
-	protected void openDashboardView() {
-		IWorkbenchWindow window = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-		if (window != null && window.getActivePage() != null) {
-			try {
-				window.getActivePage().showView("org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardPart"); //$NON-NLS-1$
-			} catch (PartInitException e) {
-				Plugin.log(e);
-			}
-		}
-	}
-
-	public void setInitialProjectName(String initialProjectName) {
-		this.initialProjectName = initialProjectName;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/WizardOperationMode.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/WizardOperationMode.java
deleted file mode 100644
index 64aa780dba2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/WizardOperationMode.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Dmitri Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
-
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-
-/**
- * Wizard operation mode property.
- * Supports the following lifecycle: user creates it, possibly changes mode
- * a number of times and detects reconcile mode. After this property should
- * not be accessed or modified.
- * 
- * @author dstadnik
- */
-public final class WizardOperationMode {
-
-	/**
-	 * Wizard will detect in which mode it should operate.
-	 */
-	public static final String DETECT = "detect"; //$NON-NLS-1$
-
-	/**
-	 * Wizard will create new model.
-	 */
-	public static final String CREATE = "create"; //$NON-NLS-1$
-
-	/**
-	 * Wizard will reconcile changes with existing model.
-	 */
-	public static final String RECONCILE = "reconcile"; //$NON-NLS-1$
-
-	private String fileExtension;
-
-	private String mode;
-
-	public WizardOperationMode(String fileExtension, String mode) {
-		assert fileExtension != null;
-		assertCorrectMode(mode);
-		this.fileExtension = fileExtension;
-		this.mode = mode;
-	}
-
-	public void setMode(String mode) {
-		assertCorrectMode(mode);
-		if (mode == null) {
-			throw new IllegalStateException("Operation mode already detected"); //$NON-NLS-1$
-		}
-		this.mode = mode;
-	}
-
-	public boolean detectReconcile(ResourceLocationProvider rloc) {
-		if (mode == null) {
-			throw new IllegalStateException("Operation mode could be detected only once"); //$NON-NLS-1$
-		}
-		boolean reconcileMode;
-		if (DETECT.equals(mode)) {
-			// enabled when gmfgraph model selected
-			reconcileMode = !rloc.getSelectedURIs(fileExtension, true).isEmpty();
-		} else if (CREATE.equals(mode)) {
-			reconcileMode = false;
-		} else if (RECONCILE.equals(mode)) {
-			reconcileMode = true;
-		} else {
-			throw new IllegalStateException("Illegal mode: " + mode); //$NON-NLS-1$
-		}
-		mode = null; // disable mode update
-		return reconcileMode;
-	}
-
-	public static void assertCorrectMode(String mode) {
-		assert DETECT.equals(mode) || CREATE.equals(mode) || RECONCILE.equals(mode);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/messages.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/messages.properties
deleted file mode 100644
index dfa3a23644b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/messages.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-SimpleModelWizardDomainModelSelectionPageTitle=Domain Model
-SimpleModelWizardDomainModelSelectionPageDesc=Select file with ecore domain model.
-SimpleModelWizardGraphModelSelectionPageTitle=Graphical Definition Model
-SimpleModelWizardGraphModelSelectionPageDesc=Select graphical definition model to update. New diagram elements will be added to this model.
-SimpleModelWizardToolModelSelectionPageTitle=Tooling Definition Model
-SimpleModelWizardToolModelSelectionPageDesc=Select tooling definition model to update. New tools will be added to this model.
-SimpleModelWizardGraphDefinitionPageTitle=Graphical Definition
-SimpleModelWizardGraphDefinitionPageDesc=Specify basic graphical definition of the domain model.
-SimpleModelWizardToolDefinitionPageTitle=Tooling Definition
-SimpleModelWizardToolDefinitionPageDesc=Specify basic tooling definition of the domain model.
-WizardUtilUnableToOpenEditor=Unable to open editor for {0}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/CreateToolDef.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/CreateToolDef.java
deleted file mode 100644
index 15ef3eee120..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/CreateToolDef.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.ToolGroup;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-
-/**
- * Naive, creates new tool each time, don't care about duplicated mappings.
- * @author artem
- */
-@SuppressWarnings("unchecked")
-public class CreateToolDef implements ToolDefSupplier {
-	private final Palette myPalette;
-	private final ToolGroup myNodesGroup;
-	private final ToolGroup myLinksGroup;
-
-	public CreateToolDef(ToolRegistry registry) {
-		assert registry != null;
-		if (registry.getPalette() == null) {
-			myPalette = GMFToolFactory.eINSTANCE.createPalette();
-			myPalette.setTitle("Generated");
-			myPalette.setDescription("Generated");
-			registry.setPalette(myPalette);
-		} else {
-			myPalette = registry.getPalette();
-		}
-		myNodesGroup = GMFToolFactory.eINSTANCE.createToolGroup();
-		myNodesGroup.setDescription("Generated node creation tools");
-		myNodesGroup.setTitle("Nodes");
-		myLinksGroup = GMFToolFactory.eINSTANCE.createToolGroup();
-		myLinksGroup.setDescription("Generated link creation tools");
-		myLinksGroup.setTitle("Links");
-
-		myPalette.getTools().add(myNodesGroup);
-		myPalette.getTools().add(myLinksGroup);
-	}
-
-	public AbstractTool findTool(NodeMapping nm) {
-		CreationTool t = GMFToolFactory.eINSTANCE.createCreationTool();
-		t.setTitle("Create Node " + String.valueOf(1 + myNodesGroup.getTools().size()));
-		t.setSmallIcon(GMFToolFactory.eINSTANCE.createDefaultImage());
-		myNodesGroup.getTools().add(t);
-		return t;
-	}
-
-	public AbstractTool findTool(LinkMapping lm) {
-		CreationTool t = GMFToolFactory.eINSTANCE.createCreationTool();
-		t.setTitle("Create Link " + String.valueOf(1 + myLinksGroup.getTools().size()));
-		t.setSmallIcon(GMFToolFactory.eINSTANCE.createDefaultImage());
-		myLinksGroup.getTools().add(t);
-		return t;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/EntriesPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/EntriesPage.java
deleted file mode 100644
index df93d1795cb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/EntriesPage.java
+++ /dev/null
@@ -1,723 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.List;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.dialogs.ListDialog;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-/**
- * @author artem
- *
- */
-public class EntriesPage extends WizardPage {
-
-	private final WizardInput myHolder;
-
-	public EntriesPage(WizardInput input) {
-		super("entriesPage"); //$NON-NLS-1$
-		this.myHolder = input;
-		setTitle(Messages.mapPageTitle);
-		setDescription(Messages.mapPageDesc);
-	}
-
-	protected Mapping getMapInstance() {
-		return myHolder.getMapping();
-	}
-
-	protected WizardInput getHolder() {
-		return myHolder;
-	}
-
-	public void createControl(Composite parent) {
-		setControl(new PageControl(parent));
-	}
-
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (visible) {
-			((PageControl) getControl()).populate();
-		}
-	}
-
-	private class PageControl extends Composite {
-
-		private Group nodesGroup = null;
-
-		private List nodesList = null;
-
-		private Group linksGroup = null;
-
-		private List linksList = null;
-
-		private Composite detailsPart = null;
-
-		private Group groupStructure = null;
-
-		private Group groupEdit = null;
-
-		private Group groupVisual = null;
-
-		private Composite composite2 = null;
-
-		private Composite composite = null;
-
-		private Button asNodeButton = null;
-
-		private Button asLinkButton = null;
-
-		private Button removeButton = null;
-
-		private Button changeDetailsButton = null;
-
-		private Button restoreButton = null;
-
-		private Group groupConstaints = null;
-
-		private Label specLabel = null;
-
-		private Label initLabel = null;
-
-		private Label diagramElementLabel = null;
-
-		private Label metaElementLabel;
-
-		private Label containmentLabel;
-
-		private Label linkMetaFeatureLabel;
-
-		private boolean isNodeInSelection;
-
-		private NodeReference selectedNode;
-
-		private LinkMapping selectedLink;
-
-		private final ILabelProvider myLabelProvider = new LabelProvider() {
-
-			final EcoreItemProviderAdapterFactory helperFactory = new EcoreItemProviderAdapterFactory();
-
-			public String getText(Object element) {
-				if (element instanceof LinkMapping) {
-					LinkMapping next = (LinkMapping) element;
-					final String linkName;
-					if (next.getDomainMetaElement() == null) {
-						if (next.getLinkMetaFeature() == null) {
-							linkName = Messages.unspecifiedValue;
-						} else {
-							linkName = getLabel(next.getLinkMetaFeature());
-						}
-					} else {
-						linkName = getLabel(next.getDomainMetaElement());
-					}
-					final String dlName = next.getDiagramLink() != null ? next.getDiagramLink().getName() : Messages.unspecifiedValue;
-					final String featureName = next.getContainmentFeature() != null ? next.getContainmentFeature().getName() : Messages.unspecifiedValue;
-					return Messages.bind(Messages.linkLabel, new Object[] { linkName, dlName, featureName });
-				} else {
-					NodeReference next = (NodeReference) element;
-					final String nodeName = next.getChild().getDomainMetaElement() == null ? Messages.unspecifiedValue : getLabel(next.getChild().getDomainMetaElement());
-					final String dnName = next.getChild().getDiagramNode() != null ? next.getChild().getDiagramNode().getName() : Messages.unspecifiedValue;
-					final String featureName;
-					if (next.getContainmentFeature() != null) {
-						featureName = next.getContainmentFeature().getName();
-					} else if (next.getChildrenFeature() != null) {
-						featureName = next.getChildrenFeature().getName();
-					} else {
-						featureName = Messages.unspecifiedValue;
-					}
-					return Messages.bind(Messages.nodeLabel, new Object[] { nodeName, dnName, featureName });
-				}
-			}
-
-			private String getLabel(EObject ecoreElement) {
-				IItemLabelProvider lp = (IItemLabelProvider) helperFactory.adapt((Object) ecoreElement, IItemLabelProvider.class);
-				assert lp != null;
-				return lp.getText(ecoreElement);
-			}
-		};
-
-		private SelectionListener myListSelectionListener = new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				removeButton.setEnabled(true);
-				changeDetailsButton.setEnabled(true);
-				restoreButton.setEnabled(true);
-
-				if (e.widget == nodesList) {
-					handleNodesListSelectionChange();
-					linksList.deselectAll();
-				} else if (e.widget == linksList) {
-					handleLinksListSelectionChange();
-					nodesList.deselectAll();
-				}
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		};
-
-		private FocusListener myListFocusListener = new FocusListener() {
-
-			public void focusGained(FocusEvent e) {
-				if (e.widget == nodesList) {
-					handleNodesListSelectionChange();
-				} else if (e.widget == linksList) {
-					handleLinksListSelectionChange();
-				}
-			}
-
-			public void focusLost(FocusEvent e) {
-				//do nothing
-			}
-
-		};
-
-		public PageControl(Composite parent) {
-			super(parent, SWT.NONE);
-			initialize();
-		}
-
-		public void populate() {
-			populateNodesList();
-			populateLinksList();
-		}
-
-		private void populateNodesList() {
-			String[] items = new String[getMapInstance().getNodes().size()];
-			int i = 0;
-			for (Iterator<?> it = getMapInstance().getNodes().iterator(); it.hasNext(); i++) {
-				items[i] = myLabelProvider.getText(it.next());
-			}
-			nodesList.setItems(items);
-		}
-
-		private void populateLinksList() {
-			String[] items = new String[getMapInstance().getLinks().size()];
-			int i = 0;
-			for (Iterator<?> it = getMapInstance().getLinks().iterator(); it.hasNext(); i++) {
-				items[i] = myLabelProvider.getText(it.next());
-			}
-			linksList.setItems(items);
-		}
-
-		private void initialize() {
-			GridLayout gridLayout = new GridLayout();
-			gridLayout.numColumns = 3;
-			this.setLayout(gridLayout);
-			//			setSize(new org.eclipse.swt.graphics.Point(990,612));
-			createNodesList();
-			createButtonsPane();
-			createLinksList();
-			createDetailsPart();
-		}
-
-		private void createNodesList() {
-			GridData gridData = new GridData();
-			gridData.horizontalAlignment = GridData.FILL;
-			gridData.grabExcessHorizontalSpace = true;
-			gridData.grabExcessVerticalSpace = true;
-			gridData.verticalAlignment = GridData.FILL;
-			nodesGroup = new Group(this, SWT.NONE);
-			nodesGroup.setLayout(new FillLayout());
-			nodesGroup.setLayoutData(gridData);
-			nodesGroup.setText(Messages.mapNodesList);
-			nodesList = new List(nodesGroup, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
-			nodesList.addSelectionListener(myListSelectionListener);
-			nodesList.addFocusListener(myListFocusListener);
-		}
-
-		private void createLinksList() {
-			GridData gridData1 = new GridData();
-			gridData1.grabExcessHorizontalSpace = true;
-			gridData1.horizontalAlignment = GridData.FILL;
-			gridData1.verticalAlignment = GridData.FILL;
-			gridData1.grabExcessVerticalSpace = true;
-			linksGroup = new Group(this, SWT.NONE);
-			linksGroup.setLayout(new FillLayout());
-			linksGroup.setLayoutData(gridData1);
-			linksGroup.setText(Messages.mapLinksList);
-			linksList = new List(linksGroup, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL);
-			linksList.addSelectionListener(myListSelectionListener);
-			linksList.addFocusListener(myListFocusListener);
-		}
-
-		private void createDetailsPart() {
-			GridData gridData3 = new GridData();
-			gridData3.horizontalSpan = 5;
-			gridData3.verticalAlignment = GridData.FILL;
-			gridData3.grabExcessHorizontalSpace = true;
-			gridData3.grabExcessVerticalSpace = false;
-			gridData3.horizontalAlignment = GridData.FILL;
-			detailsPart = new Composite(this, SWT.NONE);
-			detailsPart.setLayoutData(gridData3);
-			GridLayout gridLayout1 = new GridLayout();
-			gridLayout1.numColumns = 7;
-			gridLayout1.makeColumnsEqualWidth = true;
-			detailsPart.setLayout(gridLayout1);
-			createStructureGroup();
-			createEditGroup();
-			changeDetailsButton = new Button(detailsPart, SWT.NONE);
-			changeDetailsButton.setText(Messages.mapChange);
-			changeDetailsButton.addSelectionListener(new SelectionAdapter() {
-
-				public void widgetSelected(SelectionEvent e) {
-					final Object input = isNodeInSelection ? (Object) selectedNode : (Object) selectedLink;
-					ChangePropertiesDialog changePropertiesDialog = new ChangePropertiesDialog(getShell(), new Object[] { input });
-					int result = changePropertiesDialog.open();
-					if (result == Window.OK) {
-						// TODO: save values to the model here
-					}
-				}
-			});
-			GridData gridData8 = new GridData();
-			gridData8.grabExcessHorizontalSpace = true;
-			gridData8.verticalAlignment = GridData.CENTER;
-			gridData8.verticalSpan = 2;
-			gridData8.horizontalAlignment = GridData.CENTER;
-			changeDetailsButton.setLayoutData(gridData8);
-			createVisualGroup();
-			createConstraintsGroup();
-		}
-
-		private void createStructureGroup() {
-			groupStructure = new Group(detailsPart, SWT.SHADOW_OUT);
-			groupStructure.setText(Messages.groupStructure);
-			groupStructure.setLayoutData(newDetailGroupConstraint());
-			groupStructure.setLayout(newDetailGroupLayout());
-			Label l = new Label(groupStructure, SWT.NONE);
-			l.setText(Messages.labelElement);
-			metaElementLabel = new Label(groupStructure, SWT.NONE);
-			metaElementLabel.setLayoutData(newDetailLabelConstraint());
-			l = new Label(groupStructure, SWT.NONE);
-			l.setText(Messages.labelContainment);
-			containmentLabel = new Label(groupStructure, SWT.NONE);
-			containmentLabel.setLayoutData(newDetailLabelConstraint());
-			l = new Label(groupStructure, SWT.NONE);
-			l.setText(Messages.labelTargetFeature);
-			linkMetaFeatureLabel = new Label(groupStructure, SWT.NONE);
-			linkMetaFeatureLabel.setLayoutData(newDetailLabelConstraint());
-
-		}
-
-		private void createEditGroup() {
-			groupEdit = new Group(detailsPart, SWT.NONE);
-			groupEdit.setText(Messages.groupEdit);
-			groupEdit.setLayout(newDetailGroupLayout());
-			groupEdit.setLayoutData(newDetailGroupConstraint());
-		}
-
-		private void createVisualGroup() {
-			groupVisual = new Group(detailsPart, SWT.NONE);
-			groupVisual.setText(Messages.groupVisual);
-			groupVisual.setLayoutData(newDetailGroupConstraint());
-			groupVisual.setLayout(newDetailGroupLayout());
-			Label l = new Label(groupVisual, SWT.NONE);
-			l.setText(Messages.labelDiagramElement);
-			diagramElementLabel = new Label(groupVisual, SWT.NONE);
-			diagramElementLabel.setLayoutData(newDetailLabelConstraint());
-		}
-
-		private void createButtonsPane() {
-			GridData gridData2 = new GridData();
-			gridData2.horizontalAlignment = GridData.FILL;
-			gridData2.verticalAlignment = GridData.CENTER;
-			composite2 = new Composite(this, SWT.NONE);
-			composite2.setLayout(new FillLayout());
-			composite2.setLayoutData(gridData2);
-			createComposite();
-		}
-
-		private void createComposite() {
-			RowLayout rowLayout = new RowLayout();
-			rowLayout.type = org.eclipse.swt.SWT.VERTICAL;
-			rowLayout.justify = true;
-			rowLayout.marginHeight = 0;
-			rowLayout.marginWidth = 0;
-			rowLayout.pack = false;
-			rowLayout.spacing = 6;
-			rowLayout.marginLeft = 10;
-			rowLayout.marginRight = 10;
-			rowLayout.fill = false;
-			composite = new Composite(composite2, SWT.NONE);
-			composite.setLayout(rowLayout);
-			asNodeButton = new Button(composite, SWT.NONE);
-			asNodeButton.setText(Messages.mapAsNode);
-			asNodeButton.setEnabled(false);
-			asNodeButton.addListener(SWT.Selection, new Listener() {
-
-				public void handleEvent(Event event) {
-					TopNodeReference tnr = GMFMapFactory.eINSTANCE.createTopNodeReference();
-					NodeMapping nm = GMFMapFactory.eINSTANCE.createNodeMapping();
-					nm.setDomainMetaElement(selectedLink.getDomainMetaElement());
-					nm.setDomainInitializer(selectedLink.getDomainInitializer());
-					nm.setDomainSpecialization(selectedLink.getDomainSpecialization());
-					nm.setTool(selectedLink.getTool());
-					nm.setContextMenu(selectedLink.getContextMenu());
-					nm.setAppearanceStyle(selectedLink.getAppearanceStyle());
-					tnr.setContainmentFeature(selectedLink.getContainmentFeature());
-					tnr.setOwnedChild(nm);
-					getMapInstance().getNodes().add(tnr);
-					getMapInstance().getLinks().remove(selectedLink);
-					linksList.remove(linksList.getSelectionIndex());
-					nodesList.add(myLabelProvider.getText(tnr));
-					nodesList.setSelection(nodesList.getItemCount() - 1);
-					handleNodesListSelectionChange();
-				}
-			});
-			asLinkButton = new Button(composite, SWT.NONE);
-			asLinkButton.setText(Messages.mapAsLink);
-			asLinkButton.setEnabled(false);
-			asLinkButton.addListener(SWT.Selection, new Listener() {
-
-				public void handleEvent(Event event) {
-					LinkMapping lm = GMFMapFactory.eINSTANCE.createLinkMapping();
-					NodeMapping nodeMapping = selectedNode.getChild();
-					lm.setDomainMetaElement(nodeMapping.getDomainMetaElement());
-					lm.setContainmentFeature(selectedNode.getContainmentFeature());
-					lm.setDomainInitializer(nodeMapping.getDomainInitializer());
-					lm.setDomainSpecialization(nodeMapping.getDomainSpecialization());
-					lm.setTool(nodeMapping.getTool());
-					lm.setContextMenu(nodeMapping.getContextMenu());
-					lm.setAppearanceStyle(nodeMapping.getAppearanceStyle());
-					getMapInstance().getLinks().add(lm);
-					getMapInstance().getNodes().remove(selectedNode);
-					nodesList.remove(nodesList.getSelectionIndex());
-					linksList.add(myLabelProvider.getText(lm));
-					linksList.setSelection(linksList.getItemCount() - 1);
-					handleLinksListSelectionChange();
-				}
-			});
-			removeButton = new Button(composite, SWT.NONE);
-			removeButton.setText(Messages.mapRemove);
-			removeButton.setEnabled(false);
-			removeButton.addListener(SWT.Selection, new Listener() {
-
-				public void handleEvent(Event event) {
-					if (nodesList.getSelectionIndex() != -1) {
-						int i = nodesList.getSelectionIndex();
-						nodesList.remove(i);
-						getMapInstance().getNodes().remove(i);
-						if (i == nodesList.getItemCount() && i > 0) {
-							i--;
-						}
-						nodesList.setSelection(i);
-						if (nodesList.getItemCount() == 0) {
-							asLinkButton.setEnabled(false);
-							removeButton.setEnabled(false);
-							changeDetailsButton.setEnabled(false);
-						} else {
-							handleNodesListSelectionChange();
-						}
-					}
-					if (linksList.getSelectionIndex() != -1) {
-						int i = linksList.getSelectionIndex();
-						linksList.remove(i);
-						getMapInstance().getLinks().remove(i);
-						if (i == linksList.getItemCount() && i > 0) {
-							i--;
-						}
-						linksList.setSelection(i);
-						if (linksList.getItemCount() == 0) {
-							asNodeButton.setEnabled(false);
-							removeButton.setEnabled(false);
-							changeDetailsButton.setEnabled(false);
-						} else {
-							handleLinksListSelectionChange();
-						}
-					}
-				}
-			});
-			restoreButton = new Button(composite, SWT.NONE);
-			restoreButton.setText(Messages.mapRestore);
-			restoreButton.setEnabled(false);
-			restoreButton.addListener(SWT.Selection, new Listener() {
-
-				public void handleEvent(Event event) {
-					ListDialog dialog = new ListDialog(getShell());
-					dialog.setTitle(isNodeInSelection ? Messages.mapRestoreNode : Messages.mapRestoreLink);
-					dialog.setMessage(Messages.mapRestoreText);
-					dialog.setContentProvider(new IStructuredContentProvider() {
-
-						public Object[] getElements(Object inputElement) {
-							return (Object[]) inputElement;
-						}
-
-						public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-						}
-
-						public void dispose() {
-						}
-					});
-					dialog.setLabelProvider(PageControl.this.myLabelProvider);
-					if (isNodeInSelection) {
-						dialog.setInput(getHolder().nodeCandidates());
-					} else {
-						dialog.setInput(getHolder().linkCandidates());
-					}
-					if (dialog.open() == ListDialog.OK) {
-						if (isNodeInSelection) {
-							EList<TopNodeReference> nodes = getMapInstance().getNodes();
-
-							Set<EClass> usedClassSet = new HashSet<EClass>();
-							for (TopNodeReference nextTopNodeReference : nodes) {
-								usedClassSet.add(nextTopNodeReference.getChild().getDomainMetaElement());
-							}
-
-							for (Object nextObject : dialog.getResult()) {
-								TopNodeReference nextNodeReference = (TopNodeReference) nextObject;
-								if (!usedClassSet.contains((nextNodeReference.getChild().getDomainMetaElement()))) {
-									nodes.add(nextNodeReference);
-								}
-							}
-
-							nodesList.removeAll();
-							populateNodesList();
-						} else {
-							EList<LinkMapping> links = getMapInstance().getLinks();
-
-							Set<EClass> usedClassSet = new HashSet<EClass>();
-							for (LinkMapping nextLinkMapping : links) {
-								usedClassSet.add(nextLinkMapping.getDomainMetaElement());
-							}
-
-							for (Object nextObject : dialog.getResult()) {
-								LinkMapping nextLinkMapping = (LinkMapping) nextObject;
-								if (!usedClassSet.contains((nextLinkMapping.getDomainMetaElement()))) {
-									links.add(nextLinkMapping);
-								}
-							}
-
-							linksList.removeAll();
-							populateLinksList();
-						}
-					}
-				}
-			});
-		}
-
-		private void createConstraintsGroup() {
-			groupConstaints = new Group(detailsPart, SWT.NONE);
-			groupConstaints.setText(Messages.groupConstraints);
-			groupConstaints.setLayout(newDetailGroupLayout());
-			groupConstaints.setLayoutData(newDetailGroupConstraint());
-
-			Label label = new Label(groupConstaints, SWT.NONE);
-			label.setText(Messages.labelSpecialization);
-			specLabel = new Label(groupConstaints, SWT.NONE);
-			specLabel.setLayoutData(newDetailLabelConstraint());
-
-			label = new Label(groupConstaints, SWT.NONE);
-			label.setText(Messages.labelInitializer);
-			initLabel = new Label(groupConstaints, SWT.NONE);
-			initLabel.setLayoutData(newDetailLabelConstraint());
-			// TODO link creation constraints
-		}
-
-		private GridLayout newDetailGroupLayout() {
-			GridLayout gridLayout = new GridLayout();
-			gridLayout.numColumns = 3;
-			gridLayout.makeColumnsEqualWidth = true;
-			return gridLayout;
-		}
-
-		private GridData newDetailGroupConstraint() {
-			GridData groupGridData = new GridData();
-			groupGridData.horizontalAlignment = GridData.FILL;
-			groupGridData.grabExcessHorizontalSpace = true;
-			groupGridData.grabExcessVerticalSpace = true;
-			groupGridData.horizontalSpan = 3;
-			groupGridData.verticalAlignment = GridData.FILL;
-			return groupGridData;
-		}
-
-		private GridData newDetailLabelConstraint() {
-			GridData labelGridData = new GridData();
-			labelGridData.horizontalSpan = 2;
-			labelGridData.grabExcessHorizontalSpace = true;
-			labelGridData.horizontalAlignment = GridData.FILL;
-			return labelGridData;
-		}
-
-		private void refreshCommonDetails(MappingEntry selectedEntry) {
-			affix(metaElementLabel, selectedEntry.getDomainMetaElement());
-			refreshDomainSpecialization(selectedEntry);
-			refreshDomainInitializer(selectedEntry);
-		}
-
-		private void refreshDomainSpecialization(MappingEntry selectedEntry) {
-			if (selectedEntry.getDomainSpecialization() == null) {
-				specLabel.setText("");
-				return;
-			}
-			specLabel.setText(selectedEntry.getDomainSpecialization().getBody());
-		}
-
-		private void refreshDomainInitializer(MappingEntry selectedEntry) {
-			if (selectedEntry.getDomainInitializer() == null || false == selectedEntry.getDomainInitializer() instanceof FeatureSeqInitializer) {
-				initLabel.setText("");
-				return;
-			}
-			FeatureSeqInitializer fsi = (FeatureSeqInitializer) selectedEntry.getDomainInitializer();
-			StringBuilder sb = new StringBuilder();
-			for (FeatureInitializer next : fsi.getInitializers()) {
-				sb.append(next.getFeature().getName());
-				sb.append("; ");
-			}
-			initLabel.setText(sb.toString());
-		}
-
-		private void affix(Label l, ENamedElement el) {
-			if (el != null) {
-				l.setText(el.getName());
-			} else {
-				l.setText("");
-			}
-		}
-
-		private void refreshNodeDetails() {
-			refreshCommonDetails(selectedNode.getChild());
-			NodeMapping m = selectedNode.getChild();
-			affix(containmentLabel, selectedNode.getContainmentFeature());
-			if (m.getDiagramNode() != null) {
-				diagramElementLabel.setText(m.getDiagramNode().getName());
-			} else {
-				diagramElementLabel.setText("");
-			}
-			linkMetaFeatureLabel.setText("");
-		}
-
-		private void refreshLinkDetails() {
-			refreshCommonDetails(selectedLink);
-			affix(containmentLabel, selectedLink.getContainmentFeature());
-			LinkMapping l = selectedLink;
-			if (l.getDiagramLink() != null) {
-				diagramElementLabel.setText(l.getDiagramLink().getName());
-			} else {
-				diagramElementLabel.setText("");
-			}
-			affix(linkMetaFeatureLabel, l.getLinkMetaFeature());
-		}
-
-		void handleNodesListSelectionChange() {
-			asNodeButton.setEnabled(false);
-
-			int selectionIndex = nodesList.getSelectionIndex();
-			if (selectionIndex != -1) {
-				selectedNode = getMapInstance().getNodes().get(selectionIndex);
-				asLinkButton.setEnabled(selectedNode.getChild().getDomainMetaElement() != null);
-				refreshNodeDetails();
-			}
-
-			isNodeInSelection = true;
-		}
-
-		void handleLinksListSelectionChange() {
-			asLinkButton.setEnabled(false);
-
-			int selectionIndex = linksList.getSelectionIndex();
-			if (selectionIndex != -1) {
-				selectedLink = getMapInstance().getLinks().get(selectionIndex);
-				asNodeButton.setEnabled(selectedLink.getDomainMetaElement() != null);
-				refreshLinkDetails();
-			}
-
-			isNodeInSelection = false;
-		}
-	}
-
-	private class ChangePropertiesDialog extends Dialog {
-
-		private Object[] mySelection;
-
-		protected ChangePropertiesDialog(Shell parentShell, Object[] selection) {
-			super(parentShell);
-			setShellStyle(getShellStyle() | SWT.RESIZE);
-			mySelection = selection;
-		}
-
-		protected Control createDialogArea(Composite parent) {
-			Composite composite = (Composite) super.createDialogArea(parent);
-			Composite frame = new Composite(composite, SWT.BORDER);
-			GridData layoutData = new GridData(GridData.FILL_BOTH);
-			layoutData.heightHint = 300;
-			layoutData.widthHint = 400;
-			frame.setLayoutData(layoutData);
-			GridLayout layout = new GridLayout();
-			layout.marginHeight = 0;
-			layout.marginWidth = 0;
-			frame.setLayout(layout);
-
-			PropertySheetPage propertyPage = new PropertySheetPage();
-			propertyPage.createControl(frame);
-			propertyPage.setPropertySourceProvider(new AdapterFactoryContentProvider(myHolder.getAdapterFactory()));
-			propertyPage.selectionChanged(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().getActivePart(), new StructuredSelection(mySelection));
-			propertyPage.getControl().setLayoutData(new GridData(GridData.FILL_BOTH));
-			return composite;
-		}
-
-		protected void createButtonsForButtonBar(Composite parent) {
-			createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL, true);
-		}
-
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/GraphDefLookup.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/GraphDefLookup.java
deleted file mode 100644
index 864f87215f4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/GraphDefLookup.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import java.util.LinkedList;
-
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-
-/**
- * FIXME lookup idea doesn't seem to apply well to obtain canvas elements for a mapping element, e.g. when we need to pick a Node
- * for a NodeMapping with few LabelMappings
- * @author artem
- */
-public class GraphDefLookup {
-
-	private final Canvas myCanvas;
-
-	public GraphDefLookup(Canvas canvas) {
-		myCanvas = canvas;
-	}
-
-	public Node findSuitableNode(NodeMapping nm) {
-		if (myCanvas.getNodes().isEmpty()) {
-			return null;
-		}
-		LinkedList<Node> candidateNodes = new LinkedList<Node>();
-		if (nm.getDomainMetaElement() != null) {
-			String name = nm.getDomainMetaElement().getName();
-			for (Node n : myCanvas.getNodes()) {
-				if (n.getName() != null && n.getName().indexOf(name) >= 0) {
-					candidateNodes.add(n);
-				}
-			}
-		}
-		if (candidateNodes.isEmpty()) {
-			candidateNodes.addAll(myCanvas.getNodes());
-		}
-		if (candidateNodes.size() == 1) {
-			return candidateNodes.getFirst();
-		}
-		if (nm.getLabelMappings().isEmpty()) {
-L1:			for (Node n : candidateNodes) {
-				for (DiagramLabel dl : myCanvas.getLabels()) {
-					if (n.getFigure().getAccessors().contains(dl.getAccessor())) {
-						// one of node's accessors is referenced for a label, however, 
-						// mapping being processed doesn't need any, hence go to next node
-						continue L1;
-					}
-				}
-				return n;
-			}
-		} else {
-			Node candidateWithLessLabels= null, candidateWithMoreLabels = null;
-			for (Node n : candidateNodes) {
-				if (n.getFigure().getAccessors().size() >= nm.getLabelMappings().size()) {
-					LinkedList<DiagramLabel> labels = collectAccessingLabels(n);
-					if (labels.isEmpty()) {
-						continue;
-					}
-					// perfect match, same number of labels as labelMappings
-					if (labels.size() == nm.getLabelMappings().size()) {
-						return n;
-					}
-					if (labels.size() > nm.getLabelMappings().size() && candidateWithMoreLabels == null) {
-						candidateWithMoreLabels = n;
-					}
-					if (labels.size() < nm.getLabelMappings().size() && candidateWithLessLabels == null) {
-						candidateWithLessLabels = n;
-					}
-				}
-			}
-			if (candidateWithMoreLabels != null) {
-				return candidateWithMoreLabels;
-			}
-			if (candidateWithLessLabels != null && findFloatingLabel() != null) {
-				// take the one with less labels *only* if there's spare descriptor for a floating label
-				return candidateWithLessLabels;
-			}
-			// else - fall through, to get any
-		}
-		return candidateNodes.get(0); // take any
-	}
-
-	// canvas.labels->select(l | n.figure.accessors.contains(l))
-	private LinkedList<DiagramLabel> collectAccessingLabels(Node n) {
-		LinkedList<DiagramLabel> labels = new LinkedList<DiagramLabel>();
-		for (DiagramLabel l : myCanvas.getLabels()) {
-			if (l.getFigure() == n.getFigure() && n.getFigure().getAccessors().contains(l.getAccessor())) {
-				labels.add(l);
-			}
-		}
-		return labels;
-	}
-	
-	private DiagramLabel findFloatingLabel() {
-		for (DiagramLabel dl : myCanvas.getLabels()) {
-			if (dl.getAccessor() != null) {
-				continue; // XXX actually, not sure if a label can't use accessor, even if standalone
-			}
-			// XXX again, not sure if next check is reasonable, idea is to avoid labels that share a figure with some node
-			for (Node n : myCanvas.getNodes()) {
-				if (n.getFigure() == dl.getFigure()) {
-					continue;
-				}
-			}
-			return dl;
-		}
-		return null;
-	}
-	
-	public void assignLabels(NodeMapping nm, Node n) {
-		if (n == null || n.getFigure().getAccessors().isEmpty() || nm.getLabelMappings().isEmpty()) {
-			return;
-		}
-		LinkedList<DiagramLabel> labels = collectAccessingLabels(n);
-		for(int i = 0; i < nm.getLabelMappings().size(); i++) {
-			DiagramLabel l = !labels.isEmpty() ? labels.removeFirst() : findFloatingLabel();
-			nm.getLabelMappings().get(i++).setDiagramLabel(l);
-		}
-	}
-
-	public Connection findSuitableLink(LinkMapping lm) {
-		if (myCanvas.getConnections().isEmpty()) {
-			return null;
-		}
-		String name = null;
-		if (lm.getDomainMetaElement() != null) {
-			name = lm.getDomainMetaElement().getName();
-		} else if (lm.getLinkMetaFeature() != null) {
-			name = lm.getLinkMetaFeature().getEContainingClass().getName();
-		}
-		for (Connection c : myCanvas.getConnections()) {
-			if (c.getName() != null && c.getName().indexOf(name) >= 0) {
-				return c;
-			}
-		}
-		return myCanvas.getConnections().get(0);
-	}
-
-	public void assignLabels(LinkMapping lm, Connection c) {
-		if (c == null || lm.getLabelMappings().isEmpty()) {
-			return;
-		}
-		DiagramLabel floating = findFloatingLabel();
-		for (int i = 0; i < lm.getLabelMappings().size(); i++) {
-			lm.getLabelMappings().get(i).setDiagramLabel(floating);
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/MapDefFeeder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/MapDefFeeder.java
deleted file mode 100644
index 6b18419f651..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/MapDefFeeder.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.UniqueEList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy.AccessibleClassNodeStrategy;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy.CompositeStrategy;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy.Hierarchy;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy.LeafNodeStrategy;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy.Strategy;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-
-/**
- * @author artem
- */
-public class MapDefFeeder {
-
-	private final GraphDefLookup myGraphDefLookup;
-	private final ToolDefSupplier myToolDefLookup;
-
-	private Hierarchy myHierarchy;
-	private final WizardInput myInputHolder;
-	private List<EClass> myNodeCandidates;
-	private List<EObject> myLinkCandidates;
-
-	public MapDefFeeder(WizardInput holder, ToolDefSupplier toolDefSupplier) {
-		assert holder != null;
-		myInputHolder = holder;
-		myGraphDefLookup = new GraphDefLookup(holder.getCanvasDef());
-		myToolDefLookup = toolDefSupplier;
-	}
-
-	protected final Mapping getMapping() {
-		return myInputHolder.getMapping();
-	}
-
-	public void feedDefaultMapping() {
-		final Hierarchy hierarchy = getHierarchy();
-		myNodeCandidates = new UniqueEList<EClass>(hierarchy.getAllClasses());
-		createNodeFilter().filter(myNodeCandidates, hierarchy);
-
-		myLinkCandidates = new LinkedList<EObject>();
-		createLinkFilter().filter(myLinkCandidates, hierarchy);
-
-		myLinkCandidates.addAll(hierarchy.getAccessibleReferences(myNodeCandidates.iterator()));
-
-		getMapping().getNodes().clear();
-		getMapping().getNodes().addAll(nodesFrom(myNodeCandidates));
-		getMapping().getLinks().clear();
-		getMapping().getLinks().addAll(linksFrom(myLinkCandidates));
-		getMapping().getDiagram().setPalette(myInputHolder.getToolDef().getPalette());
-	}
-
-	private Hierarchy getHierarchy() {
-		if (myHierarchy == null) {
-			myHierarchy = new Hierarchy(getMapping().getDiagram().getDomainMetaElement());
-			myHierarchy.collect();
-		}
-		return myHierarchy;
-	}
-
-	@SuppressWarnings("unchecked")
-	private Strategy<EClass> createNodeFilter() {
-		// TODO add UI and instantiate strategies from descriptors
-		return new CompositeStrategy<EClass>(new AccessibleClassNodeStrategy(), new LeafNodeStrategy());
-	}
-
-	private Strategy<EObject> createLinkFilter() {
-		//MergingStrategy?
-		// default: Accessible, Leaf
-		return new Strategy<EObject>() {
-			public String getID() {
-				throw new UnsupportedOperationException("QuickHack");
-			}
-			public void filter(Collection<EObject> soFar, Hierarchy hierarchy) {
-				Set<EClass> linkCandidates = new HashSet<EClass>(hierarchy.getAccessibleLinkClasses());
-				for (Iterator<EClass> iter = linkCandidates.iterator(); iter.hasNext();) {
-					EClass element = iter.next();
-					if (!hierarchy.isLeaf(element)) {
-						iter.remove();
-					}
-				}
-				soFar.clear();
-				soFar.addAll(linkCandidates);
-			}
-		};
-	}
-
-	private List<TopNodeReference> nodesFrom(List<EClass> candidates) {
-		ArrayList<TopNodeReference> rv = new ArrayList<TopNodeReference>(candidates.size());
-		for (EClass eClass : candidates) {
-			NodeMapping nm = GMFMapFactory.eINSTANCE.createNodeMapping();
-			nm.setDomainMetaElement(eClass); 
-			addEditFeature(nm, eClass);
-			nm.setDiagramNode(myGraphDefLookup.findSuitableNode(nm));
-			myGraphDefLookup.assignLabels(nm, nm.getDiagramNode());
-			nm.setTool(myToolDefLookup.findTool(nm));
-			TopNodeReference tnr = GMFMapFactory.eINSTANCE.createTopNodeReference();
-			tnr.setContainmentFeature(getHierarchy().nodeBackRef(eClass)); // FIXME [containment] !!!
-			tnr.setOwnedChild(nm);
-			rv.add(tnr);
-		}
-		return rv;
-	}
-
-	private List<LinkMapping> linksFrom(List<EObject> candidates) {
-		ArrayList<LinkMapping> rv = new ArrayList<LinkMapping>(candidates.size());
-		for (EObject next : candidates) {
-			LinkMapping lm = GMFMapFactory.eINSTANCE.createLinkMapping();
-			if (next instanceof EClass) {
-				EClass eClass = (EClass) next;
-				lm.setDomainMetaElement(eClass);
-				lm.setContainmentFeature(getHierarchy().linkBackRef(eClass));
-				addEditFeature(lm, eClass);
-				lm.setLinkMetaFeature(getHierarchy().getLinkFeature(eClass));
-			} else {
-				lm.setLinkMetaFeature((EReference) next);
-			}
-			lm.setDiagramLink(myGraphDefLookup.findSuitableLink(lm));
-			myGraphDefLookup.assignLabels(lm, lm.getDiagramLink());
-			lm.setTool(myToolDefLookup.findTool(lm));
-			rv.add(lm);
-		}
-		return rv;
-	}
-
-	private void addEditFeature(MappingEntry me, EClass class1) {
-		for (EAttribute n : class1.getEAllAttributes()) {
-			// EDataType at = n.getEAttributeType();
-			// at != null && at.getEPackage() != null && at.getEPackage().getNsURI().equals(EcorePackage.eNS_URI) && at.getName().equals(EcorePackage.eINSTANCE.getEString().getName())
-			if (EcorePackage.eINSTANCE.getEString().equals(n.getEType())) {
-				FeatureLabelMapping lm = GMFMapFactory.eINSTANCE.createFeatureLabelMapping();
-				lm.getFeatures().add(n);
-				me.getLabelMappings().add(lm);
-				return;
-			}
-		}
-	}
-
-	public NodeReference[] getInitialNodes() {
-		return nodesFrom(myNodeCandidates).toArray(new NodeReference[0]);
-	}
-
-	public LinkMapping[] getInitialLinks() {
-		return linksFrom(myLinkCandidates).toArray(new LinkMapping[0]);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/Messages.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/Messages.java
deleted file mode 100644
index d551616d30c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/Messages.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author artem
- */
-public class Messages extends NLS {
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.messages"; //$NON-NLS-1$
-
-	private Messages() {
-	}
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	public static String wizardTitle;
-	public static String newPageTitle;
-	public static String newPageDesc;
-
-	public static String inputPageTitle;
-	public static String inputPageDesc;
-	public static String inputNeedDomain;
-	public static String inputNeedCanvas;
-	public static String inputNeedToolDef;
-
-	public static String ecoreSelector;
-	public static String graphdefSelector;
-	public static String tooldefSelector;
-
-	public static String uriSelectorBrowse;
-	public static String uriSelectorLoad;
-	public static String uriSelectorWorkspace;
-	public static String uriSelectorFilesystem;
-	public static String useECore;
-	public static String useBasic;
-	public static String createBlank;
-
-	public static String rootPageTitle;
-	public static String rootPageDesc;
-	public static String rootPageGroupTitle;
-	public static String rootPageHint;
-
-	public static String mapPageTitle;
-	public static String mapPageDesc;
-	public static String nodeLabel;
-	public static String linkLabel;
-	public static String unspecifiedValue;
-	public static String mapChange;
-	public static String mapAsNode;
-	public static String mapAsLink;
-	public static String mapRemove;
-	public static String mapRestore;
-	public static String mapRestoreNode;
-	public static String mapRestoreLink;
-	public static String mapRestoreText;
-	public static String mapNodesList;
-	public static String mapLinksList;
-	public static String groupStructure;
-	public static String groupEdit;
-	public static String groupVisual;
-	public static String groupConstraints;
-	public static String labelSpecialization;
-	public static String labelInitializer;
-	public static String labelDiagramElement;
-	public static String labelElement;
-	public static String labelContainment;
-	public static String labelTargetFeature;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/NewMapFileCreationPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/NewMapFileCreationPage.java
deleted file mode 100644
index 4120043e949..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/NewMapFileCreationPage.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Borland Software Corporation - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.WizardUtil;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-
-public class NewMapFileCreationPage extends WizardNewFileCreationPage {
-	private final WizardInput myInputHolder;
-
-	public NewMapFileCreationPage(IStructuredSelection selection, WizardInput inputHolder) {
-		super("newMapFileCreationPage", selection); //$NON-NLS-1$
-		myInputHolder = inputHolder;
-		setTitle(Messages.newPageTitle);
-		setDescription(Messages.newPageDesc);
-		setFileName(WizardUtil.getDefaultFileName(selection, "Theirs", "gmfmap")); //$NON-NLS-1$ //$NON-NLS-2$
-	}
-
-	protected boolean validatePage() {
-		if (super.validatePage()) {
-			// XXX don't like this - each page validation results in new file set to holder
-			// rather need some end-of-page notification
-			IPath p = getContainerFullPath().append(getFileName());
-			myInputHolder.setMappingFile(ResourcesPlugin.getWorkspace().getRoot().getFile(p));
-			return true;
-		}
-		return false;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ShowDashboardPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ShowDashboardPage.java
deleted file mode 100644
index 5fc8d0ced4f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ShowDashboardPage.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * @author dstadnik
- */
-public class ShowDashboardPage extends WizardPage {
-
-	private boolean showDashboard;
-
-	private Button showDashboardCheckbox;
-
-	public ShowDashboardPage(String pageId, boolean showDashboard) {
-		super(pageId);
-		this.showDashboard = showDashboard;
-	}
-
-	public void createControl(Composite parent) {
-		Composite composite = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout();
-		layout.numColumns = 1;
-		layout.verticalSpacing = 12;
-		composite.setLayout(layout);
-		composite.setLayoutData(createFillData());
-
-		showDashboardCheckbox = new Button(composite, SWT.CHECK);
-		showDashboardCheckbox.setText(Plugin.getBundleString("showDashboardPage.text")); //$NON-NLS-1$
-		showDashboardCheckbox.setLayoutData(createHrzData());
-		showDashboardCheckbox.setSelection(showDashboard);
-		showDashboardCheckbox.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				showDashboard = showDashboardCheckbox.getSelection();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-
-		Composite filler = new Composite(composite, SWT.NONE);
-		filler.setLayoutData(createFillData());
-		setControl(showDashboardCheckbox);
-	}
-
-	protected GridData createHrzData() {
-		GridData data = new GridData();
-		data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = true;
-		return data;
-	}
-
-	protected GridData createFillData() {
-		GridData data = new GridData();
-		data.horizontalAlignment = SWT.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.verticalAlignment = SWT.FILL;
-		data.grabExcessVerticalSpace = true;
-		return data;
-	}
-
-	public boolean isShowDashboard() {
-		return showDashboard;
-	}
-
-	public void setShowDashboard(boolean showDashboard) {
-		this.showDashboard = showDashboard;
-		if (showDashboardCheckbox != null && !showDashboardCheckbox.isDisposed()) {
-			showDashboardCheckbox.setSelection(showDashboard);
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ToolDefLookup.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ToolDefLookup.java
deleted file mode 100644
index 01d8f9b8ad1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ToolDefLookup.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import java.util.List;
-
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.ToolContainer;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-
-/**
- * @author artem
- */
-public class ToolDefLookup implements ToolDefSupplier {
-	private final ToolRegistry myRegistry;
-	private final ToolContainer myNodeTools;
-	private final ToolContainer myLinkTools;
-	private final boolean sameToolContainer; // basically, myNodeTools == myLinkTools
-	private int myNodeUseIndex = 0;
-	private int myLinkUseIndex = 0;
-	
-
-	public ToolDefLookup(ToolRegistry registry) {
-		assert registry != null && registry.getPalette() != null;
-		myRegistry = registry;
-		final List<AbstractTool> tools = myRegistry.getPalette().getTools();
-		int i = tools.size();
-		boolean found = false;
-		while (!found && i > 0) {
-			i--;
-			if (tools.get(i) instanceof ToolContainer) {
-				ToolContainer t = (ToolContainer) tools.get(i);
-				found = t.getTools().size() > 0;
-			}
-		}
-		if (!found) {
-			myNodeTools = myLinkTools = myRegistry.getPalette();
-			sameToolContainer = true;
-			return;
-		}
-		myLinkTools = (ToolContainer) tools.get(i); 
-		found = false;
-		while (i > 0 && !found) {
-			i--;
-			if (tools.get(i) instanceof ToolContainer) {
-				ToolContainer t = (ToolContainer) tools.get(i);
-				found = t.getTools().size() > 0;
-			}
-		}
-		if (!found) {
-			myNodeTools = myLinkTools;
-			sameToolContainer = true;
-		} else {
-			sameToolContainer = false;
-			myNodeTools = (ToolContainer) tools.get(i);
-		}
-	}
-
-	public AbstractTool findTool(NodeMapping nm) {
-		final int nodeToolsLen = myNodeTools.getTools().size();
-		for (int i = 0; i < nodeToolsLen; i++) {
-			Object next = myNodeTools.getTools().get((myNodeUseIndex + i) % nodeToolsLen);
-			if (isTool(next)) {
-				myNodeUseIndex = (myNodeUseIndex + i + 1) % nodeToolsLen;
-				if (sameToolContainer) {
-					myLinkUseIndex = myNodeUseIndex;
-				}
-				return (AbstractTool) next;
-			}
-		}
-		return null;
-	}
-
-	public AbstractTool findTool(LinkMapping lm) {
-		final int linkToolsLen = myLinkTools.getTools().size();
-		for (int i = 0; i < linkToolsLen; i++) {
-			Object next = myLinkTools.getTools().get((myLinkUseIndex + i) % linkToolsLen);
-			if (isTool(next)) {
-				myLinkUseIndex = (myLinkUseIndex + i + 1) % linkToolsLen;
-				if (sameToolContainer) {
-					myNodeUseIndex = myLinkUseIndex;
-				}
-				return (AbstractTool) next;
-			}
-		}
-		return null;
-	}
-
-	private boolean isTool(Object next) {
-		return next instanceof CreationTool;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ToolDefSupplier.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ToolDefSupplier.java
deleted file mode 100644
index 98a636f5c52..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/ToolDefSupplier.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-
-/**
- * @author artem
- */
-public interface ToolDefSupplier {
-
-	AbstractTool findTool(NodeMapping nm);
-	AbstractTool findTool(LinkMapping lm);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/WizardInput.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/WizardInput.java
deleted file mode 100644
index a6c613d42b0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/WizardInput.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphItemProviderAdapterFactory;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.provider.GMFMapItemProviderAdapterFactory;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-import org.eclipse.papyrus.gmf.tooldef.provider.GMFToolItemProviderAdapterFactory;
-
-/**
- * @author artem
- */
-public abstract class WizardInput {
-
-	public static final String TOOLDEF_FILE_EXT = "gmftool"; //$NON-NLS-1$
-	public static final String GRAPHDEF_FILE_EXT = "gmfgraph"; //$NON-NLS-1$
-	public static final String ECORE_FILE_EXT = "ecore"; //$NON-NLS-1$
-
-	private Mapping mapInstance;
-	private EditingDomain myEditingDomain;
-	private AdapterFactory myAdapterFactory;
-	private IFile myResultFile;
-	private MapDefFeeder myFeeder;
-
-	public AdapterFactory getAdapterFactory() {
-		if (myAdapterFactory == null) {
-			List<AdapterFactory> factories = new ArrayList<AdapterFactory>();
-			factories.add(new ResourceItemProviderAdapterFactory());
-			factories.add(new GMFMapItemProviderAdapterFactory());
-			factories.add(new GMFGraphItemProviderAdapterFactory());
-			factories.add(new GMFToolItemProviderAdapterFactory());
-			factories.add(new ReflectiveItemProviderAdapterFactory());
-			myAdapterFactory = new ComposedAdapterFactory(factories);
-		}
-		return myAdapterFactory;
-	}
-	
-	public EditingDomain getEditingDomain() {
-		if (myEditingDomain == null) {
-			myEditingDomain = new AdapterFactoryEditingDomain(getAdapterFactory(), new BasicCommandStack());
-		}
-		return myEditingDomain;
-	}
-
-	public ResourceSet getResourceSet() {
-		return getEditingDomain().getResourceSet();
-	}
-
-	public abstract EPackage getDomainModel();
-
-	public abstract Canvas getCanvasDef();
-
-	public abstract ToolRegistry getToolDef();
-
-	public abstract boolean isNewBlankToolDef();
-
-	public void setMappingFile(IFile resultFile) {
-//		if (myResultFile != null && resultFile != myResultFile) {
-//			// perhaps, no reason to allow even 'touch'?
-//			throw new IllegalStateException("Did't expect file to be chosen more than once");
-//		}
-		myResultFile = resultFile;
-	}
-
-	public IFile getMappingFile() {
-		return myResultFile;
-	}
-
-	public Mapping getMapping() {
-		if (mapInstance == null) {
-			mapInstance = GMFMapFactory.eINSTANCE.createMapping();
-			URI res = URI.createPlatformResourceURI(getMappingFile().getFullPath().toString(), true);
-			getResourceSet().createResource(res, ContentHandler.UNSPECIFIED_CONTENT_TYPE).getContents().add(mapInstance);
-			CanvasMapping cm = GMFMapFactory.eINSTANCE.createCanvasMapping();
-			mapInstance.setDiagram(cm);
-		}
-		return mapInstance;
-	}
-
-	public void selectCanvasElement(EClass eClass) {
-		assert eClass.getEPackage() == getDomainModel();
-		CanvasMapping cm = getMapping().getDiagram();
-		cm.setDiagramCanvas(getCanvasDef());
-		cm.setDomainMetaElement(eClass);
-		cm.setDomainModel(eClass.getEPackage());
-	}
-
-	public void feedDefaultMapping() {
-		myFeeder = new MapDefFeeder(this, createToolDefSupplier());
-		myFeeder.feedDefaultMapping();
-	}
-
-	private ToolDefSupplier createToolDefSupplier() {
-		if (isNewBlankToolDef()) {
-			return new CreateToolDef(getToolDef());
-		} else {
-			return new ToolDefLookup(getToolDef());
-		}
-	}
-
-	public NodeReference[] nodeCandidates() {
-		return myFeeder.getInitialNodes();
-	}
-
-	public LinkMapping[] linkCandidates() {
-		return myFeeder.getInitialLinks();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/messages.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/messages.properties
deleted file mode 100644
index f09d6017b3d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/messages.properties
+++ /dev/null
@@ -1,65 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-wizardTitle=Create GMFMap model
-newPageTitle=GMFMap Model
-newPageDesc=Create a new GMFMap model
-
-inputPageTitle=Source Models
-inputPageDesc=Choose and load domain, graphical and tooling definition models
-ecoreSelector=Domain Model
-graphdefSelector=Graphical Definition
-tooldefSelector=Tooling Definition
-inputNeedDomain=Please specify and load domain model
-inputNeedCanvas=Please specify and load graphical definition model
-inputNeedToolDef=Please specify and load tooling definition model
-
-uriSelectorBrowse=Browse...
-uriSelectorLoad=Load
-uriSelectorWorkspace=Workspace...
-uriSelectorFilesystem=Filesystem...
-useECore=Use ECore
-useBasic=Use default
-createBlank=Create blank
-
-rootPageTitle=Diagram Element
-rootPageDesc=Choose element of domain model to act as top-level container, associated with diagram
-rootPageGroupTitle=Diagram Root Element
-rootPageHint=Non-abstract, non-interface domain elements (EClass) with at least one EReference child with property Containment set to true qualify as top-level container
-
-mapPageTitle=Mapping
-mapPageDesc=Map domain model elements
-# nodeLabel args: 0 - name of domain meta element, 1 - diagram node name, 2 - name of containment or child feature
-nodeLabel={0} ({1}; {2}) 
-# linkLabel args: 0 - name of domain meta element or meta feature, 1 - diagram link name, 2 - name of containment feature
-linkLabel={0} ({1}; {2})
-# passed instead either 0,1 or 2 in nodeLabel/linkLabel if appropriate value not specified
-unspecifiedValue=<unspecified>
-mapChange=Change...
-mapAsNode=As node <--
-mapAsLink=As link  -->
-mapRemove=Remove
-mapRestore=Restore...
-mapRestoreNode=Restore nodes
-mapRestoreLink=Restore links
-mapRestoreText=Choose elements to revive
-mapNodesList=Nodes
-mapLinksList=Links
-groupStructure=Structure
-groupEdit=Edit
-groupVisual=Visual
-groupConstraints=Constraints
-labelSpecialization=Specialization:
-labelInitializer=Initializer:
-labelDiagramElement=Diagram Element:
-labelElement=Element:
-labelContainment=Containment:
-labelTargetFeature=Target Feature:
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DefinitionPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DefinitionPage.java
deleted file mode 100644
index 43ca580b332..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DefinitionPage.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jface.viewers.ColumnPixelData;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.ResolvedItem.Resolution;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeColumn;
-
-/**
- * @author dstadnik
- */
-public class DefinitionPage extends WizardPage {
-
-	private final StructureBuilder structureBuilder;
-
-	private final DomainModelSource domainModelSource;
-
-	private DomainModelSourceImpl currentModelSource;
-
-	private TreeViewer viewer;
-
-	private Button deselectAllButton;
-
-	private Button recognizeButton;
-
-	public DefinitionPage(String pageId, StructureBuilder structureBuilder, DomainModelSource domainModelSource) {
-		super(pageId);
-		this.structureBuilder = structureBuilder;
-		this.domainModelSource = domainModelSource;
-	}
-
-	protected GridData createFillBothGridData(int span) {
-		GridData data = new GridData();
-		data.verticalAlignment = GridData.FILL;
-		data.grabExcessVerticalSpace = true;
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.horizontalSpan = span;
-		return data;
-	}
-
-	protected GridData createFillHorzGridData(int span) {
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		data.horizontalSpan = span;
-		return data;
-	}
-
-	public void createControl(Composite parent) {
-		setPageComplete(false);
-		setControl(createDomainModelGroup(parent));
-	}
-
-	private Composite createDomainModelGroup(Composite parent) {
-		Composite plate = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.verticalSpacing = 12;
-		plate.setLayout(layout);
-		Label domainModelElementsLabel = new Label(plate, SWT.NONE);
-		domainModelElementsLabel.setText(Messages.DefinitionPageElementsToProcess);
-		domainModelElementsLabel.setLayoutData(createFillHorzGridData(2));
-		Composite viewerPlate = createViewerGroup(plate);
-		viewerPlate.setLayoutData(createFillBothGridData(2));
-		plate.setLayoutData(createFillBothGridData(1));
-		return plate;
-	}
-
-	private Composite createViewerGroup(Composite parent) {
-		Composite plate = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(2, false);
-		layout.verticalSpacing = 12;
-		plate.setLayout(layout);
-		viewer = createViewer(plate);
-		viewer.getControl().setLayoutData(createFillBothGridData(1));
-		Composite buttonsPlate = createDomainModelButtons(plate);
-		buttonsPlate.setLayoutData(new GridData(GridData.FILL_VERTICAL));
-		return plate;
-	}
-
-	private Composite createDomainModelButtons(Composite parent) {
-		Composite plate = new Composite(parent, SWT.NONE);
-		GridLayout layout = new GridLayout(1, false);
-		layout.verticalSpacing = 12;
-		plate.setLayout(layout);
-		deselectAllButton = new Button(plate, SWT.PUSH);
-		deselectAllButton.setLayoutData(createFillHorzGridData(1));
-		deselectAllButton.setText(Messages.DefinitionPageDeselectAll);
-		deselectAllButton.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				deselectChildren(getModel());
-				viewer.refresh(true);
-			}
-
-			private void deselectChildren(ResolvedItem item) {
-				for (ResolvedItem child : item.getChildren()) {
-					child.setResolution(null);
-					deselectChildren(child);
-				}
-			}
-		});
-		recognizeButton = new Button(plate, SWT.PUSH);
-		recognizeButton.setLayoutData(createFillHorzGridData(1));
-		recognizeButton.setText(Messages.DefinitionPageDefaults);
-		recognizeButton.addSelectionListener(new SelectionListener() {
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				final EPackage contents = currentModelSource.getContents();
-				viewer.setInput(contents == null ? null : structureBuilder.process(currentModelSource));
-				viewer.expandAll();
-				if (contents != null) {
-					setPageComplete(validatePage());
-				} else {
-					setPageComplete(true);
-				}
-			}
-		});
-		return plate;
-	}
-
-	protected TreeViewer createViewer(Composite parent) {
-		final Tree tree = new Tree(parent, SWT.SINGLE | SWT.H_SCROLL | SWT.V_SCROLL | SWT.BORDER | SWT.FULL_SELECTION);
-		TableLayout layout = new TableLayout() {
-
-			private boolean firstTime = true;
-
-			public void layout(Composite c, boolean flush) {
-				super.layout(c, flush);
-				if (!firstTime) {
-					return;
-				}
-				int cawidth = c.getClientArea().width;
-
-				// XXX: Layout is being called with an invalid value the first time
-				// it is being called on Linux. This method resets the
-				// Layout to null so we make sure we run it only when
-				// the value is OK.
-				if (cawidth <= 1) {
-					return;
-				}
-
-				TreeColumn elementColumn = ((Tree) c).getColumn(0);
-				int vsbWidth = tree.getVerticalBar().getSize().x + 9; // 9 is magic since vsbw is not enough
-				int width = elementColumn.getWidth() - vsbWidth;
-				if (width < 0) {
-					width = 0;
-				}
-				elementColumn.setWidth(width);
-				firstTime = false;
-			}
-		};
-		tree.setLayout(layout);
-		tree.setHeaderVisible(true);
-		// tree.setLinesVisible(true);
-
-		TreeColumn elementColumn = new TreeColumn(tree, SWT.LEFT);
-		elementColumn.setText(Messages.DefinitionPageElement);
-		elementColumn.setResizable(true);
-		layout.addColumnData(new ColumnWeightData(1, 32, true));
-
-		addResolutionColumn(tree, Resolution.NODE, Plugin.NODE_ICON);
-		addResolutionColumn(tree, Resolution.LINK, Plugin.LINK_ICON);
-		if (structureBuilder.isWithLabels()) {
-			addResolutionColumn(tree, Resolution.LABEL, Plugin.LABEL_ICON);
-		}
-
-		return viewer = DomainModelViewerFactory.createViewer(tree, structureBuilder.isWithLabels());
-	}
-
-	protected TreeColumn addResolutionColumn(Tree tree, Resolution resolution, String iconId) {
-		TreeColumn column = new TreeColumn(tree, SWT.CENTER);
-		// column.setText(resolution.getName());
-		column.setImage(Plugin.getDefault().getImageRegistry().get(iconId));
-		column.setResizable(false);
-		((TableLayout) tree.getLayout()).addColumnData(new ColumnPixelData(18, false, true));
-		return column;
-	}
-
-	protected boolean validatePage() {
-		return true;
-	}
-
-	public void setVisible(boolean visible) {
-		super.setVisible(visible);
-		if (!visible) {
-			return;
-		}
-		final EPackage contents = domainModelSource.getContents();
-		if (currentModelSource != null && currentModelSource.like(domainModelSource)) {
-			return; // domain model source is the same; do not reset viewer
-		}
-		currentModelSource = createDomainModelSource(contents, domainModelSource.getDiagramElement());
-		assert currentModelSource != null;
-		viewer.setInput(contents == null ? null : structureBuilder.process(currentModelSource));
-		viewer.expandAll();
-		viewer.getControl().pack();
-		if (contents != null) {
-			// domain model is loaded ok
-			setPageComplete(validatePage());
-		} else {
-			// empty domain model
-			setPageComplete(true);
-		}
-		((Composite) getControl()).layout(true, true);
-	}
-
-	protected DomainModelSourceImpl createDomainModelSource(EPackage contents, EClass diagramElement) {
-		return new DomainModelSourceImpl(contents, diagramElement);
-	}
-
-	public ResolvedItem getModel() {
-		return (ResolvedItem) viewer.getInput();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DiagramElementSelector.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DiagramElementSelector.java
deleted file mode 100644
index c349f564440..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DiagramElementSelector.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Set;
-import java.util.TreeSet;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.NodePattern;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.TypeLinkPattern;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * @deprecated move filtering functionality in DiagramElementSelectorExtension
- * 
- * @author dstadnik
- */
-class DiagramElementSelector {
-
-	private ResolvedItem domainModel;
-
-	Combo control;
-
-	private Button excludeContainedNodesChoice;
-
-	private Button excludeLinksChoice;
-
-	public void createControl(Composite plate) {
-		Label diagramElementLabel = new Label(plate, SWT.NONE);
-		diagramElementLabel.setText(Messages.DiagramElementSelectorElement);
-		diagramElementLabel.setLayoutData(new GridData());
-		control = new Combo(plate, SWT.DROP_DOWN);
-		control.setLayoutData(createFillHorzGridData());
-		excludeContainedNodesChoice = createChoice(plate, Messages.DiagramElementSelectorExContainedNodes);
-		excludeLinksChoice = createChoice(plate, Messages.DiagramElementSelectorExLinks);
-	}
-
-	private Button createChoice(Composite plate, String text) {
-		Label dummy = new Label(plate, SWT.NONE);
-		dummy.setLayoutData(new GridData());
-		Button choice = new Button(plate, SWT.CHECK);
-		choice.setText(text);
-		choice.setLayoutData(createFillHorzGridData());
-		choice.addSelectionListener(new SelectionListener() {
-
-			public void widgetSelected(SelectionEvent e) {
-				updateDiagramElements();
-			}
-
-			public void widgetDefaultSelected(SelectionEvent e) {
-			}
-		});
-		return choice;
-	}
-
-	protected GridData createFillHorzGridData() {
-		GridData data = new GridData();
-		data.horizontalAlignment = GridData.FILL;
-		data.grabExcessHorizontalSpace = true;
-		return data;
-	}
-
-	public ResolvedItem getDiagramElement() {
-		return domainModel == null ? null : findResolvedItemByTypeName(domainModel, control.getText());
-	}
-
-	public void setDomainModel(ResolvedItem domainModel) {
-		this.domainModel = domainModel;
-		updateDiagramElements();
-	}
-
-	private void updateDiagramElements() {
-		Set<ResolvedItem> types = new TreeSet<ResolvedItem>(new Comparator<ResolvedItem>() {
-
-			public int compare(ResolvedItem arg0, ResolvedItem arg1) {
-				EClass type0 = (EClass) arg0.getDomainRef();
-				EClass type1 = (EClass) arg1.getDomainRef();
-				return type0.getName().compareToIgnoreCase(type1.getName());
-			}
-		});
-		if (domainModel != null) {
-			collectResolvedDomainTypes(types, domainModel);
-		}
-		String contents = control.getText();
-		control.removeAll();
-		for (ResolvedItem next : types) {
-			EClass type = (EClass) next.getDomainRef();
-			control.add(type.getName());
-			if (contents.equals(type.getName())) {
-				control.setText(contents);
-			}
-		}
-	}
-
-	private void collectResolvedDomainTypes(Collection<ResolvedItem> types, ResolvedItem item) {
-		if (item.getDomainRef() instanceof EClass) {
-			boolean ignore = false;
-			if (excludeContainedNodesChoice.getSelection()) {
-				ignore |= item.getPattern() instanceof NodePattern;
-			}
-			if (excludeLinksChoice.getSelection()) {
-				ignore |= item.getPattern() instanceof TypeLinkPattern;
-			}
-			if (!ignore) {
-				types.add(item);
-			}
-		}
-		for (ResolvedItem next : item.getChildren()) {
-			collectResolvedDomainTypes(types, next);
-		}
-	}
-
-	private ResolvedItem findResolvedItemByTypeName(ResolvedItem item, String typeName) {
-		if (item.getDomainRef() instanceof EClass && ((EClass) item.getDomainRef()).getName().equals(typeName)) {
-			return item;
-		}
-		for (ResolvedItem next : item.getChildren()) {
-			ResolvedItem result = findResolvedItemByTypeName(next, typeName);
-			if (result != null) {
-				return result;
-			}
-		}
-		return null;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DiagramElementSelectorExtension.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DiagramElementSelectorExtension.java
deleted file mode 100644
index 2ba909b6151..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DiagramElementSelectorExtension.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.papyrus.gmf.internal.common.ui.ListElementSelectorExtension;
-
-/**
- * @author dstadnik
- */
-public class DiagramElementSelectorExtension extends ListElementSelectorExtension {
-
-	protected String getModelElementName() {
-		return Messages.DiagramElementSelectorElement;
-	}
-
-	protected String getModelElementLabel(EObject modelElement) {
-		String name = ((EClass) modelElement).getName();
-		if (name == null || name.trim().length() == 0) {
-			name = Messages.DiagramElementSelectorNoName;
-		}
-		return name;
-	}
-
-	protected EClass getModelElementClass() {
-		return EcorePackage.eINSTANCE.getEClass();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSelectionPage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSelectionPage.java
deleted file mode 100644
index 933f5d03aef..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSelectionPage.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2007 Borland Software Corp.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.gmf.internal.common.ui.ExtensibleModelSelectionPage;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-
-/**
- * @author dstadnik
- */
-public class DomainModelSelectionPage extends ExtensibleModelSelectionPage implements DomainModelSource {
-
-	private static final String DEE = "diagramElement"; //$NON-NLS-1$
-
-	private EPackage contents;
-
-	public DomainModelSelectionPage(String pageId, ResourceLocationProvider rloc, ResourceSet resourceSet) {
-		super(pageId, rloc, resourceSet, "ecore"); //$NON-NLS-1$
-	}
-
-	protected void addExtensions() {
-		addExtension(DEE, new DiagramElementSelectorExtension());
-	}
-
-	@Override
-	protected void resourceChanged() {
-		super.resourceChanged();
-		contents = null;
-		if (getResource() != null) {
-			List<EObject> rc = getResource().getContents();
-			if (rc.size() >= 1 && rc.get(0) instanceof EPackage) {
-				contents = (EPackage) rc.get(0);
-			}
-		}
-	}
-
-	public EPackage getContents() {
-		return contents;
-	}
-
-	public EClass getDiagramElement() {
-		return (EClass) ((DiagramElementSelectorExtension) getExtension(DEE)).getModelElement();
-	}
-
-	public boolean isDisabled(EObject domainElement) {
-		throw new UnsupportedOperationException();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSource.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSource.java
deleted file mode 100644
index 8a97654de79..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSource.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * @author dstadnik
- */
-public interface DomainModelSource {
-
-	public EPackage getContents();
-
-	/**
-	 * EClass mapped to diagram canvas.
-	 */
-	public EClass getDiagramElement();
-
-	/**
-	 * Returns true if domain element should be ignored.
-	 * When model is being reconciled these elements are
-	 * represented in it and should not be processed.
-	 */
-	public boolean isDisabled(EObject domainElement);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSourceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSourceImpl.java
deleted file mode 100644
index ab925b5b3ce..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelSourceImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * @author dstadnik
- */
-public class DomainModelSourceImpl implements DomainModelSource {
-
-	private final EPackage contents;
-
-	private final EClass diagramElement;
-
-	public DomainModelSourceImpl(EPackage contents, EClass diagramElement) {
-		this.contents = contents;
-		this.diagramElement = diagramElement;
-	}
-
-	public EPackage getContents() {
-		return contents;
-	}
-
-	public EClass getDiagramElement() {
-		return diagramElement;
-	}
-
-	public boolean isDisabled(EObject domainElement) {
-		return false;
-	}
-
-	public boolean like(DomainModelSource another) {
-		return contents == another.getContents() && diagramElement == another.getDiagramElement();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelViewerFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelViewerFactory.java
deleted file mode 100644
index 5300aca3ef5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/DomainModelViewerFactory.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.CheckboxCellEditor;
-import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.ResolvedItem.Resolution;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-
-/**
- * @author dstadnik
- */
-class DomainModelViewerFactory {
-
-	private static final String P_NODE = "Node"; //$NON-NLS-1$
-
-	private static final String P_LINK = "Link"; //$NON-NLS-1$
-
-	private static final String P_LABEL = "Label"; //$NON-NLS-1$
-
-	public static TreeViewer createViewer(Tree tree, boolean withLabes) {
-		TreeViewer viewer = new TreeViewer(tree);
-		viewer.setContentProvider(new ResolverContentProvider());
-		AdapterFactory adapterFactory = new EcoreItemProviderAdapterFactory();
-		viewer.setLabelProvider(new ResolverLabelProvider(new AdapterFactoryLabelProvider(adapterFactory)));
-		if (withLabes) {
-			viewer.setColumnProperties(new String[] { "no", P_NODE, P_LINK, P_LABEL }); //$NON-NLS-1$
-			viewer.setCellEditors(new CellEditor[] { null, new CheckboxCellEditor(), new CheckboxCellEditor(), new CheckboxCellEditor() });
-		} else {
-			viewer.setColumnProperties(new String[] { "no", P_NODE, P_LINK }); //$NON-NLS-1$
-			viewer.setCellEditors(new CellEditor[] { null, new CheckboxCellEditor(), new CheckboxCellEditor() });
-		}
-		viewer.setCellModifier(new ResolverCellModifier(viewer, withLabes));
-		return viewer;
-	}
-
-	private static class ResolverCellModifier implements ICellModifier {
-
-		private TreeViewer viewer;
-
-		private boolean withLabels;
-
-		public ResolverCellModifier(TreeViewer viewer, boolean withLabels) {
-			this.viewer = viewer;
-			this.withLabels = withLabels;
-		}
-
-		public Object getValue(Object element, String property) {
-			ResolvedItem item = (ResolvedItem) element;
-			return Boolean.valueOf(item.getResolution() == getResolution(property));
-		}
-
-		public boolean canModify(Object element, String property) {
-			ResolvedItem item = (ResolvedItem) element;
-			return !item.isDisabled();
-		}
-
-		public void modify(Object element, String property, Object value) {
-			ResolvedItem item = (ResolvedItem) ((TreeItem) element).getData();
-			Resolution resolution = getResolution(property);
-			if (!item.isPossibleResolution(resolution)) {
-				return;
-			}
-			item.setResolution(((Boolean) value).booleanValue() ? resolution : null);
-			if (withLabels) {
-				viewer.update(item, new String[] { P_NODE, P_LINK, P_LABEL });
-			} else {
-				viewer.update(item, new String[] { P_NODE, P_LINK });
-			}
-		}
-		
-		private Resolution getResolution(String property) {
-			if (P_NODE.equals(property)) {
-				return Resolution.NODE;
-			} else if (P_LINK.equals(property)) {
-				return Resolution.LINK;
-			} else if (P_LABEL.equals(property)) {
-				return Resolution.LABEL;
-			}
-			return null;
-		}
-	}
-
-	private static class ResolverContentProvider implements ITreeContentProvider {
-
-		public void dispose() {
-		}
-
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
-		}
-
-		public Object getParent(Object element) {
-			return ((ResolvedItem) element).getParent();
-		}
-
-		public Object[] getChildren(Object parentElement) {
-			List<?> children = ((ResolvedItem) parentElement).getChildren();
-			return children.toArray();
-		}
-
-		public boolean hasChildren(Object element) {
-			List<?> children = ((ResolvedItem) element).getChildren();
-			return !children.isEmpty();
-		}
-
-		public Object[] getElements(Object inputElement) {
-			return getChildren(inputElement);
-		}
-	}
-
-	private static class ResolverLabelProvider extends LabelProvider implements ITableLabelProvider {
-
-		private ILabelProvider domainLabelProvider;
-
-		public ResolverLabelProvider(ILabelProvider domainLabelProvider) {
-			this.domainLabelProvider = domainLabelProvider;
-		}
-
-		public String getColumnText(Object element, int columnIndex) {
-			if (columnIndex == 0) {
-				Object domainRef = ((ResolvedItem) element).getDomainRef();
-				return domainLabelProvider.getText(domainRef);
-			} else {
-				return null;
-			}
-		}
-
-		public Image getColumnImage(Object element, int columnIndex) {
-			if (columnIndex == 0) {
-				Object domainRef = ((ResolvedItem) element).getDomainRef();
-				return domainLabelProvider.getImage(domainRef);
-			}
-			ResolvedItem item = (ResolvedItem) element;
-			Image image = getResolutionImage(element, columnIndex);
-			if (item.isDisabled() && image != null) {
-				return Plugin.getDefault().getImageRegistry().get(Plugin.GRAYED_ICON);
-			}
-			return image;
-		}
-
-		protected Image getResolutionImage(Object element, int columnIndex) {
-			ResolvedItem item = (ResolvedItem) element;
-			Image checkedIcon = Plugin.getDefault().getImageRegistry().get(Plugin.CHECKED_ICON);
-			Image uncheckedIcon = Plugin.getDefault().getImageRegistry().get(Plugin.UNCHECKED_ICON);
-			if (columnIndex == 1) {
-				if (!item.isPossibleResolution(Resolution.NODE)) {
-					return null;
-				}
-				return Resolution.NODE == item.getResolution() ? checkedIcon : uncheckedIcon;
-			} else if (columnIndex == 2) {
-				if (!item.isPossibleResolution(Resolution.LINK)) {
-					return null;
-				}
-				return Resolution.LINK == item.getResolution() ? checkedIcon : uncheckedIcon;
-			} else if (columnIndex == 3) {
-				if (!item.isPossibleResolution(Resolution.LABEL)) {
-					return null;
-				}
-				return Resolution.LABEL == item.getResolution() ? checkedIcon : uncheckedIcon;
-			}
-			return null;
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/GraphDefBuilder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/GraphDefBuilder.java
deleted file mode 100644
index 1a89d1d67c3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/GraphDefBuilder.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Identity;
-import org.eclipse.papyrus.gmf.gmfgraph.Label;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.WizardUtil;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.ResolvedItem.Resolution;
-import org.eclipse.papyrus.gmf.internal.common.IncrementalNamesDispenser;
-import org.eclipse.papyrus.gmf.internal.common.NamesDispenser;
-
-/**
- * @author dstadnik
- */
-public class GraphDefBuilder {
-
-	protected final Canvas existingCanvas;
-
-	protected final GMFGraphFactory gmfGraphFactory = GMFGraphPackage.eINSTANCE.getGMFGraphFactory();
-
-	protected final NamesDispenser namesDispenser = new IncrementalNamesDispenser();
-
-	protected Canvas canvas;
-
-	protected FigureGallery fGallery;
-
-	public GraphDefBuilder(Canvas existingCanvas) {
-		this.existingCanvas = existingCanvas;
-	}
-
-	public static DiagramElement getDiagramElement(Iterator<EObject> source, EObject domainElement) {
-		String name = WizardUtil.getCapName(domainElement);
-		if (name == null) {
-			return null;
-		}
-		return getDiagramElement(source, name);
-	}
-
-	public static DiagramElement getDiagramElement(Iterator<EObject> source, String domainObjectName) {
-		while (source.hasNext()) {
-			Object next = source.next();
-			if (next instanceof DiagramElement && domainObjectName.equals(((DiagramElement) next).getName())) {
-				return (DiagramElement) next;
-			}
-		}
-		return null;
-	}
-
-	protected String getUniqueName(String semanticPart) {
-		return namesDispenser.get(semanticPart);
-	}
-
-	protected String getUniqueName(String semanticPart, String suffixPart) {
-		return namesDispenser.get(semanticPart, suffixPart);
-	}
-
-	protected void addExistingName(String name) {
-		if (name != null) {
-			namesDispenser.add(name);
-		}
-	}
-
-	protected void addExistingNames(Canvas canvas) {
-		for (Iterator<EObject> it = canvas.eAllContents(); it.hasNext();) {
-			EObject next = it.next();
-			if (next instanceof Identity) {
-				addExistingName(((Identity) next).getName());
-			}
-		}
-	}
-
-	public Canvas process(ResolvedItem item) {
-		if (existingCanvas == null) {
-			canvas = gmfGraphFactory.createCanvas();
-		} else {
-			canvas = existingCanvas;
-			addExistingNames(existingCanvas);
-		}
-		if (item != null) {
-			if (canvas != existingCanvas) {
-				EPackage ePackage = (EPackage) item.getDomainRef();
-				canvas.setName(getUniqueName(ePackage.getName()));
-			}
-			fGallery = null;
-			for (Object figure : canvas.getFigures()) {
-				if (figure instanceof FigureGallery) {
-					fGallery = (FigureGallery) figure;
-				}
-			}
-			if (fGallery == null) {
-				fGallery = gmfGraphFactory.createFigureGallery();
-				fGallery.setName(getUniqueName(Messages.GraphDefBuilder0));
-				canvas.getFigures().add(fGallery);
-			}
-			for (ResolvedItem child : item.getChildren()) {
-				process(child, null);
-			}
-		}
-		return canvas;
-	}
-
-	protected void process(ResolvedItem item, DiagramElement parent) {
-		DiagramElement newParent = getDiagramElement(canvas.eAllContents(), (EObject) item.getDomainRef());
-		if (item.isDisabled()) {
-			assert newParent != null : "For disabled item there should be a diagram element with the appropriate name"; //$NON-NLS-1$
-			// Process child items since there may be new labels for existing node
-		} else {
-			if (item.getDomainRef() instanceof EClass) {
-				EClass type = (EClass) item.getDomainRef();
-				if (item.getResolution() == Resolution.NODE) {
-					newParent = createNode(type);
-				} else if (item.getResolution() == Resolution.LINK) {
-					newParent = createLink(type);
-				}
-			} else if (item.getDomainRef() instanceof EReference) {
-				EReference ref = (EReference) item.getDomainRef();
-				if (item.getResolution() == Resolution.LINK) {
-					EClass containingClass = (EClass) item.getParent().getDomainRef();
-					newParent = createLink(ref, containingClass);
-				}
-			} else if (item.getDomainRef() instanceof EAttribute) {
-				EAttribute attr = (EAttribute) item.getDomainRef();
-				if (item.getResolution() == Resolution.LABEL) {
-					EClass containingClass = (EClass) item.getParent().getDomainRef();
-					newParent = createLabel(attr, containingClass, parent);
-				}
-			}
-		}
-		for (ResolvedItem next : item.getChildren()) {
-			process(next, newParent);
-		}
-	}
-
-	protected Node createNode(EClass type) {
-		String baseName = WizardUtil.getCapName(type);
-		Rectangle figure = gmfGraphFactory.createRectangle();
-		figure.setName(getUniqueName(baseName, Messages.GraphDefBuilder1));
-		Node node = gmfGraphFactory.createNode();
-		node.setFigure(newDescriptor(figure.getName(), figure));
-		fGallery.getDescriptors().add(node.getFigure());
-		node.setName(getUniqueName(baseName, null));
-		canvas.getNodes().add(node);
-		return node;
-	}
-
-	protected Connection createLink(EClass type) {
-		String baseName = WizardUtil.getCapName(type);
-		PolylineConnection figure = gmfGraphFactory.createPolylineConnection();
-		figure.setName(getUniqueName(baseName, Messages.GraphDefBuilder1));
-		Connection link = gmfGraphFactory.createConnection();
-		link.setFigure(newDescriptor(figure.getName(), figure));
-		fGallery.getDescriptors().add(link.getFigure());
-		link.setName(getUniqueName(baseName, null));
-		canvas.getConnections().add(link);
-		return link;
-	}
-
-	protected Connection createLink(EReference ref, EClass containingClass) {
-		String baseName = WizardUtil.getCapName(ref, containingClass);
-		PolylineConnection figure = gmfGraphFactory.createPolylineConnection();
-		figure.setName(getUniqueName(baseName, Messages.GraphDefBuilder1));
-		DecorationFigure decoration = gmfGraphFactory.createPolylineDecoration();
-		decoration.setName(getUniqueName(baseName, Messages.GraphDefBuilder6));
-		figure.setTargetDecoration(decoration);
-		fGallery.getFigures().add(decoration);
-		Connection link = gmfGraphFactory.createConnection();
-		link.setFigure(newDescriptor(figure.getName(), figure));
-		fGallery.getDescriptors().add(link.getFigure());
-		link.setName(getUniqueName(baseName, null));
-		canvas.getConnections().add(link);
-		return link;
-	}
-
-	protected DiagramLabel createLabel(EAttribute attr, EClass containingClass, DiagramElement parent) {
-		if (parent == null) {
-			return null; // makes no sense to define label without parent
-		}
-		String baseName = WizardUtil.getCapName(attr, containingClass);
-		Label figure = gmfGraphFactory.createLabel();
-		figure.setName(getUniqueName(baseName, Messages.GraphDefBuilder1));
-		figure.setText(Messages.GraphDefBuilder5);
-		assert parent.getFigure().getActualFigure() instanceof RealFigure : "We are creators of this gmfgraph; there should be nothing but figure"; //$NON-NLS-1$
-		final RealFigure realFigure = (RealFigure) parent.getFigure().getActualFigure();
-		if (parent instanceof Node) {
-			// safety check, not sure whether labels for links are created here or not
-			if (realFigure.getLayout() == null) {
-				realFigure.setLayout(GMFGraphFactory.eINSTANCE.createFlowLayout());
-			}
-		}
-		realFigure.getChildren().add(figure);
-		DiagramLabel label = gmfGraphFactory.createDiagramLabel();
-		label.setFigure(parent.getFigure());
-		label.setAccessor(newAccess(parent.getFigure(), figure));
-		label.setName(getUniqueName(baseName, null));
-		canvas.getLabels().add(label);
-		return label;
-	}
-
-	private static FigureDescriptor newDescriptor(String name, RealFigure fig) {
-		FigureDescriptor fd = GMFGraphFactory.eINSTANCE.createFigureDescriptor();
-		fd.setActualFigure(fig);
-		fd.setName(name);
-		return fd;
-	}
-	private static ChildAccess newAccess(FigureDescriptor fd, RealFigure child) {
-		ChildAccess ca = GMFGraphFactory.eINSTANCE.createChildAccess();
-		ca.setFigure(child);
-		fd.getAccessors().add(ca);
-		return ca;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/Messages.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/Messages.java
deleted file mode 100644
index 35a4481a2b2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/Messages.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import org.eclipse.osgi.util.NLS;
-
-/**
- * @author dstadnik
- */
-public class Messages extends NLS {
-
-	private static final String BUNDLE_NAME = "org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.messages"; //$NON-NLS-1$
-
-	private Messages() {
-	}
-
-	static {
-		// initialize resource bundle
-		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
-	}
-
-	public static String DefinitionPageDefaults;
-
-	public static String DefinitionPageDeselectAll;
-
-	public static String DefinitionPageElement;
-
-	public static String DefinitionPageElementsToProcess;
-
-	public static String DiagramElementSelectorElement;
-
-	public static String DiagramElementSelectorExContainedNodes;
-
-	public static String DiagramElementSelectorExLinks;
-
-	public static String DiagramElementSelectorNoName;
-
-	public static String GraphDefBuilder0;
-
-	public static String GraphDefBuilder1;
-
-	public static String GraphDefBuilder5;
-
-	public static String GraphDefBuilder6;
-
-	public static String ToolDefBuilder0;
-
-	public static String ToolDefBuilder1;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/ResolvedItem.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/ResolvedItem.java
deleted file mode 100644
index a7b557524ba..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/ResolvedItem.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.TypePattern;
-
-/**
- * @author dstadnik
- */
-public class ResolvedItem {
-
-	public enum Resolution {
-		NODE,
-		LINK,
-		LABEL
-	}
-
-	public static final Resolution[] NO_RESOLUTIONS = { null };
-
-	public static final Resolution[] ALL_RESOLUTIONS = { null, Resolution.NODE, Resolution.LINK, Resolution.LABEL };
-
-	public static final Resolution[] NODE_LINK_RESOLUTIONS = { null, Resolution.NODE, Resolution.LINK };
-
-	public static final Resolution[] LINK_RESOLUTIONS = { null, Resolution.LINK };
-
-	public static final Resolution[] LABEL_RESOLUTIONS = { null, Resolution.LABEL };
-
-	private Resolution resolution;
-
-	private Object domainRef;
-
-	private TypePattern pattern;
-
-	private Resolution[] possibleResolutions;
-
-	private boolean disabled;
-
-	private ResolvedItem parent;
-
-	private List<ResolvedItem> children = new ArrayList<ResolvedItem>();
-
-	public ResolvedItem(Resolution resolution, Object domainRef, TypePattern pattern, Resolution[] possibleResolutions, boolean disabled) {
-		this.resolution = resolution;
-		this.domainRef = domainRef;
-		this.pattern = pattern;
-		this.possibleResolutions = possibleResolutions;
-		this.disabled = disabled;
-	}
-
-	public boolean isDisabled() {
-		return disabled;
-	}
-
-	public Resolution[] getPossibleResolutions() {
-		return possibleResolutions;
-	}
-
-	public boolean isPossibleResolution(Resolution possibleResolution) {
-		for (int i = 0; i < possibleResolutions.length; i++) {
-			if (possibleResolutions[i] == possibleResolution) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	public Resolution getResolution() {
-		return resolution;
-	}
-
-	public void setResolution(Resolution resolution) {
-		this.resolution = resolution;
-	}
-
-	public Object getDomainRef() {
-		return domainRef;
-	}
-
-	public TypePattern getPattern() {
-		return pattern;
-	}
-
-	public ResolvedItem getParent() {
-		return parent;
-	}
-
-	public void addChild(ResolvedItem child) {
-		children.add(child);
-		child.parent = this;
-	}
-
-	public void removeChild(ResolvedItem child) {
-		if (children.remove(child)) {
-			child.parent = null;
-		}
-	}
-
-	public List<ResolvedItem> getChildren() {
-		return children;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/StructureBuilder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/StructureBuilder.java
deleted file mode 100644
index a447465d80a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/StructureBuilder.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.ContainmentClosure;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.NodePattern;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.StructureResolver;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.TypeLinkPattern;
-import org.eclipse.papyrus.gmf.internal.bridge.resolver.TypePattern;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.ResolvedItem.Resolution;
-
-/**
- * @author dstadnik
- */
-public class StructureBuilder {
-
-	private final StructureResolver resolver;
-
-	private final boolean withLabels;
-
-	private final ContainmentClosure containmentClosure;
-
-	public StructureBuilder(StructureResolver resolver, boolean withLabels) {
-		this.resolver = resolver;
-		this.withLabels = withLabels;
-		containmentClosure = Plugin.getDefault().getContaintmentClosure();
-	}
-
-	public final boolean isWithLabels() {
-		return withLabels;
-	}
-
-	/**
-	 * Entry point to the structure builder. It walks over the domain model and builds resolutions tree.
-	 */
-	public ResolvedItem process(DomainModelSource dms) {
-		ResolvedItem item = new ResolvedItem(null, dms.getContents(), null, ResolvedItem.NO_RESOLUTIONS, false); // root of the resolutions tree
-		for (Iterator<EObject> it = dms.getContents().eAllContents(); it.hasNext();) {
-			EObject next = it.next();
-			if (next instanceof EClass) {
-				item.addChild(process((EClass) next, dms));
-			}
-		}
-		return item;
-	}
-
-	protected ResolvedItem process(EClass domainClass, DomainModelSource dms) {
-		final EClass diagramClass = dms.getDiagramElement(); // containment root of diagram elements
-		final EPackage domainPackage = dms.getContents();
-		Resolution resolution;
-		Resolution[] resolutions = ResolvedItem.NODE_LINK_RESOLUTIONS; // class may be resolved only as node or link
-		TypePattern pattern = resolver.resolve(domainClass, domainPackage);
-		if (pattern instanceof NodePattern) {
-			resolution = Resolution.NODE;
-			if (diagramClass != null && !containmentClosure.contains(diagramClass, domainClass, domainPackage)) {
-				resolution = null; // class is not in diagram containment hierarchy
-			}
-		} else if (pattern instanceof TypeLinkPattern) {
-			resolution = Resolution.LINK;
-			if (diagramClass != null) {
-				TypeLinkPattern linkPattern = (TypeLinkPattern) pattern;
-				if (linkPattern.getSource() != null &&
-						!containmentClosure.contains(diagramClass, linkPattern.getSource().getEReferenceType(), domainPackage)) {
-					resolution = null; // source is not in diagram containment hierarchy
-				}
-				if (linkPattern.getTarget() != null &&
-						!containmentClosure.contains(diagramClass, linkPattern.getTarget().getEReferenceType(), domainPackage)) {
-					resolution = null; // target is not in diagram containment hierarchy
-				}
-			}
-		} else {
-			resolution = null;
-			if (domainClass.isAbstract() || domainClass.isInterface()) {
-				resolutions = ResolvedItem.NO_RESOLUTIONS;
-			}
-		}
-		ResolvedItem item = new ResolvedItem(resolution, domainClass, pattern, resolutions, dms.isDisabled(domainClass));
-		addLabels(item, domainClass, dms);
-		addRefLinks(item, domainClass, dms);
-		return item;
-	}
-
-	protected void addLabels(ResolvedItem typeItem, EClass type, DomainModelSource dms) {
-		if (!withLabels) {
-			return;
-		}
-		Resolution baseResolution = typeItem.getResolution() == null ? null : Resolution.LABEL; // exclude label if parent is excluded
-		Collection<EAttribute> resolvedAttrs = Collections.emptyList();
-		if (typeItem.getPattern() != null) {
-			resolvedAttrs = Arrays.asList(typeItem.getPattern().getLabels());
-		}
-		Resolution[] possibleResolutions = Arrays.equals(typeItem.getPossibleResolutions(), ResolvedItem.NO_RESOLUTIONS) ?
-				ResolvedItem.NO_RESOLUTIONS : ResolvedItem.LABEL_RESOLUTIONS; // exclude label if parent is excluded
-		for (EAttribute attribute : (List<? extends EAttribute>) type.getEAllAttributes()) {
-			Resolution resolution = resolvedAttrs.contains(attribute) ? baseResolution : null; // include only attributes resolved as labels
-			typeItem.addChild(new ResolvedItem(resolution, attribute, null, possibleResolutions, dms.isDisabled(attribute)));
-		}
-	}
-
-	protected void addRefLinks(ResolvedItem typeItem, EClass type, DomainModelSource dms) {
-		Resolution baseResolution = typeItem.getResolution() != Resolution.NODE ? null : Resolution.LINK; // ref links are available only for nodes
-		Collection<EReference> resolvedRefs = Collections.emptyList();
-		if (typeItem.getPattern() instanceof NodePattern) {
-			resolvedRefs = Arrays.asList(((NodePattern) typeItem.getPattern()).getRefLinks());
-		}
-		Resolution[] possibleResolutions = Arrays.equals(typeItem.getPossibleResolutions(), ResolvedItem.NO_RESOLUTIONS) ?
-				ResolvedItem.NO_RESOLUTIONS : ResolvedItem.LINK_RESOLUTIONS; // exclude link if parent is excluded
-		for (EReference reference : (List<? extends EReference>) type.getEAllReferences()) {
-			Resolution resolution = resolvedRefs.contains(reference) ? baseResolution : null; // include only refs resolved as links
-			typeItem.addChild(new ResolvedItem(resolution, reference, null, possibleResolutions, dms.isDisabled(reference)));
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/ToolDefBuilder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/ToolDefBuilder.java
deleted file mode 100644
index 1a08801c4a2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/ToolDefBuilder.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.WizardUtil;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.pages.simple.ResolvedItem.Resolution;
-import org.eclipse.papyrus.gmf.internal.common.IncrementalNamesDispenser;
-import org.eclipse.papyrus.gmf.internal.common.NamesDispenser;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.ToolGroup;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-
-/**
- * @author dstadnik
- */
-public class ToolDefBuilder {
-
-	protected final ToolRegistry existingToolRegistry;
-
-	protected GMFToolFactory gmfToolFactory = GMFToolPackage.eINSTANCE.getGMFToolFactory();
-
-	protected NamesDispenser namesDispenser = new IncrementalNamesDispenser();
-
-	protected ToolRegistry toolRegistry;
-
-	protected ToolGroup group;
-
-	public ToolDefBuilder(ToolRegistry existingToolRegistry) {
-		this.existingToolRegistry = existingToolRegistry;
-	}
-
-	public static CreationTool getCreationTool(Iterator<EObject> source, EObject domainElement) {
-		String name = WizardUtil.getCapName(domainElement);
-		if (name == null) {
-			return null;
-		}
-		return getCreationTool(source, name);
-	}
-
-	public static CreationTool getCreationTool(Iterator<EObject> source, String domainObjectName) {
-		while (source.hasNext()) {
-			Object next = source.next();
-			if (next instanceof CreationTool && domainObjectName.equals(((CreationTool) next).getTitle())) {
-				return (CreationTool) next;
-			}
-		}
-		return null;
-	}
-
-	protected String getUniqueName(String semanticPart) {
-		return namesDispenser.get(semanticPart);
-	}
-
-	protected String getUniqueName(String semanticPart, String suffixPart) {
-		return namesDispenser.get(semanticPart, suffixPart);
-	}
-
-	protected void addExistingName(String name) {
-		if (name != null) {
-			namesDispenser.add(name);
-		}
-	}
-
-	protected void addExistingNames(ToolRegistry toolRegistry) {
-		for (Iterator<EObject> it = toolRegistry.eAllContents(); it.hasNext();) {
-			EObject next = it.next();
-			if (next instanceof AbstractTool) {
-				addExistingName(((AbstractTool) next).getTitle());
-			}
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	public ToolRegistry process(ResolvedItem item) {
-		if (existingToolRegistry == null) {
-			toolRegistry = gmfToolFactory.createToolRegistry();
-		} else {
-			toolRegistry = existingToolRegistry;
-			addExistingNames(existingToolRegistry);
-		}
-		if (item != null) {
-			EPackage ePackage = (EPackage) item.getDomainRef();
-			Palette palette = toolRegistry.getPalette();
-			if (palette == null) {
-				palette = gmfToolFactory.createPalette();
-				palette.setTitle(getUniqueName(ePackage.getName(), Messages.ToolDefBuilder1));
-				toolRegistry.setPalette(palette);
-			}
-			group = null;
-			for (Object tool : palette.getTools()) {
-				if (tool instanceof ToolGroup) {
-					group = (ToolGroup) tool;
-					break;
-				}
-			}
-			if (group == null) {
-				group = gmfToolFactory.createToolGroup();
-				group.setTitle(getUniqueName(ePackage.getName()));
-				palette.getTools().add(group);
-			}
-			for (ResolvedItem child : item.getChildren()) {
-				processContents(child);
-			}
-		}
-		return toolRegistry;
-	}
-
-	protected void processContents(ResolvedItem item) {
-		if (!item.isDisabled() && (item.getResolution() == Resolution.NODE || item.getResolution() == Resolution.LINK)) {
-			String baseName = null;
-			if (item.getDomainRef() instanceof EClass) {
-				baseName = WizardUtil.getCapName((EClass) item.getDomainRef());
-			} else if (item.getDomainRef() instanceof EReference) {
-				baseName = WizardUtil.getCapName((EReference) item.getDomainRef());
-			}
-			if (baseName != null && baseName.length() > 0) {
-				addCreationTool(baseName);
-			}
-		}
-		for (ResolvedItem child : item.getChildren()) {
-			processContents(child);
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	protected CreationTool addCreationTool(String baseName) {
-		CreationTool tool = gmfToolFactory.createCreationTool();
-		tool.setTitle(getUniqueName(baseName));
-		tool.setDescription(Messages.bind(Messages.ToolDefBuilder0, baseName));
-		tool.setSmallIcon(gmfToolFactory.createDefaultImage());
-		tool.setLargeIcon(gmfToolFactory.createDefaultImage());
-		group.getTools().add(tool);
-		return tool;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/messages.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/messages.properties
deleted file mode 100644
index d7108457f36..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/pages/simple/messages.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-GraphDefBuilder0=Default
-GraphDefBuilder1=Figure
-GraphDefBuilder5=<...>
-GraphDefBuilder6=TargetDecoration
-ToolDefBuilder0=Create new {0}
-ToolDefBuilder1=Palette
-DiagramElementSelectorElement=Diagram Element:
-DiagramElementSelectorExContainedNodes=Exclude types that are resolved as nodes and have container
-DiagramElementSelectorExLinks=Exclude types that are resolved as links
-DiagramElementSelectorNoName=<unnamed>
-DefinitionPageElementsToProcess=Domain model elements to process:
-DefinitionPageDeselectAll=Deselect All
-DefinitionPageDefaults=Defaults
-DefinitionPageElement=Element
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/AccessibleClassNodeStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/AccessibleClassNodeStrategy.java
deleted file mode 100644
index 9e4498f30bf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/AccessibleClassNodeStrategy.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * Accessible means EClass which is not abstract nor is interface. EDataTypes and EEnums are filtered out.
- * @author artem
- */
-public class AccessibleClassNodeStrategy implements Strategy<EClass> {
-
-	public String getID() {
-		return "accessibleClass";
-	}
-
-	/**
-	 * @param soFar - exects <code>List&lt;Classifier&gt;</code>
-	 */
-	public void filter(Collection<EClass> soFar, Hierarchy hierarchy) {
-		for (Iterator<EClass> it = soFar.iterator(); it.hasNext();) {
-			if (!hierarchy.getAccessibleClasses().contains(it.next())) {
-				it.remove();
-			}
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/CompositeStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/CompositeStrategy.java
deleted file mode 100644
index 0ae83604a52..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/CompositeStrategy.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author artem
- */
-public class CompositeStrategy<T extends EObject> implements Strategy<T> {
-	private final Strategy<T>[] myStrategies;
-
-	public CompositeStrategy(Strategy<T>... strategies) {
-		assert strategies != null;
-		myStrategies = strategies;
-		for (int i = 0 ; i < strategies.length; i++) {
-			if (strategies[i] == null) {
-				// XXX perhaps, replacing null with NullStrategy would be more polite?
-				throw new NullPointerException();
-			}
-		}
-	}
-
-	public String getID() {
-		return "composite";
-	}
-
-	public void filter(Collection<T> soFar, Hierarchy hierarchy) {
-		for (int i = 0 ; i < myStrategies.length; i++) {
-			myStrategies[i].filter(soFar, hierarchy);
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/ExcludeDiagramContainerNodeStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/ExcludeDiagramContainerNodeStrategy.java
deleted file mode 100644
index dd83d99a06f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/ExcludeDiagramContainerNodeStrategy.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * @author artem
- */
-public class ExcludeDiagramContainerNodeStrategy implements Strategy<EClass> {
-
-	private final boolean myWithSubclasses;
-
-	public ExcludeDiagramContainerNodeStrategy() {
-		this(true);
-	}
-
-	public ExcludeDiagramContainerNodeStrategy(boolean withSubclasses) {
-		myWithSubclasses = withSubclasses;
-	}
-
-	public String getID() {
-		return "excludeDiagramContainer";
-	}
-
-	public void filter(Collection<EClass> soFar, Hierarchy hierarchy) {
-		if (myWithSubclasses && hierarchy.getDiagramContainer() != null) {
-			for (Iterator<EClass> it = soFar.iterator(); it.hasNext();) {
-				EClass next = it.next();
-				if (hierarchy.getDiagramContainer().isSuperTypeOf(next)) {
-					it.remove();
-				}
-			}
-		} else {
-			soFar.remove(hierarchy.getDiagramContainer());
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/Hierarchy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/Hierarchy.java
deleted file mode 100644
index 3b9a52a6358..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/Hierarchy.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * FIXME Tests!!!
- * @author artem
- */
-public class Hierarchy {
-	private final List<EReference> myRefs;
-	private final EPackage myDomainModel;
-	private final Map<EClass, Set<EClass>> myResult;
-	private Set<EClass> myAccessibleLeaves;
-	private Set<EClass> myAccessibleClasses = new HashSet<EClass>();
-	/**
-	 * EClasses that may suit as link
-	 */
-	private Set<EClass> myAccessibleLinkClasses = new HashSet<EClass>();
-	/**
-	 * Containment references to get to classes in myAccessibleLinkClasses set
-	 */
-	private Set<EReference> myLinkClassContainmentRefs = new HashSet<EReference>();
-
-	private final EClass myDiagramContainer;
-
-	/**
-	 * 
-	 * @param eRefs
-	 * @param diagramContainer - can be <code>null</code> 
-	 * @param domainModel
-	 */
-	public Hierarchy(List<EReference> eRefs, EClass diagramContainer, EPackage domainModel) {
-		myRefs = eRefs;
-		myDiagramContainer = diagramContainer;
-		myDomainModel = domainModel;
-		myResult = new HashMap<EClass, Set<EClass>>();
-		for (EReference element : eRefs) {
-			myResult.put(element.getEReferenceType(), new HashSet<EClass>());
-		}
-	}
-
-	public Hierarchy(EClass diagramContainer) {
-		this(diagramContainer.getEAllContainments(), diagramContainer, diagramContainer.getEPackage());
-	}
-
-	public Hierarchy(EClass diagramContainer, EPackage domainModel) {
-		this(diagramContainer.getEAllContainments(), diagramContainer, domainModel);
-	}
-
-	/**
-	 * @return domain element associated with diagram itself, or <code>null</code> if not specified.
-	 */
-	public EClass getDiagramContainer() {
-		return myDiagramContainer;
-	}
-
-	public EReference nodeBackRef(EClass nodeElement) {
-		for (EReference r : myRefs) {
-			if (r.getEReferenceType().isSuperTypeOf(nodeElement)) {
-				return r;
-			}
-		}
-		return null;
-	}
-
-	public EReference linkBackRef(EClass linkElement) {
-		ArrayList<EReference> compatible = new ArrayList<EReference>();
-		for (EReference r : myLinkClassContainmentRefs) {
-			if (r.getEReferenceType().isSuperTypeOf(linkElement)) {
-				compatible.add(r);
-			}
-		}
-		if (compatible.isEmpty()) {
-			return null;
-		}
-		// try exact match
-		for (int i = compatible.size() - 1; i >= 0; i--) {
-			EReference r = compatible.get(i);
-			if (r.getEReferenceType().equals(linkElement)) {
-				return r;
-			}
-		}
-		// just pick any 
-		return compatible.get(0);
-	}
-
-	public boolean isLeaf(EClass element) {
-		return myAccessibleLeaves.contains(element);
-	}
-
-	public EReference getLinkFeature(EClass element) {
-		List<EReference> l = collectAllNonContainment(element);
-		if (l.isEmpty()) {
-			return null;
-		}
-		for (EReference ref : l) {
-			if (element.isSuperTypeOf(ref.getEReferenceType())) {
-				continue;
-			}
-			// check that target is accessible (part of the scope) 
-			// i.e. link target could be either superclass or subclass of one of root classes.
-			for (EClass c : myResult.keySet()) {
-				if (c.isSuperTypeOf(ref.getEReferenceType()) || ref.getEReferenceType().isSuperTypeOf(c)) {
-					return ref;
-				}
-			}
-		}
-		return null;
-	}
-	public void collect() {
-		collect(true);
-	}
-
-	@SuppressWarnings("unchecked")
-	void collect(boolean recurse) {
-		Set<EClass> nonLeaves = new HashSet<EClass>();
-		final HashSet<EClass> leavesSet = new HashSet<EClass>();
-		for (Iterator it = myDomainModel.getEClassifiers().iterator(); it.hasNext();) {
-			Object next = it.next();
-			if (next instanceof EClass) {
-				EClass eClass = (EClass) next;
-				for (Map.Entry<EClass, Set<EClass>> entry : myResult.entrySet()) {
-					final EClass element = entry.getKey();
-					if (element.isSuperTypeOf(eClass)) {
-						entry.getValue().add(eClass);
-						if (recurse) {
-							Hierarchy h2 = new Hierarchy(eClass.getEAllContainments(), null, myDomainModel);
-							h2.collect(false);
-							myLinkClassContainmentRefs.addAll(eClass.getEAllContainments());
-							myAccessibleLinkClasses .addAll(h2.getAccessibleClasses());
-							leavesSet.addAll(h2.myAccessibleLeaves);
-						}
-						if (!eClass.isAbstract() &&  !eClass.isInterface()) {
-							myAccessibleClasses.add(eClass);
-						}
-						nonLeaves.addAll(eClass.getESuperTypes());
-					}
-				}
-			}
-		}
-		leavesSet.addAll(myAccessibleClasses);
-		leavesSet.removeAll(nonLeaves);
-		myAccessibleLeaves = Collections.unmodifiableSet(leavesSet);
-		myAccessibleClasses = Collections.unmodifiableSet(myAccessibleClasses);
-		myAccessibleLinkClasses = Collections.unmodifiableSet(myAccessibleLinkClasses);
-	}
-
-	public Set<EClass> getAllClasses() {
-		HashSet<EClass> rv = new HashSet<EClass>();
-		for (Set<EClass> next : myResult.values()) {
-			rv.addAll(next);
-		}
-		return rv;
-	}
-
-	public Set<EClass> getAccessibleClasses() {
-		return myAccessibleClasses;
-	}
-
-	public Set<EClass> getAccessibleLinkClasses() {
-		return myAccessibleLinkClasses;
-	}
-
-	public Set<EReference> getAccessibleReferences() {
-		return getAccessibleReferences(myAccessibleClasses.iterator());
-	}
-
-	public Set<EReference> getAccessibleReferences(Iterator<EClass> iter) {
-		HashSet<EReference> rv = new HashSet<EReference>();
-		for (; iter.hasNext();) {
-			EClass element = iter.next();
-			rv.addAll(collectAllNonContainment(element));
-		}
-		return rv;
-	}
-
-	@SuppressWarnings({"unchecked" })
-	List<EReference> collectAllNonContainment(EClass element) {
-		List<EReference> l = new LinkedList<EReference>(element.getEAllReferences());
-		l.removeAll(element.getEAllContainments());
-		return l;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/LeafNodeStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/LeafNodeStrategy.java
deleted file mode 100644
index b561c62f7b1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/LeafNodeStrategy.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * Simple strategy that filters out metaclasses that are not leaves
- * @author artem
- */
-public class LeafNodeStrategy implements Strategy<EClass> {
-
-	public String getID() {
-		return "leafNode";
-	}
-
-	/**
-	 * @param soFar - expects <code>List&lt;EClass&gt;</code>
-	 */
-	public void filter(Collection<EClass> soFar, Hierarchy hierarchy) {
-		for (Iterator<EClass> it = soFar.iterator(); it.hasNext();) {
-			if (!hierarchy.isLeaf(it.next())) {
-				it.remove();
-			}
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/NameFilterStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/NameFilterStrategy.java
deleted file mode 100644
index c5a5e540c4a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/NameFilterStrategy.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.eclipse.emf.ecore.ENamedElement;
-
-/**
- * Removes elements that don't match specified patterns 
- * @author artem
- */
-public class NameFilterStrategy implements Strategy<ENamedElement> {
-	private final Pattern[] myPatterns;
-
-	/**
-	 * @param namePatterns - regexp. <code>IllegalArgumentException</code> is thrown is some pattern is illegal
-	 * @throws IllegalArgumentException 
-	 */
-	public NameFilterStrategy(String[] namePatterns) {
-		assert namePatterns != null && namePatterns.length > 1;
-		myPatterns = new Pattern[namePatterns.length];
-		try {
-			for (int i = 0; i < namePatterns.length; i++) {
-				myPatterns[i] = Pattern.compile(namePatterns[i]);
-			}
-		} catch (PatternSyntaxException ex) {
-			throw new IllegalArgumentException(ex.getMessage());
-		}
-	}
-
-	public String getID() {
-		return "nameFilter";
-	}
-
-	/**
-	 * @param soFar - expects <code>List&lt;ENamedElement&gt;</code>
-	 */
-	public void filter(Collection<ENamedElement> soFar, Hierarchy hierarchy) {
-		for (Iterator<ENamedElement> it = soFar.iterator(); it.hasNext();) {
-			if (!match(it.next().getName())) {
-				it.remove();
-			}
-		}
-	}
-
-	protected boolean match(String name) {
-		if (name == null)
-		for (int i = 0; i < myPatterns.length; i++) {
-			if (myPatterns[i].matcher(name).matches()) {
-				return true;
-			}
-		}
-		return false;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/Strategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/Strategy.java
deleted file mode 100644
index d5a564e2992..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/Strategy.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;
-
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author artem
- */
-public interface Strategy<T extends EObject> {
-
-	String getID();
-
-	/**
-	 * @param soFar list to filter, should be modified directly
-	 * @param hierarchy accessor to domain model  
-	 * @return 
-	 */
-	void filter(Collection<T> soFar, Hierarchy hierarchy);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/StrategyDescriptor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/StrategyDescriptor.java
deleted file mode 100644
index 50a7770292c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/strategy/StrategyDescriptor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards.strategy;
-
-import org.eclipse.swt.widgets.Control;
-
-/**
- * @author artem
- */
-public interface StrategyDescriptor {
-
-	String getTitle();
-	String getDescription();
-	Strategy createStrategy();
-
-	boolean supportsAttributes();
-	void configure(Control parent);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.project
deleted file mode 100644
index bbd63bbbec6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.project
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.bridge</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>src_container</key>
-					<value>transforms</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
deleted file mode 100644
index 26bf80027b3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">
-  <mapping sourceURI="http://www.eclipse.org/papyrus/gmf/2020/mappings" targetURI="platform:/resource/org.eclipse.papyrus.gmf.map/models/gmfmap.ecore"/>
-  <mapping sourceURI="http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition" targetURI="platform:/resource/org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore"/>
-  <mapping sourceURI="http://www.eclipse.org/papyrus/gmf/2020/GenModel" targetURI="platform:/resource/org.eclipse.papyrus.gmf.codegen/models/gmfgen.ecore"/>
-  <mapping sourceURI="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition" targetURI="platform:/resource/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore"/>
-</uriMap:MappingContainer>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/META-INF/MANIFEST.MF
deleted file mode 100644
index 4f437fbc2c7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.bridge;singleton:=true
-Bundle-Version: 1.3.1.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.gmf.map;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.codegen;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.graphdef.codegen;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.gmf.runtime.notation;bundle-version="[1.10.0,2.0.0)"
-Export-Package: org.eclipse.papyrus.gmf.internal.bridge;
-  x-friends:="org.eclipse.gmf.tests,
-   org.eclipse.papyrus.gmf.bridge.trace,
-   org.eclipse.papyrus.gmf.codegen.ui,
-   org.eclipse.papyrus.gmf.bridge.ui",
- org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-  x-friends:="org.eclipse.gmf.tests,
-   org.eclipse.papyrus.gmf.codegen.ui,
-   org.eclipse.gmf.tests.lite,
-   org.eclipse.papyrus.gmf.bridge.ui",
- org.eclipse.papyrus.gmf.internal.bridge.naming;x-friends:="org.eclipse.gmf.tests",
- org.eclipse.papyrus.gmf.internal.bridge.naming.gen;x-friends:="org.eclipse.gmf.tests,org.eclipse.papyrus.gmf.codegen.ui,org.eclipse.papyrus.gmf.bridge.ui"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/build.properties
deleted file mode 100644
index 7a211abeeb0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               about.html,\
-               transforms/,\
-               plugin.xml
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/plugin.properties
deleted file mode 100644
index 0c1b2ab02d1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-pluginName = Papyrus GMF Models Bridging Plug-in
-providerName = Eclipse Modeling Project
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/plugin.xml
deleted file mode 100644
index f0dd52b4376..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-   <extension
-         point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
-      <unit
-            name="VisualIdentifierDispenser"
-            namespace="gmf">
-         <library
-               class="org.eclipse.papyrus.gmf.internal.bridge.genmodel.VisualIdentifierDispenserFacade">
-         </library>
-      </unit>
-    </extension>
-	<extension
-         point="org.eclipse.m2m.qvt.oml.runtime.qvtTransformation">
-                <library
-            file="transforms/Map2Gen.qvto"
-            id="transforms.Map2Gen">
-        </library>
-    </extension>
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/pom.xml
deleted file mode 100644
index d6d3ecc6518..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- * Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.bridge</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/History.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/History.java
deleted file mode 100644
index 00386ecb265..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/History.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenMetricRule;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-
-/**
- * Keep track of gmfmap-to-gmfgen transformation elements.
- * @author artem
- */
-public class History {
-	private final Map<NodeMapping, GenTopLevelNode> myTopNodeMap;	
-	private final Map<NodeMapping, Set<GenChildNode>> myNodeMap;
-	private final Map<LinkMapping, GenLink> myLinkMap;
-	private final Map<MetricRule, GenMetricRule> myMetricMap;
-
-	public History() {
-		myTopNodeMap = new HashMap<NodeMapping, GenTopLevelNode>();		
-		myNodeMap = new HashMap<NodeMapping, Set<GenChildNode>>();
-		myLinkMap = new HashMap<LinkMapping, GenLink>();
-		myMetricMap = new HashMap<MetricRule, GenMetricRule>();
-	}
-
-	/**
-	 * No more then 1 GenTopLevelNode may be logged for node mapping 
-	 */
-	public void log(NodeMapping nodeMap, GenTopLevelNode genNode) {
-		assert nodeMap != null && genNode != null && !myTopNodeMap.containsKey(nodeMap);
-		myTopNodeMap.put(nodeMap, genNode);
-	}	
-
-	/**
-	 * More than 1 GenChildNode may be logged for node mapping  
-	 * (to handle children taken from different containment/children features)
-	 */
-	public void log(NodeMapping nodeMap, GenChildNode genNode) {
-		assert nodeMap != null && genNode != null;
-		Set<GenChildNode> genNodes = myNodeMap.get(nodeMap);
-		if (genNodes == null) {
-			genNodes = new HashSet<GenChildNode>();
-			myNodeMap.put(nodeMap, genNodes);
-		}
-		genNodes.add(genNode);
-	}
-
-	/**
-	 * No more than 1 GenLink is allowed for link mapping.
-	 */
-	public void log(LinkMapping linkMap, GenLink genLink) {
-		assert linkMap != null && genLink != null && !myLinkMap.containsKey(linkMap);
-		myLinkMap.put(linkMap, genLink);
-	}
-	
-	public void log(MetricRule metric, GenMetricRule genMetric) {
-		assert metric != null && genMetric != null;
-		myMetricMap.put(metric, genMetric);
-	}
-	
-	public GenMetricRule find(MetricRule metric) {
-		assert metric != null;
-		return myMetricMap.get(metric);
-	}	
-	
-
-	public boolean isKnown(NodeMapping nodeMap) {
-		return isKnownTopNode(nodeMap) || isKnownChildNode(nodeMap);
-	}	
-		
-	public boolean isKnownTopNode(NodeMapping nodeMap) {
-		assert nodeMap != null;
-		return myTopNodeMap.containsKey(nodeMap);
-	}	
-	
-	public boolean isKnownChildNode(NodeMapping nodeMap) {
-		assert nodeMap != null;
-		// We don't check stored collections as there's no means to remove element from this history,
-		// thus, no way to get empty collection
-		return myNodeMap.containsKey(nodeMap);
-	}
-
-	public boolean isKnown(LinkMapping linkMap) {
-		assert linkMap != null;
-		return myLinkMap.containsKey(linkMap);
-	}
-
-	/**
-	 * @return never <code>null</code>>
-	 */
-	public GenChildNode[] findChildNodes(NodeMapping nodeMap) {
-		assert nodeMap != null;
-		Set<GenChildNode> genNodes = myNodeMap.get(nodeMap);
-		if (genNodes == null) {
-			return new GenChildNode[0];
-		}
-		return genNodes.toArray(new GenChildNode[genNodes.size()]);
-	}
-	
-	public GenTopLevelNode findTopNode(NodeMapping nodeMap) {
-		assert nodeMap != null;
-		return myTopNodeMap.get(nodeMap);
-	}
-	
-	public GenNode[] find(NodeMapping nodeMap) {
-		assert nodeMap != null;
-		GenNode genNode = findTopNode(nodeMap);
-		return genNode != null ? new GenNode[] {genNode} : findChildNodes(nodeMap);
-	}
-
-	public GenLink find(LinkMapping linkMap) {
-		assert linkMap != null;
-		return myLinkMap.get(linkMap);
-	}
-
-	public void purge() {
-		myTopNodeMap.clear();
-		myNodeMap.clear();
-		myLinkMap.clear();
-		myMetricMap.clear();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/Knowledge.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/Knowledge.java
deleted file mode 100644
index e4bdb1b8ad4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/Knowledge.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge;
-
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-
-/**
- * Handcoded decisions
- * @author artem
- */
-public class Knowledge {
-
-	/**
-	 * @return whether nodeMapping has single label, no children and node's diagram 
-	 * element is DiagramLabel equivalent that of it's label
-	 */
-	public static boolean isPureLabelNode(NodeMapping childNodeMapping) {
-		if (childNodeMapping.getLabelMappings().size() == 1 && childNodeMapping.getChildren().isEmpty()) {
-			LabelMapping soleLabel = childNodeMapping.getLabelMappings().get(0);
-			return childNodeMapping.getDiagramNode() == soleLabel.getDiagramLabel(); 
-		}
-		return false;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/NaiveIdentifierDispenser.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/NaiveIdentifierDispenser.java
deleted file mode 100644
index dc0cfe86e09..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/NaiveIdentifierDispenser.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroup;
-
-/**
- * Doesn't expect <code>get(whatever)</code> to be invoked more then once for the same argument instance.
- * @author artem
- */
-public class NaiveIdentifierDispenser implements VisualIdentifierDispenser {
-	protected static final int CANVAS_COUNT_BASE = 79;
-	protected static final int NODE_COUNT_BASE = 1000;
-	protected static final int CHILD_COUNT_BASE = 2000;
-	protected static final int LINK_COUNT_BASE = 3000;
-	protected static final int LABEL_COUNT_BASE = 4000;
-	protected static final int COMPARTMENT_COUNT_BASE = 5000;
-	
-	protected static final int TOOL_GROUP_COUNT_BASE = 0;
-
-	private int myNodeCount = 0;
-	private int myLinkCount = 0;
-	private int myChildCount = 0;
-	private int myLabelCount = 0;
-	private int myCompartmentCount = 0;
-	private int myToolGroupCount = 0;
-
-	public NaiveIdentifierDispenser() {
-	}
-
-	public int get(GenDiagram diagram) {
-		return CANVAS_COUNT_BASE;
-	}
-
-	public int get(GenTopLevelNode node) {
-		return NODE_COUNT_BASE + (++myNodeCount);
-	}
-
-	public int get(GenNodeLabel nodeLabel) {
-		return LABEL_COUNT_BASE + (++myLabelCount);
-	}
-
-	public int get(GenLink link) {
-		return LINK_COUNT_BASE + (++myLinkCount);
-	}
-
-	public int get(GenChildNode childNode) {
-		return CHILD_COUNT_BASE + (++myChildCount );
-	}
-
-	public int get(GenCompartment compartment) {
-		return COMPARTMENT_COUNT_BASE + (++myCompartmentCount);
-	}
-
-	public int get(GenLinkLabel label) {
-		return get((GenNodeLabel) null);
-	}
-
-	public int get(ToolGroup toolGroup) {
-		return TOOL_GROUP_COUNT_BASE + (++myToolGroupCount);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/StatefulVisualIdentifierDispencer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/StatefulVisualIdentifierDispencer.java
deleted file mode 100644
index 0d2c2ece5ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/StatefulVisualIdentifierDispencer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge;
-
-import org.eclipse.emf.common.util.URI;
-
-/**
- * XXX [artem] perhaps, passing ResourceSet to loadState would make sense provided 
- * implementations that keep links to the map/gen elements are possible? 
- */
-public interface StatefulVisualIdentifierDispencer extends VisualIdentifierDispenser {
-
-	/**
-	 * Loading internal state model connected with the specified map model URI
-	 */
-	void loadState(URI genModelFileURI);
-
-	/**
-	 * Saving internal state for future loadin by <code>loadState(..)</code>
-	 * method
-	 */
-	void saveState();
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/VisualIdentifierDispenser.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/VisualIdentifierDispenser.java
deleted file mode 100644
index f82c47adf01..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/VisualIdentifierDispenser.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroup;
-
-/**
- * @author artem
- */
-public interface VisualIdentifierDispenser {
-
-	int get(GenDiagram diagram);
-	int get(GenTopLevelNode node);
-	int get(GenNodeLabel nodeLabel);
-	int get(GenLink link);
-	int get(GenChildNode childNode);
-	int get(GenCompartment compartment);
-	int get(GenLinkLabel label);
-	int get(ToolGroup toolGroup);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/BasicDiagramRunTimeModelHelper.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/BasicDiagramRunTimeModelHelper.java
deleted file mode 100644
index bc2df09f4be..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/BasicDiagramRunTimeModelHelper.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-
-/**
- * Makes use of basic/standard classes for runtime presentation of diagram 
- * @author artem
- */
-public class BasicDiagramRunTimeModelHelper implements DiagramRunTimeModelHelper {
-	private GenClass myNode;
-	private GenClass myLink;
-	private GenClass myCanvas;
-	private boolean myIsLoaded = false;
-
-	public BasicDiagramRunTimeModelHelper() {
-	}
-
-	public GenClass get(NodeMapping nodeMapping) {
-		loadGenModel();
-		return myNode;
-	}
-
-	public GenClass get(LinkMapping linkMapping) {
-		loadGenModel();
-		return myLink;
-	}
-
-	public GenClass get(CanvasMapping canvasMapping) {
-		loadGenModel();
-		return myCanvas;
-	}
-
-	public GenClass getChildContainerDefault() {
-		loadGenModel();
-		return myNode;
-	}
-
-	public GenClass get(LabelMapping labelMapping) {
-		loadGenModel();
-		return myNode;
-	}
-
-	private void loadGenModel() {
-		if (myIsLoaded ) {
-			return;
-		}
-		myIsLoaded = true;
-		RuntimeGenModelAccess runtimeAccess = new RuntimeGenModelAccess();
-		runtimeAccess.ensure(); 
-		GenPackage gp = runtimeAccess.genPackage();
-		for (GenClass next  : gp.getGenClasses()) {
-			if (NotationPackage.eINSTANCE.getNode().getName().equals(next.getName())) {
-				myNode = next;
-			} else if (NotationPackage.eINSTANCE.getEdge().getName().equals(next.getName())) {
-				myLink = next;
-			} else if (NotationPackage.eINSTANCE.getDiagram().getName().equals(next.getName())) {
-				myCanvas = next;
-			}
-		}
-		// my... become proxies on unload
-		//runtimeAccess.unload();
-		assert myNode != null && myLink != null && myCanvas != null;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/BasicGenModelAccess.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/BasicGenModelAccess.java
deleted file mode 100644
index a3fe8cd579d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/BasicGenModelAccess.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-/**
- * @author artem
- */
-public class BasicGenModelAccess implements GenModelAccess {
-	private final EPackage model;
-
-	private GenModel genModel;
-
-	private final List<URI> locations = new LinkedList<URI>();
-
-	private boolean needUnload;
-
-	public BasicGenModelAccess(EPackage aModel) {
-		this.model = aModel;
-	}
-
-	public void initDefault() {
-		registerLocation(constructDefaultFromModel());
-		registerLocation(fromExtpoint());
-	}
-
-	protected final URI fromExtpoint() {
-		return fromExtpoint(model.getNsURI());
-	}
-
-	/**
-	 * Useful when nsURI changed over time to reference old URI of the model.
-	 * Otherwise {@link #fromExtpoint()} is enough.
-	 * 
-	 * @param nsURI
-	 * @return uri registered in ecore's extpoint, if any
-	 */
-	protected final URI fromExtpoint(String nsURI) {
-		return EcorePlugin.getEPackageNsURIToGenModelLocationMap().get(nsURI);
-	}
-
-	protected final URI constructDefaultFromModel() {
-		if (model.eResource() == null || model.getNsURI() == null) {
-			return null;
-		}
-		URI domainModelURI = model.eResource().getURI();
-		if (model.getNsURI().equals(domainModelURI.toString())) {
-			return null;
-		}
-		URI genModelURI = domainModelURI.trimFileExtension().appendFileExtension("genmodel");
-		if (genModelURI.equals(domainModelURI)) {
-			return null;
-		}
-		// XXX should keep distinct resourceSet with URI to use different rs
-		// while loading?
-		/*
-		 * //
-		 * 
-		 * @see org.eclipse.emf.importer.ModelImporter.getExternalGenModels()
-		 *      Resource genModelResource = rs.getResource(genModelURI, false);
-		 *      if (genModelResource == null) { genModelResource =
-		 *      rs.getResource(genModelURI, true); if (genModelResource != null) {
-		 *      return (GenModel) genModelResource.getContents().get(0); } }
-		 */
-		return genModelURI;
-	}
-
-	protected final EPackage original() {
-		return model;
-	}
-
-	public GenModel model() {
-		// if genModel == null load()?
-		return genModel;
-	}
-
-	public IStatus ensure() {
-		IStatus loadStatus = load();
-		if (loadStatus.isOK()) {
-			return loadStatus;
-		}
-		return createDummy();
-	}
-
-	public IStatus load() {
-		ResourceSet rs = model.eResource() == null || model.eResource().getResourceSet() == null ? new ResourceSetImpl() : model.eResource().getResourceSet();
-		return load(rs);
-	}
-
-	public IStatus load(ResourceSet rs) {
-		assert !locations.isEmpty(); // XXX if isEmpty() initDefault?
-
-		List<IStatus> exceptions = new LinkedList<IStatus>();
-		final String id = "org.eclipse.papyrus.gmf.bridge"; //$NON-NLS-1$
-		for (URI uri : locations) {
-			try {
-				Resource r = rs.getResource(uri, false);
-				needUnload = r == null || !r.isLoaded();
-				r = rs.getResource(uri, true);
-				if (r != null) {
-					genModel = (GenModel) r.getContents().get(0);
-					return Status.OK_STATUS;
-				}
-			} catch (WrappedException ex) {
-				exceptions.add(new Status(IStatus.ERROR, id, ex.getMessage(), ex.getCause()));
-			}
-		}
-		needUnload = false;
-		if (exceptions.isEmpty()) {
-			return Status.CANCEL_STATUS;
-		}
-		IStatus[] sa = exceptions.toArray(new IStatus[exceptions.size()]);
-		return new MultiStatus(id, 0, sa, "Problems while loading GenModel", null); //$NON-NLS-1$
-	}
-
-	/**
-	 * Use with care, model elements obtained earlier will become proxies.
-	 */
-	public void unload() {
-		if (needUnload && genModel != null) {
-			genModel.eResource().unload();
-			genModel = null;
-		}
-		needUnload = false;
-	}
-
-	public IStatus createDummy() {
-		return createDummy(null);
-	}
-
-	public IStatus createDummy(Collection<EPackage> additionalPackages) {
-		genModel = new DummyGenModel(model, additionalPackages).create();
-		confineInResource();
-		return Status.OK_STATUS;
-	}
-
-	private void confineInResource() {
-		Resource r = new ResourceSetImpl().createResource(URI.createGenericURI("uri", genModel.getModelPluginID(), null));
-		r.getContents().add(genModel);
-	}
-
-	public boolean hasLocations() {
-		return locations != null && !locations.isEmpty();
-	}
-
-	protected void registerLocation(URI location) {
-		if (location != null) {
-			locations.add(location);
-		}
-	}
-
-	protected void unregsiterLocation(URI location) {
-		locations.remove(location);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DefaultViewmapProducer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DefaultViewmapProducer.java
deleted file mode 100644
index 60892a3913a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DefaultViewmapProducer.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import java.util.LinkedHashSet;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.DefaultSizeAttributes;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FigureViewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ResizeConstraints;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.StyleAttributes;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ViewmapLayoutType;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.Direction;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.Layout;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.VisualFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.util.GMFGraphSwitch;
-
-/**
- * @author artem
- */
-public class DefaultViewmapProducer extends ViewmapProducer {
-	private final LayoutTypeSwitch myLayoutTypeSwitch = new LayoutTypeSwitch();
-	protected final LinkedHashSet<String> myDependencies = new LinkedHashSet<String>();
-	
-	public DefaultViewmapProducer() {
-		myDependencies.add("org.eclipse.draw2d"); //$NON-NLS-1$
-	}
-
-	public Viewmap create(Canvas canvasElement) {
-		FigureViewmap v = GMFGenFactory.eINSTANCE.createFigureViewmap();
-		v.setFigureQualifiedClassName("org.eclipse.draw2d.FreeformLayer");
-		return v;
-	}
-
-	public Viewmap create(Node node) {
-		FigureViewmap v = GMFGenFactory.eINSTANCE.createFigureViewmap();
-		v.setFigureQualifiedClassName("org.eclipse.draw2d.RoundedRectangle");
-		return v;
-	}
-
-	public Viewmap create(Connection link) {
-		FigureViewmap v = GMFGenFactory.eINSTANCE.createFigureViewmap();
-		v.setFigureQualifiedClassName("org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx");
-		myDependencies.add("org.eclipse.gmf.runtime.draw2d.ui"); //$NON-NLS-1$
-		return v;
-	}
-
-	public Viewmap create(Compartment compartment) {
-		FigureViewmap v = GMFGenFactory.eINSTANCE.createFigureViewmap();
-		// ShapeCompartmentFigure | NestedResizableCompartmentFigure
-		v.setFigureQualifiedClassName("XXX");
-		return v;
-	}
-
-	public Viewmap create(DiagramLabel label) {
-		FigureViewmap v = GMFGenFactory.eINSTANCE.createFigureViewmap();
-		v.setFigureQualifiedClassName("org.eclipse.draw2d.Label");
-		return v;
-	}
-
-	@Override
-	public String[] dependencies() {
-		return myDependencies.toArray(new String[myDependencies.size()]);
-	}
-
-	protected final void setupResizeConstraints(Viewmap viewmap, Node diagramNode){
-		Direction direction = diagramNode.getResizeConstraint();
-		if (direction == null || direction.getValue() == Direction.NSEW){
-			return;
-		}
-		ResizeConstraints constraints = GMFGenFactory.eINSTANCE.createResizeConstraints();
-		constraints.setResizeHandles(direction.getValue());
-		viewmap.getAttributes().add(constraints);
-	}
-	
-	protected final void setupLayoutType(Viewmap viewmap, Node diagramNode){
-		Figure figure = diagramNode.getFigure().getActualFigure();
-		ViewmapLayoutType type = myLayoutTypeSwitch.getLayoutType(figure.getLayout());
-		viewmap.setLayoutType(type);
-	}
-	
-	protected final void setupStyleAttributes(Viewmap viewmap, Figure figure){
-		if (viewmap == null || figure == null) {
-			return;
-		}
-		StyleAttributes attributes = GMFGenFactory.eINSTANCE.createStyleAttributes();
-		boolean fixedSomething = false;
-		if (figure.getFont() != null){
-			attributes.setFixedFont(true);
-			fixedSomething = true;
-		}
-		if (figure.getForegroundColor() != null){
-			attributes.setFixedForeground(true);
-			fixedSomething = true;
-		}
-		if (figure.getBackgroundColor() != null){
-			attributes.setFixedBackground(true);
-			fixedSomething = true;
-		}
-		
-		if (fixedSomething){
-			viewmap.getAttributes().add(attributes);
-		}
-	}
-	
-	/**
-	 * Intentionally limited to Node's.
-	 * It does not make sense to setup default size for labels, compartments, etc.
-	 */
-	protected final void setupDefaultSize(Viewmap viewmap, Node node) {
-		Figure figure = node.getFigure().getActualFigure();
-		Dimension defaultSize;
-		DefaultSizeFacet facet = findVF(node, DefaultSizeFacet.class);
-		if (facet != null){
-			defaultSize = facet.getDefaultSize();
-		} else {
-			defaultSize = figure.getPreferredSize();
-		}
-		
-		if (defaultSize != null){
-			DefaultSizeAttributes attributes = GMFGenFactory.eINSTANCE.createDefaultSizeAttributes();
-			attributes.setHeight(defaultSize.getDy());
-			attributes.setWidth(defaultSize.getDx());
-			viewmap.getAttributes().add(attributes);
-		}
-	}
-
-	protected static <T extends VisualFacet> T findVF(DiagramElement de, Class<T> facetClass) {
-		for (VisualFacet vf : de.getFacets()) {
-			if (facetClass.isInstance(vf)) {
-				return facetClass.cast(vf);
-			}
-		}
-		return null;
-	}
-
-	private static class LayoutTypeSwitch extends GMFGraphSwitch<ViewmapLayoutType> {
-		
-		public ViewmapLayoutType getLayoutType(Layout layout){
-			if (layout == null) {
-				return ViewmapLayoutType.UNKNOWN_LITERAL;
-			}
-			return doSwitch(layout instanceof LayoutRef ? ((LayoutRef) layout).getActual() : layout);
-		}
-		
-		@Override
-		public ViewmapLayoutType caseLayout(Layout object) {
-			return ViewmapLayoutType.UNKNOWN_LITERAL;
-		}
-		
-		@Override
-		public ViewmapLayoutType caseFlowLayout(FlowLayout layout) {
-			return layout.isForceSingleLine() ? ViewmapLayoutType.TOOLBAR_LAYOUT_LITERAL : ViewmapLayoutType.FLOW_LAYOUT_LITERAL;
-		}
-		
-		@Override
-		public ViewmapLayoutType caseXYLayout(XYLayout object) {
-			return ViewmapLayoutType.XY_LAYOUT_LITERAL;
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramGenModelTransformer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramGenModelTransformer.java
deleted file mode 100644
index 386cf29ad79..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramGenModelTransformer.java
+++ /dev/null
@@ -1,1606 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.IdentityHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenClassifier;
-import org.eclipse.emf.codegen.ecore.genmodel.GenDataType;
-import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EModelElement;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.DesignLabelModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ElementType;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ExpressionLabelModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ExpressionLabelParser;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ExternalParser;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FeatureLabelModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FeatureLinkModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenActionFactoryContributionItem;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenApplication;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenAuditContainer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenAuditContext;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenAuditRoot;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenAuditRule;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenAuditable;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenAuditedMetricTarget;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildContainer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildLabelNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildSideAffixedNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenConstraint;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenContextMenu;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenContributionItem;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagramElementTarget;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDomainAttributeTarget;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDomainElementTarget;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenElementInitializer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenExpressionInterpreter;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenExpressionProviderBase;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenExpressionProviderContainer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenFeatureInitializer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenFeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenFeatureValueSpec;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenGroupMarker;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLanguage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkConstraints;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenMeasurable;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenMenuManager;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenMetricContainer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenMetricRule;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNavigator;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNotationElementTarget;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenParserImplementation;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenParsers;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenPreferencePage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenPropertySheet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenReferenceNewElementSpec;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenRuleTarget;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenSeparator;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenSeverity;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenSharedContributionItem;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenStandardPreferencePage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenToolBarManager;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenVisualEffect;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.LabelModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.LabelOffsetAttributes;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.LabelTextAccessMethod;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.LinkLabelAlignment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.LinkModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.MetamodelType;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.OclChoiceParser;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.OpenDiagramBehaviour;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Palette;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.PredefinedEnumParser;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.PredefinedParser;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ProviderPriority;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.SpecializationType;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.StandardPreferencePages;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.TypeLinkModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.TypeModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ValueExpression;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.Direction;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.Pin;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.VisualFacet;
-import org.eclipse.papyrus.gmf.internal.bridge.History;
-import org.eclipse.papyrus.gmf.internal.bridge.Knowledge;
-import org.eclipse.papyrus.gmf.internal.bridge.NaiveIdentifierDispenser;
-import org.eclipse.papyrus.gmf.internal.bridge.VisualIdentifierDispenser;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.navigator.NavigatorHandler;
-import org.eclipse.papyrus.gmf.internal.bridge.tooldef.PaletteHandler;
-import org.eclipse.papyrus.gmf.internal.codegen.util.Extras;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.AuditRule;
-import org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.DesignLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.DiagramElementTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainElementTarget;
-import org.eclipse.papyrus.gmf.mappings.ElementInitializer;
-import org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureValueSpec;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.Language;
-import org.eclipse.papyrus.gmf.mappings.LinkConstraints;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.NotationElementTarget;
-import org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec;
-import org.eclipse.papyrus.gmf.mappings.Severity;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-import org.eclipse.papyrus.gmf.mappings.VisualEffectMapping;
-
-/**
- * Creates generation model from diagram definition.
- * 
- * @author artem
- */
-public class DiagramGenModelTransformer extends MappingTransformer {
-
-	private GenEditorGenerator myGenModel;
-
-	protected GenModelMatcher myGenModelMatch;
-
-	private final DiagramRunTimeModelHelper myDRTHelper;
-
-	private final ViewmapProducer myViewmaps;
-
-	private final VisualIdentifierDispenser myVisualIDs;
-
-	private final boolean rcp;
-
-	private final History myHistory;
-
-	private final Map<GenClass, ElementType> myProcessedTypes = new IdentityHashMap<GenClass, ElementType>(); // GenClass -> MetamodelType
-
-	private final Map<org.eclipse.papyrus.gmf.mappings.ValueExpression, ValueExpression> myProcessedExpressions;
-
-	private final PaletteHandler myPaletteProcessor;
-
-	private final NavigatorHandler myNavigatorProcessor;
-
-	private final PropertySheetHandler myPropertySheetProcessor;
-
-	private final EcoreGenModelMatcher myEcoreGenModelMatch;
-
-	private ExternalParser myDesignLabelParser;
-
-	private ExternalParser myAuxParser;
-
-	private GenContextMenu myDiagramContextMenu;
-
-	private GenAuditContext myDefaultAuditContext;
-
-	public static class Parameters {
-
-		public final DiagramRunTimeModelHelper diagramModelHelper;
-
-		public final ViewmapProducer viewmaps;
-
-		public final VisualIdentifierDispenser vidDispenser;
-
-		public final boolean rcp;
-
-		public Parameters(DiagramRunTimeModelHelper drtHelper, ViewmapProducer viewmaps, VisualIdentifierDispenser vidDispenser, boolean rcp) {
-			diagramModelHelper = drtHelper;
-			this.viewmaps = viewmaps;
-			this.vidDispenser = vidDispenser;
-			this.rcp = rcp;
-		}
-	}
-
-	public DiagramGenModelTransformer() {
-		this(new BasicDiagramRunTimeModelHelper());
-	}
-
-	public DiagramGenModelTransformer(DiagramRunTimeModelHelper drtHelper) {
-		this(new Parameters(drtHelper, new InnerClassViewmapProducer(), new NaiveIdentifierDispenser(), false));
-	}
-
-	public DiagramGenModelTransformer(Parameters opts) {
-		this(opts.diagramModelHelper, opts.viewmaps, opts.vidDispenser, opts.rcp);
-	}
-
-	private DiagramGenModelTransformer(DiagramRunTimeModelHelper drtHelper, ViewmapProducer viewmaps, VisualIdentifierDispenser visualIdD, boolean rcp) {
-		assert drtHelper != null && viewmaps != null;
-		myDRTHelper = drtHelper;
-		myViewmaps = viewmaps;
-		myVisualIDs = visualIdD;
-		this.rcp = rcp;
-		myHistory = new History();
-		myPaletteProcessor = new PaletteHandler();
-		myNavigatorProcessor = new NavigatorHandler();
-		myPropertySheetProcessor = new PropertySheetHandler();
-		myEcoreGenModelMatch = new EcoreGenModelMatcher();
-		myProcessedExpressions = new HashMap<org.eclipse.papyrus.gmf.mappings.ValueExpression, ValueExpression>();
-	}
-
-	/**
-	 * Optionally set GenModel to match ECore elements against. Should be
-	 * invoked prior to {@link MappingTransformer#transform(Mapping)}, otherwise
-	 * has no effect. Useful for tests (and other cases) when GenModel is not
-	 * known to EMF (and thus can't be obtained using EMF techniques).
-	 * 
-	 * @param emfGenModel
-	 *            EMF GenModel for domain model
-	 */
-	public void setEMFGenModel(GenModel emfGenModel) {
-		myGenModelMatch = new GenModelMatcher(emfGenModel);
-	}
-
-	public GenEditorGenerator getResult() {
-		return getGenEssence();
-	}
-
-	public History getTrace() {
-		return myHistory;
-	}
-
-	private GenEditorGenerator getGenEssence() {
-		if (myGenModel == null) {
-			myGenModel = GMFGenFactory.eINSTANCE.createGenEditorGenerator();
-		}
-		// init editor as well - transformer does not set any property to it, just make sure it's not null
-		if (myGenModel.getEditor() == null) {
-			myGenModel.setEditor(GMFGenFactory.eINSTANCE.createGenEditorView());
-		}
-		return myGenModel;
-	}
-
-	private GenDiagram getGenDiagram() {
-		if (getGenEssence().getDiagram() == null) {
-			getGenEssence().setDiagram(GMFGenFactory.eINSTANCE.createGenDiagram());
-		}
-		return getGenEssence().getDiagram();
-	}
-
-	private void initGenPlugin() {
-		if (getGenEssence().getPlugin() == null) {
-			getGenEssence().setPlugin(GMFGenFactory.eINSTANCE.createGenPlugin());
-		}
-	}
-
-	private void initGenUpdater() {
-		if (getGenEssence().getDiagramUpdater() == null) {
-			getGenEssence().setDiagramUpdater(GMFGenFactory.eINSTANCE.createGenDiagramUpdater());
-		}
-
-	}
-
-	private GenNavigator genGenNavigator() {
-		if (getGenEssence().getNavigator() == null) {
-			getGenEssence().setNavigator(GMFGenFactory.eINSTANCE.createGenNavigator());
-		}
-		return getGenEssence().getNavigator();
-	}
-
-	private Palette getGenPalette() {
-		Palette p = getGenDiagram().getPalette();
-		if (p == null) {
-			p = GMFGenFactory.eINSTANCE.createPalette();
-			getGenDiagram().setPalette(p);
-		}
-		return p;
-	}
-
-	private GenPropertySheet getPropertySheet() {
-		if (getGenEssence().getPropertySheet() == null) {
-			getGenEssence().setPropertySheet(GMFGenFactory.eINSTANCE.createGenPropertySheet());
-		}
-		return getGenEssence().getPropertySheet();
-	}
-
-	private GenParsers getGenParsers() {
-		// XXX meanwhile, we don't set any attributes to GenParsers (rather delegating to old, deprecated)
-		if (getGenEssence().getLabelParsers() == null) {
-			getGenEssence().setLabelParsers(GMFGenFactory.eINSTANCE.createGenParsers());
-			// unless bug #235113 is fixed, always do ParserService
-			getGenEssence().getLabelParsers().setExtensibleViaService(true);
-		}
-		return getGenEssence().getLabelParsers();
-	}
-
-	private GenContextMenu getDiagramContextMenu() {
-		if (myDiagramContextMenu == null) {
-			myDiagramContextMenu = GMFGenFactory.eINSTANCE.createGenContextMenu();
-			myDiagramContextMenu.getContext().add(getGenDiagram());
-			getGenEssence().getContextMenus().add(myDiagramContextMenu);
-		}
-		return myDiagramContextMenu;
-	}
-
-	protected void process(CanvasMapping mapping) {
-		if (myGenModelMatch == null && mapping.getDomainModel() != null) {
-			myGenModelMatch = new GenModelMatcher(mapping.getDomainModel());
-		}
-		myHistory.purge();
-		if (mapping.getPalette() != null) {
-			myPaletteProcessor.initialize(getGenPalette());
-			myPaletteProcessor.process(mapping.getPalette());
-		}
-		if (!rcp) {
-			myNavigatorProcessor.initialize(getGenDiagram(), genGenNavigator());
-		}
-		GenPackage primaryPackage = findGenPackage(mapping.getDomainModel());
-		getGenEssence().setDomainGenModel(primaryPackage == null ? null : primaryPackage.getGenModel());
-		getGenDiagram().setDomainDiagramElement(findGenClass(mapping.getDomainMetaElement()));
-		getGenDiagram().setDiagramRunTimeClass(findRunTimeClass(mapping));
-		getGenDiagram().setVisualID(myVisualIDs.get(getGenDiagram()));
-		getGenDiagram().setViewmap(myViewmaps.create(mapping.getDiagramCanvas()));
-		getGenDiagram().setIconProviderPriority(ProviderPriority.LOW_LITERAL); // override ElementTypeIconProvider
-		getGenDiagram().setValidationProviderPriority(ProviderPriority.LOW_LITERAL); // otherwise it's not available
-		if (getGenDiagram().getDomainDiagramElement() != null) {
-			// since diagram is the first entity to process consider it defines metamodel type
-			getGenDiagram().setElementType(GMFGenFactory.eINSTANCE.createMetamodelType());
-			myProcessedTypes.put(getGenDiagram().getDomainDiagramElement(), getGenDiagram().getElementType());
-		} else {
-			getGenDiagram().setElementType(GMFGenFactory.eINSTANCE.createNotationType());
-		}
-
-		initGenPlugin();
-		initGenUpdater();
-
-		myPropertySheetProcessor.initialize(getPropertySheet());
-		myPropertySheetProcessor.process(mapping);
-		addPreferencePages(getGenDiagram());
-
-		if (rcp) {
-			if (getGenEssence().getApplication() == null) {
-				GenApplication app = GMFGenFactory.eINSTANCE.createGenApplication();
-				addContributions(app);
-				getGenEssence().setApplication(app);
-			}
-		}
-		// XXX actually, better do it once whole transformation is complete
-		if (getGenDiagram().generateCreateShortcutAction()) {
-			getDiagramContextMenu().getItems().add(GMFGenFactory.eINSTANCE.createCreateShortcutAction());
-		}
-		// XXX ask Vano, if it's reasonable to generate LoadResourceAction only when there are shortcuts?
-		getDiagramContextMenu().getItems().add(GMFGenFactory.eINSTANCE.createLoadResourceAction());
-	}
-
-	protected void process(TopNodeReference topNode) {
-		final NodeMapping nme = topNode.getChild();
-		assert nme != null;
-		assertNodeMapping(nme);
-
-		GenTopLevelNode genNode = GMFGenFactory.eINSTANCE.createGenTopLevelNode();
-		getGenDiagram().getTopLevelNodes().add(genNode);
-		genNode.setDiagramRunTimeClass(findRunTimeClass(nme));
-		genNode.setModelFacet(createModelFacet(topNode));
-		genNode.setVisualID(myVisualIDs.get(genNode));
-		genNode.setViewmap(myViewmaps.create(nme.getDiagramNode()));
-		setupElementType(genNode);
-		myPaletteProcessor.process(nme, genNode);
-
-		processAbstractNode(nme, genNode);
-		myHistory.log(nme, genNode);
-
-		if (!rcp) {
-			myNavigatorProcessor.process(genNode);
-		}
-	}
-
-	protected void process(AuditContainer audits) {
-		if (audits != null) {
-			getGenEssence().setAudits(createGenAuditRoot(audits));
-		}
-	}
-
-	protected void process(MetricContainer metrics) {
-		if (metrics != null) {
-			GenMetricContainer genMetricContainer = GMFGenFactory.eINSTANCE.createGenMetricContainer();
-			for (MetricRule next : metrics.getMetrics()) {
-				genMetricContainer.getMetrics().add(createGenMetric(next));
-			}
-			getGenEssence().setMetrics(genMetricContainer);
-		}
-	}
-
-	private void process(ChildReference childNodeRef, GenChildContainer container) {
-		final NodeMapping childNodeMapping = childNodeRef.getChild();
-		assert childNodeMapping != null;
-		assertNodeMapping(childNodeMapping);
-
-		GenChildNode childNode;
-		if (!myHistory.isKnownChildNode(childNodeMapping)) {
-			childNode = createGenChildNode(childNodeRef);
-		} else {
-			GenChildNode[] alreadyKnownChildren = myHistory.findChildNodes(childNodeMapping);
-
-			childNode = null;
-			for (int i = 0; i < alreadyKnownChildren.length; i++) {
-				if (matchChildReferenceFeatures(childNodeRef, alreadyKnownChildren[i])) {
-					childNode = alreadyKnownChildren[i];
-					break;
-				}
-			}
-			if (childNode == null) { // no match
-				childNode = createGenChildNode(childNodeRef);
-			}
-		}
-		if (container instanceof GenCompartment && childNodeMapping.getChildren().size() > 0) {
-			// TODO just layout from childNodeMapping.getDiagramNode()
-			((GenCompartment) container).setListLayout(false);
-		}
-		container.getChildNodes().add(childNode);
-		if (!rcp) {
-			myNavigatorProcessor.process(childNode, container);
-		}
-	}
-
-	/**
-	 * Handle case when second-level ChildReference references existing
-	 * nodemapping, but with different containment/children reference.
-	 * 
-	 * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=129552
-	 */
-	private static boolean matchChildReferenceFeatures(ChildReference childNodeRef, GenChildNode childNode) {
-		final boolean containmentFeatureMatch;
-		final boolean childrenFeatureMatch;
-		if (childNode.getModelFacet() == null || childNode.getModelFacet().getContainmentMetaFeature() == null) {
-			containmentFeatureMatch = (null == childNodeRef.getContainmentFeature());
-		} else {
-			// seems legal to use '==' because features should came from the same model
-			containmentFeatureMatch = childNodeRef.getContainmentFeature() == childNode.getModelFacet().getContainmentMetaFeature().getEcoreFeature();
-		}
-		if (childNode.getModelFacet() == null || childNode.getModelFacet().getChildMetaFeature() == null) {
-			childrenFeatureMatch = (null == childNodeRef.getChildrenFeature());
-		} else {
-			if (childNodeRef.getChildrenFeature() == null) {
-				// likely, childMetaFeature in model facet was derived from containment feature 
-				childrenFeatureMatch = childNode.getModelFacet().getChildMetaFeature() == childNode.getModelFacet().getContainmentMetaFeature();
-			} else {
-				// honest check
-				childrenFeatureMatch = childNode.getModelFacet().getChildMetaFeature().getEcoreFeature() == childNodeRef.getChildrenFeature();
-			}
-		}
-		return containmentFeatureMatch && childrenFeatureMatch;
-	}
-
-	private GenChildNode createGenChildNode(ChildReference childNodeRef) {
-		final NodeMapping childNodeMapping = childNodeRef.getChild();
-		final GenChildNode childNode;
-		final boolean needCompartmentChildrenLabelProcessing;
-		if (Knowledge.isPureLabelNode(childNodeMapping)) {
-			LabelMapping soleLabel = childNodeMapping.getLabelMappings().get(0);
-			GenChildLabelNode childLabelNode = GMFGenFactory.eINSTANCE.createGenChildLabelNode();
-			childLabelNode.setViewmap(myViewmaps.create(soleLabel.getDiagramLabel()));
-			childLabelNode.setLabelModelFacet(createLabelModelFacet(soleLabel));
-			childLabelNode.setLabelReadOnly(soleLabel.isReadOnly());
-			childLabelNode.setLabelElementIcon(soleLabel.getDiagramLabel().isElementIcon());
-			childNode = childLabelNode;
-			needCompartmentChildrenLabelProcessing = false;
-		} else if (childNodeMapping.getDiagramNode().getAffixedParentSide() != Direction.NONE_LITERAL) {
-			GenChildSideAffixedNode sideAffixedNode = GMFGenFactory.eINSTANCE.createGenChildSideAffixedNode();
-			sideAffixedNode.setViewmap(myViewmaps.create(childNodeMapping.getDiagramNode()));
-			String positionConstantName = getAffixedSideAsPositionConstantsName(childNodeMapping.getDiagramNode());
-			sideAffixedNode.setPreferredSideName(positionConstantName);
-			childNode = sideAffixedNode;
-			needCompartmentChildrenLabelProcessing = true;
-		} else {
-			childNode = GMFGenFactory.eINSTANCE.createGenChildNode();
-			childNode.setViewmap(myViewmaps.create(childNodeMapping.getDiagramNode()));
-			needCompartmentChildrenLabelProcessing = true;
-		}
-		myHistory.log(childNodeMapping, childNode);
-		getGenDiagram().getChildNodes().add(childNode);
-
-		childNode.setModelFacet(createModelFacet(childNodeRef));
-
-		childNode.setDiagramRunTimeClass(findRunTimeClass(childNodeMapping));
-		childNode.setVisualID(myVisualIDs.get(childNode));
-		setupElementType(childNode);
-
-		myPaletteProcessor.process(childNodeMapping, childNode);
-		if (needCompartmentChildrenLabelProcessing) {
-			processAbstractNode(childNodeMapping, childNode);
-		}
-		return childNode;
-	}
-
-	private String getAffixedSideAsPositionConstantsName(Node diagramNode) {
-		Direction affixedSide = diagramNode.getAffixedParentSide();
-		final String ANY_SIDE = "NONE";
-		switch (affixedSide.getValue()) {
-		case Direction.NONE:
-			throw new IllegalStateException("DiagramNode: " + diagramNode + " is not side-affixed");
-		case Direction.EAST:
-		case Direction.NORTH:
-		case Direction.WEST:
-		case Direction.SOUTH:
-			return affixedSide.getName();
-
-		case Direction.NSEW:
-			return ANY_SIDE;
-
-		default:
-			//Runtime does not support this
-			return ANY_SIDE;
-		}
-	}
-
-	private void processAbstractNode(NodeMapping mapping, GenNode genNode) {
-		HashMap<CompartmentMapping, GenCompartment> compartments2GenCompartmentsMap = new HashMap<CompartmentMapping, GenCompartment>();
-		for (CompartmentMapping compartmentMapping : mapping.getCompartments()) {
-			GenCompartment compartmentGen = createGenCompartment(compartmentMapping, genNode);
-			compartments2GenCompartmentsMap.put(compartmentMapping, compartmentGen);
-		}
-
-		for (ChildReference childNodeRef : mapping.getChildren()) {
-			// Currently childNodeMapping should has compartment but we plan to make this reference optional
-			CompartmentMapping compartmentMapping = childNodeRef.getCompartment();
-			GenChildContainer genChildContainer;
-			if (compartmentMapping != null && compartments2GenCompartmentsMap.containsKey(compartmentMapping)) {
-				genChildContainer = compartments2GenCompartmentsMap.get(compartmentMapping);
-			} else {
-				genChildContainer = genNode;
-			}
-			process(childNodeRef, genChildContainer);
-		}
-		for (LabelMapping labelMapping : mapping.getLabelMappings()) {
-			createNodeLabel(genNode, labelMapping);
-		}
-		for (CanvasMapping nextRelatedCanvas : mapping.getRelatedDiagrams()) {
-			OpenDiagramBehaviour openDiagramPolicy = GMFGenFactory.eINSTANCE.createOpenDiagramBehaviour();
-			// ugly check that nodeMapping is related to owning canvasMapping, iow mapping.getCanvasMapping() == nextRelatedCanvas
-			if (nextRelatedCanvas.eResource() != mapping.eResource()) {
-				// unless we would like to ask user where to take appropriate .gmfgen...
-				openDiagramPolicy.setDiagramKind("FIXME put GenEditorGenerator.modelID value here");
-				openDiagramPolicy.setEditorID("FIXME put GenEditorView.id value here");
-			}
-			genNode.getBehaviour().add(openDiagramPolicy);
-		}
-
-		createVisualEffects(mapping, genNode, mapping.getDiagramNode());
-	}
-
-	private void createVisualEffects(MappingEntry mapping, GenCommonBase genCommon, DiagramElement diagramElement) {
-		for (VisualEffectMapping visualEffectMapping : mapping.getVisualEffects()) {
-			createVisualEffect(genCommon, visualEffectMapping, diagramElement);
-		}
-	}
-
-	private GenCompartment createGenCompartment(CompartmentMapping mapping, GenNode genNode) {
-		Compartment compartment = mapping.getCompartment();
-		assert compartment != null;
-		GenCompartment childCompartment = GMFGenFactory.eINSTANCE.createGenCompartment();
-		getGenDiagram().getCompartments().add(childCompartment);
-		genNode.getCompartments().add(childCompartment);
-		childCompartment.setVisualID(myVisualIDs.get(childCompartment));
-		childCompartment.setDiagramRunTimeClass(getChildContainerRunTimeClass());
-		childCompartment.setViewmap(myViewmaps.create(mapping.getCompartment()));
-		childCompartment.setCanCollapse(compartment.isCollapsible());
-		childCompartment.setNeedsTitle(compartment.isNeedsTitle());
-		childCompartment.setTitle(compartment.getName());
-
-		return childCompartment;
-	}
-
-	protected void process(LinkMapping lme) {
-		assertLinkMapping(lme);
-		GenLink gl = GMFGenFactory.eINSTANCE.createGenLink();
-		getGenDiagram().getLinks().add(gl);
-		gl.setModelFacet(createModelFacet(lme));
-		gl.setVisualID(myVisualIDs.get(gl));
-		myPaletteProcessor.process(lme, gl);
-		for (LabelMapping labelMapping : lme.getLabelMappings()) {
-			createLinkLabel(gl, labelMapping);
-		}
-		gl.setDiagramRunTimeClass(findRunTimeClass(lme));
-
-		setupElementType(gl);
-
-		gl.setViewmap(myViewmaps.create(lme.getDiagramLink()));
-
-		if (lme.getCreationConstraints() != null) {
-			gl.setCreationConstraints(createLinkCreationConstraints(lme.getCreationConstraints()));
-		}
-
-		myHistory.log(lme, gl);
-		if (!rcp) {
-			myNavigatorProcessor.process(gl);
-		}
-
-		createVisualEffects(lme, gl, lme.getDiagramLink());
-	}
-
-	@Override
-	protected void complete() {
-		List<String> requiredPlugins = getGenEssence().getPlugin().getRequiredPlugins();
-		final String GMF_TOOLING_RUNTIME = "org.eclipse.gmf.tooling.runtime"; //$NON-NLS-1$
-		requiredPlugins.add(GMF_TOOLING_RUNTIME);
-		requiredPlugins.addAll(Arrays.asList(myViewmaps.dependencies()));
-	}
-
-	//	private void process(AppearanceSteward appSteward) {
-	//		if (appSteward.getAppearanceStyle() == null) {
-	//			return;
-	//		}
-	//		
-	//	}
-
-	private GenNodeLabel createNodeLabel(GenNode node, LabelMapping mapping) {
-		GenNodeLabel label;
-		if (mapping.getDiagramLabel().isExternal()) {
-			label = GMFGenFactory.eINSTANCE.createGenExternalNodeLabel();
-		} else {
-			label = GMFGenFactory.eINSTANCE.createGenNodeLabel();
-		}
-		node.getLabels().add(label);
-		label.setVisualID(myVisualIDs.get(label));
-		label.setDiagramRunTimeClass(findRunTimeClass(mapping));
-		label.setViewmap(myViewmaps.create(mapping.getDiagramLabel()));
-		label.setModelFacet(createLabelModelFacet(mapping));
-		label.setReadOnly(mapping.isReadOnly());
-		label.setElementIcon(mapping.getDiagramLabel().isElementIcon());
-		return label;
-	}
-
-	private void createVisualEffect(GenCommonBase parent, VisualEffectMapping mapping, DiagramElement parentDiagramElement) {
-		GenVisualEffect visualEffect = GMFGenFactory.eINSTANCE.createGenVisualEffect();
-		parent.getBehaviour().add(visualEffect);
-
-		Pin graphPin = mapping.getDiagramPin();
-
-		String name = graphPin.getName();
-
-		visualEffect.setName(name);
-		visualEffect.setPinKind(graphPin.eClass().getName());
-
-		String operationName = graphPin.getOperationName();
-
-		FigureDescriptor graphFigureDescriptor = parentDiagramElement.getFigure();
-
-		if (!hasFigurePin(graphFigureDescriptor.getActualFigure(), graphPin)) {
-			for (ChildAccess graphChildAccess : graphFigureDescriptor.getAccessors()) {
-				if (hasFigurePin(graphChildAccess.getFigure(), graphPin)) {
-					operationName = graphChildAccess.getAccessor() + "()." + operationName;
-					break;
-				}
-			}
-		}
-
-		visualEffect.setOperationName(operationName);
-		visualEffect.setOperationType(graphPin.getOperationType());
-		visualEffect.setOclExpression(mapping.getOclExpression());
-
-		String editPolicyQualifiedClassName = parent.getDiagram().getEditPoliciesPackageName() + '.'//
-				+ CodeGenUtil.capName(CodeGenUtil.validJavaIdentifier(name)) + parent.getVisualID() //
-				+ "Policy";
-
-		visualEffect.setEditPolicyQualifiedClassName(editPolicyQualifiedClassName);
-		visualEffect.setKey(editPolicyQualifiedClassName + ".KEY");
-	}
-
-	private boolean hasFigurePin(Figure figure, Pin pin) {
-		RealFigure realFigure = (figure instanceof FigureRef) //
-		? ((FigureRef) figure).getFigure() //
-				: (RealFigure) figure;
-		return realFigure.getPins().contains(pin);
-	}
-
-	private GenLinkLabel createLinkLabel(GenLink link, LabelMapping mapping) {
-		GenLinkLabel label = GMFGenFactory.eINSTANCE.createGenLinkLabel();
-		link.getLabels().add(label);
-		label.setVisualID(myVisualIDs.get(label));
-		label.setDiagramRunTimeClass(findRunTimeClass(mapping));
-		label.setViewmap(myViewmaps.create(mapping.getDiagramLabel()));
-		label.setModelFacet(createLabelModelFacet(mapping));
-		label.setReadOnly(mapping.isReadOnly());
-		label.setElementIcon(mapping.getDiagramLabel().isElementIcon());
-		if (findVF(mapping.getDiagramLabel(), AlignmentFacet.class) != null) {
-			AlignmentFacet af = findVF(mapping.getDiagramLabel(), AlignmentFacet.class);
-			label.setAlignment(getLinkLabelAlignment(af.getAlignment()));
-		}
-		LabelOffsetAttributes loa = GMFGenFactory.eINSTANCE.createLabelOffsetAttributes();
-		LabelOffsetFacet lof = findVF(mapping.getDiagramLabel(), LabelOffsetFacet.class);
-		if (lof != null) {
-			loa.setX(lof.getX());
-			loa.setY(lof.getY());
-		} else {
-			// stack labels under link by default
-			int weight = link.getLabels().size() + 1;
-			loa.setY(weight * 20);
-		}
-		label.getViewmap().getAttributes().add(loa);
-		return label;
-	}
-
-	private static <T extends VisualFacet> T findVF(DiagramElement element, Class<T> facetClass) {
-		for (VisualFacet vf : element.getFacets()) {
-			if (facetClass.isInstance(vf)) {
-				return facetClass.cast(vf);
-			}
-		}
-		return null;
-	}
-
-	private LinkLabelAlignment getLinkLabelAlignment(Alignment alignment) {
-		switch (alignment.getValue()) {
-		case Alignment.BEGINNING:
-			return LinkLabelAlignment.SOURCE_LITERAL;
-		case Alignment.CENTER:
-			return LinkLabelAlignment.MIDDLE_LITERAL;
-		case Alignment.END:
-			return LinkLabelAlignment.TARGET_LITERAL;
-		default:
-			throw new IllegalArgumentException("Link doesn't support alignment:" + alignment.getName());
-		}
-	}
-
-	private LabelModelFacet createLabelModelFacet(LabelMapping mapping) {
-		if (mapping instanceof FeatureLabelMapping) {
-			FeatureLabelMapping flMapping = (FeatureLabelMapping) mapping;
-			FeatureLabelModelFacet modelFacet = GMFGenFactory.eINSTANCE.createFeatureLabelModelFacet();
-			for (EAttribute attr : flMapping.getFeatures()) {
-				modelFacet.getMetaFeatures().add(findGenFeature(attr));
-			}
-			for (EAttribute attr : flMapping.getEditableFeatures()) {
-				modelFacet.getEditableMetaFeatures().add(findGenFeature(attr));
-			}
-			modelFacet.setViewPattern(flMapping.getViewPattern());
-			modelFacet.setEditorPattern(flMapping.getEditorPattern());
-			modelFacet.setEditPattern(flMapping.getEditPattern());
-			if (flMapping.eIsSet(GMFMapPackage.eINSTANCE.getFeatureLabelMapping_ViewMethod())) {
-				modelFacet.setViewMethod(LabelTextAccessMethod.get(flMapping.getViewMethod().getValue()));
-			}
-			if (flMapping.eIsSet(GMFMapPackage.eINSTANCE.getFeatureLabelMapping_EditMethod())) {
-				modelFacet.setEditMethod(LabelTextAccessMethod.get(flMapping.getEditMethod().getValue()));
-			}
-			// XXX temp code
-			modelFacet.setParser(getOrCreateParser(flMapping));
-			// XXX
-			return modelFacet;
-		}
-		if (mapping instanceof OclChoiceLabelMapping) {
-			OclChoiceLabelMapping oclMapping = (OclChoiceLabelMapping) mapping;
-			FeatureLabelModelFacet modelFacet = GMFGenFactory.eINSTANCE.createFeatureLabelModelFacet();
-			GenFeature feature = findGenFeature(oclMapping.getFeature());
-			modelFacet.getMetaFeatures().add(feature);
-			modelFacet.getEditableMetaFeatures().add(feature);
-			modelFacet.setParser(createOclChoiceParser(oclMapping));
-			return modelFacet;
-		}
-		if (mapping instanceof DesignLabelMapping) {
-			DesignLabelModelFacet modelFacet = GMFGenFactory.eINSTANCE.createDesignLabelModelFacet();
-			modelFacet.setParser(getOrCreateParser((DesignLabelMapping) mapping));
-			return modelFacet;
-		}
-		if (mapping instanceof ExpressionLabelMapping) {
-			ExpressionLabelModelFacet modelFacet = GMFGenFactory.eINSTANCE.createExpressionLabelModelFacet();
-			ExpressionLabelParser parser = GMFGenFactory.eINSTANCE.createExpressionLabelParser();
-			ExpressionLabelMapping elm = (ExpressionLabelMapping) mapping;
-			parser.setExpressionContext(findGenClass(elm.getMapEntry().getDomainContext()));
-			if (elm.getViewExpression() != null) {
-				parser.setViewExpression(createValueExpression(elm.getViewExpression()));
-			}
-			if (elm.getEditExpression() != null) {
-				parser.setEditExpression(createValueExpression(elm.getEditExpression()));
-			}
-			if (elm.getValidateExpression() != null) {
-				parser.setValidateExpression(createGenConstraint(elm.getValidateExpression()));
-			}
-			modelFacet.setParser(parser);
-			getGenParsers().getImplementations().add(parser);
-			return modelFacet;
-		}
-		// create bare instance that points to a ExternalParser
-		// this is modification of old contract (though, not breaking change, I believe)
-		// that says null modelFacet means use of external parser
-		LabelModelFacet modelFacet = GMFGenFactory.eINSTANCE.createLabelModelFacet();
-		modelFacet.setParser(getOrCreateParser(mapping));
-		return modelFacet;
-	}
-
-	private void setupElementType(GenNode genNode) {
-		if (genNode.getModelFacet() != null) {
-			MetamodelType metamodelType = (MetamodelType) myProcessedTypes.get(genNode.getModelFacet().getMetaClass());
-			if (metamodelType == null) {
-				// this is the first metaclass encounter; consider metamodel type definition
-				genNode.setElementType(GMFGenFactory.eINSTANCE.createMetamodelType());
-				myProcessedTypes.put(genNode.getModelFacet().getMetaClass(), genNode.getElementType());
-			} else {
-				// all subsequent encounters lead to specialization definitions
-				SpecializationType specializationType = GMFGenFactory.eINSTANCE.createSpecializationType();
-				specializationType.setMetamodelType(metamodelType);
-				genNode.setElementType(specializationType);
-			}
-		} else {
-			genNode.setElementType(GMFGenFactory.eINSTANCE.createNotationType());
-		}
-	}
-
-	private void setupElementType(GenLink gl) {
-		if (gl.getModelFacet() != null) {
-			if (gl.getModelFacet() instanceof TypeModelFacet) {
-				GenClass metaClass = ((TypeModelFacet) gl.getModelFacet()).getMetaClass();
-				MetamodelType metamodelType = (MetamodelType) myProcessedTypes.get(metaClass);
-				if (metamodelType == null) {
-					// this is the first metaclass encounter; consider metamodel type definition
-					gl.setElementType(GMFGenFactory.eINSTANCE.createMetamodelType());
-					myProcessedTypes.put(metaClass, gl.getElementType());
-				} else {
-					// all subsequent encounters lead to specialization definitions
-					SpecializationType specializationType = GMFGenFactory.eINSTANCE.createSpecializationType();
-					specializationType.setMetamodelType(metamodelType);
-					gl.setElementType(specializationType);
-				}
-			} else {
-				// ref-based link; specialize null
-				SpecializationType specializationType = GMFGenFactory.eINSTANCE.createSpecializationType();
-				gl.setElementType(specializationType);
-			}
-		} else {
-			gl.setElementType(GMFGenFactory.eINSTANCE.createNotationType());
-		}
-	}
-
-	private GenClass findRunTimeClass(NodeMapping nme) {
-		return myDRTHelper.get(nme);
-	}
-
-	private GenClass findRunTimeClass(LinkMapping lme) {
-		return myDRTHelper.get(lme);
-	}
-
-	private GenClass findRunTimeClass(CanvasMapping mapping) {
-		return myDRTHelper.get(mapping);
-	}
-
-	private GenClass getChildContainerRunTimeClass() {
-		return myDRTHelper.getChildContainerDefault();
-	}
-
-	private GenClass findRunTimeClass(LabelMapping mapping) {
-		return myDRTHelper.get(mapping);
-	}
-
-	private void assertNodeMapping(NodeMapping mapping) {
-		assert mapping.getDiagramNode() != null;
-		assert checkLabelMappings(mapping);
-	}
-
-	private void assertLinkMapping(LinkMapping linkMapping) {
-		assert linkMapping.getDiagramLink() != null;
-		if (linkMapping.getDomainMetaElement() != null) {
-			assert linkMapping.getLinkMetaFeature() != null;
-		}
-		assert checkLabelMappings(linkMapping);
-	}
-
-	private static boolean checkLabelMappings(MappingEntry entry) {
-		for (LabelMapping labelMapping : (Collection<? extends LabelMapping>) entry.getLabelMappings()) {
-			if (labelMapping instanceof FeatureLabelMapping) {
-				final EClass domainElement = labelMapping.getMapEntry().getDomainContext();
-				for (EAttribute attr : (Collection<? extends EAttribute>) ((FeatureLabelMapping) labelMapping).getFeatures()) {
-					if (!Extras.isSuperTypeOf(attr.getEContainingClass(), domainElement)) {
-						return false;
-					}
-				}
-			}
-		}
-		return true;
-	}
-
-	private GenPackage findGenPackage(EPackage ePackage) {
-		if (myGenModelMatch == null) {
-			warnNoGenModelMatcher(ePackage);
-			return null;
-		}
-		return myGenModelMatch.findGenPackage(ePackage);
-	}
-
-	private GenClass findGenClass(EClass eClass) {
-		if (myGenModelMatch == null) {
-			warnNoGenModelMatcher(eClass);
-			return null;
-		}
-		return myGenModelMatch.findGenClass(eClass);
-	}
-
-	private GenFeature findGenFeature(EStructuralFeature feature) {
-		if (myGenModelMatch == null) {
-			warnNoGenModelMatcher(feature);
-			return null;
-		}
-		return myGenModelMatch.findGenFeature(feature);
-	}
-
-	private void warnNoGenModelMatcher(EModelElement element) {
-		// TODO : emit warning
-	}
-
-	private TypeModelFacet createModelFacet(NodeReference anm) {
-		final NodeMapping nodeMapping = anm.getChild();
-		if (nodeMapping.getDomainContext() == null) {
-			return null;
-		}
-		TypeModelFacet typeModelFacet = setupModelFacet(nodeMapping.getDomainContext(), anm.getContainmentFeature(), anm.getChildrenFeature());
-		return setupAux(typeModelFacet, nodeMapping.getDomainSpecialization(), nodeMapping.getDomainInitializer());
-	}
-
-	private LinkModelFacet createModelFacet(LinkMapping lme) {
-		if (lme.getDomainMetaElement() != null) {
-			TypeLinkModelFacet mf = GMFGenFactory.eINSTANCE.createTypeLinkModelFacet();
-			mf.setMetaClass(findGenClass(lme.getDomainMetaElement()));
-			mf.setContainmentMetaFeature(findGenFeature(lme.getContainmentFeature()));
-			mf.setChildMetaFeature(mf.getContainmentMetaFeature());
-			mf.setSourceMetaFeature(findGenFeature(lme.getSourceMetaFeature()));
-			mf.setTargetMetaFeature(findGenFeature(lme.getLinkMetaFeature()));
-			setupAux(mf, lme.getDomainSpecialization(), lme.getDomainInitializer());
-			return mf;
-		} else if (lme.getLinkMetaFeature() != null) {
-			FeatureLinkModelFacet mf = GMFGenFactory.eINSTANCE.createFeatureLinkModelFacet();
-			mf.setMetaFeature(findGenFeature(lme.getLinkMetaFeature()));
-			return mf;
-		}
-		return null; // notation link
-	}
-
-	private GenLinkConstraints createLinkCreationConstraints(LinkConstraints constraints) {
-		LinkMapping lme = constraints.getLinkMapping();
-		if (lme == null) {
-			return null;
-		}
-		GenLinkConstraints genConstraints = GMFGenFactory.eINSTANCE.createGenLinkConstraints();
-		Constraint sourceConstraint = constraints.getSourceEnd();
-		if (sourceConstraint != null) {
-			genConstraints.setSourceEnd(createGenConstraint(sourceConstraint));
-		}
-		Constraint targetConstraint = constraints.getTargetEnd();
-		if (targetConstraint != null) {
-			genConstraints.setTargetEnd(createGenConstraint(targetConstraint));
-		}
-		return genConstraints;
-	}
-
-	private TypeModelFacet setupModelFacet(EClass domainMetaElement, EStructuralFeature containmentFeature, EStructuralFeature childFeature) {
-		TypeModelFacet mf = GMFGenFactory.eINSTANCE.createTypeModelFacet();
-		mf.setMetaClass(findGenClass(domainMetaElement));
-		mf.setContainmentMetaFeature(findGenFeature(containmentFeature));
-		mf.setChildMetaFeature(childFeature == null ? mf.getContainmentMetaFeature() : findGenFeature(childFeature));
-		return mf;
-	}
-
-	/**
-	 * @return typeModelFacet argument for convenience
-	 */
-	private TypeModelFacet setupAux(TypeModelFacet typeModelFacet, Constraint spec, ElementInitializer init) {
-		// construct model element selector for domain EClass specializations if any exist
-		if (spec != null) {
-			typeModelFacet.setModelElementSelector(createGenConstraint(spec));
-		}
-		if (init != null) {
-			typeModelFacet.setModelElementInitializer(createElementInitializer(init));
-		}
-		return typeModelFacet;
-	}
-
-	private GenElementInitializer createElementInitializer(ElementInitializer elementInitializer) {
-		if (elementInitializer instanceof FeatureSeqInitializer) {
-			FeatureSeqInitializer fsInitializer = (FeatureSeqInitializer) elementInitializer;
-			GenFeatureSeqInitializer genFsInitializer = GMFGenFactory.eINSTANCE.createGenFeatureSeqInitializer();
-			for (FeatureInitializer next : fsInitializer.getInitializers()) {
-				genFsInitializer.getInitializers().add(createGenFeatureInitializer(next));
-			}
-			if (fsInitializer.eIsSet(GMFMapPackage.eINSTANCE.getFeatureSeqInitializer_ElementClass())) {
-				genFsInitializer.setElementClass(findGenClass(fsInitializer.getElementClass()));
-			}
-			return genFsInitializer;
-		}
-		return null;
-	}
-
-	private GenFeatureInitializer createGenFeatureInitializer(FeatureInitializer featureInitializer) {
-		if (featureInitializer instanceof FeatureValueSpec) {
-			FeatureValueSpec featureValSpec = (FeatureValueSpec) featureInitializer;
-			GenFeatureValueSpec genFeatureValSpec = GMFGenFactory.eINSTANCE.createGenFeatureValueSpec();
-			genFeatureValSpec.setFeature(findGenFeature(featureValSpec.getFeature()));
-			genFeatureValSpec.setValue(createValueExpression(featureValSpec.getValue()));
-
-			return genFeatureValSpec;
-		} else if (featureInitializer instanceof ReferenceNewElementSpec) {
-			ReferenceNewElementSpec newElementSpec = (ReferenceNewElementSpec) featureInitializer;
-			GenReferenceNewElementSpec genNewElementSpec = GMFGenFactory.eINSTANCE.createGenReferenceNewElementSpec();
-			genNewElementSpec.setFeature(findGenFeature(newElementSpec.getFeature()));
-			for (FeatureSeqInitializer next : newElementSpec.getNewElementInitializers()) {
-				GenFeatureSeqInitializer nextGenFeatureSeqInitializer = (GenFeatureSeqInitializer) createElementInitializer(next);
-				genNewElementSpec.getNewElementInitializers().add(nextGenFeatureSeqInitializer);
-			}
-			return genNewElementSpec;
-		}
-		assert false : "Unrecognized FeatureInitializer type"; //$NON-NLS-1$
-		return null;
-	}
-
-	private static GenLanguage detectGenLanguage(Language mapLang) {
-		switch (mapLang.getValue()) {
-		case Language.OCL:
-			return GenLanguage.OCL_LITERAL;
-		case Language.JAVA:
-			return GenLanguage.JAVA_LITERAL;
-		case Language.REGEXP:
-			return GenLanguage.REGEXP_LITERAL;
-		case Language.NREGEXP:
-			return GenLanguage.NREGEXP_LITERAL;
-		case Language.LITERAL:
-			return GenLanguage.LITERAL_LITERAL;
-		default:
-			assert false : mapLang;
-		}
-		return GenLanguage.OCL_LITERAL;
-	}
-
-	// may return GenConstraint, based on original expression type
-	// XXX perhaps, combining #createValueExpression and #createGenConstraint into a single method makes sense?
-	private ValueExpression createValueExpression(org.eclipse.papyrus.gmf.mappings.ValueExpression valueExpression) {
-		if (valueExpression instanceof Constraint) {
-			return createGenConstraint((Constraint) valueExpression);
-		}
-		ValueExpression result = GMFGenFactory.eINSTANCE.createValueExpression();
-		result.setBody(valueExpression.getBody());
-		return bindToProvider(valueExpression, result);
-	}
-
-	private GenConstraint createGenConstraint(Constraint constraint) {
-		if (constraint.getBody() == null) {
-			return null;
-		}
-		GenConstraint genConstraint = GMFGenFactory.eINSTANCE.createGenConstraint();
-		genConstraint.setBody(constraint.getBody());
-		return bindToProvider(constraint, genConstraint);
-	}
-
-	private GenAuditRoot createGenAuditRoot(AuditContainer ac) {
-		GenAuditRoot root = GMFGenFactory.eINSTANCE.createGenAuditRoot();
-		LinkedList<AuditContainer> containers = new LinkedList<AuditContainer>();
-		containers.add(ac);
-		// parent container to it's path
-		final HashMap<AuditContainer, LinkedList<GenAuditContainer>> pathMap = new HashMap<AuditContainer, LinkedList<GenAuditContainer>>();
-		do {
-			AuditContainer nextChild = containers.removeFirst();
-			GenAuditContainer gac = GMFGenFactory.eINSTANCE.createGenAuditContainer();
-			gac.setId(nextChild.getId());
-			gac.setName(nextChild.getName());
-			gac.setDescription(nextChild.getDescription());
-			// FIXME setPath
-			if (pathMap.containsKey(nextChild.getParentContainer())) {
-				gac.getPath().addAll(pathMap.get(nextChild.getParentContainer()));
-			}
-			gac.getPath().add(gac);
-			// collect next level
-			if (nextChild.getChildContainers().size() > 0) {
-				containers.addAll(nextChild.getChildContainers());
-				pathMap.put(nextChild, new LinkedList<GenAuditContainer>(gac.getPath()));
-			}
-			root.getCategories().add(gac);
-			for (AuditRule next : nextChild.getAudits()) {
-				final GenAuditRule auditRule = createGenAudit(next);
-				auditRule.setCategory(gac);
-				root.getRules().add(auditRule);
-				// Here's the logic used to be in GMFGen. Basically, all rules with targets != null
-				// get a context (emf.validation), which is a scope or set of elements audit is evaluated against.
-				// For certain cases, e.g. diagram elements as audit targets, special logic to select these
-				// elements should get generated - to filter diagram views by visualID, and hence
-				// there's another implementation of IClientSelector and dedicated context.
-				if (auditRule.getTarget() instanceof GenDiagramElementTarget) {
-					GenDiagramElementTarget gdet = (GenDiagramElementTarget) auditRule.getTarget();
-					// Next used to live in GenDiagramElementTargetImpl#getClientContextID()
-					//
-					// Present approach relies on id matching not to create duplicating contexts,
-					// however, smarter way is to match context's target and its elements.
-					StringBuilder buf = new StringBuilder("Ctx"); //$NON-NLS-1$
-					for (GenCommonBase nextElement : gdet.getElement()) {
-						buf.append('_');
-						int id = nextElement.getVisualID();
-						if (id < 0) {
-							buf.append('n');
-						}
-						buf.append(id);
-					}
-					String clientContextID = buf.toString();
-					GenAuditContext ctx = null;
-					for (GenAuditContext x : root.getClientContexts()) {
-						if (clientContextID.equals(x.getId())) {
-							ctx = x;
-							break;
-						}
-					}
-					if (ctx == null) {
-						ctx = GMFGenFactory.eINSTANCE.createGenAuditContext();
-						ctx.setId(clientContextID);
-						root.getClientContexts().add(ctx);
-					}
-					gdet.setContextSelector(ctx);
-				} else if (auditRule.getTarget() != null) {
-					if (myDefaultAuditContext == null) {
-						myDefaultAuditContext = GMFGenFactory.eINSTANCE.createGenAuditContext();
-						root.getClientContexts().add(myDefaultAuditContext);
-					}
-					auditRule.getTarget().setContextSelector(myDefaultAuditContext);
-				}
-			}
-		} while (!containers.isEmpty());
-		return root;
-	}
-
-	private GenAuditRule createGenAudit(AuditRule audit) {
-		GenAuditRule genAudit = GMFGenFactory.eINSTANCE.createGenAuditRule();
-		genAudit.setId(audit.getId());
-		genAudit.setName(audit.getName());
-		genAudit.setMessage(audit.getMessage());
-		genAudit.setDescription(audit.getDescription());
-		genAudit.setUseInLiveMode(audit.isUseInLiveMode());
-
-		if (audit.getTarget() != null) {
-			GenRuleTarget genTarget = createRuleTarget(audit.getTarget());
-			assert genTarget instanceof GenAuditable;
-			if (genTarget instanceof GenAuditable) {
-				genAudit.setTarget((GenAuditable) genTarget);
-			}
-		}
-		Constraint rule = audit.getRule();
-		if (rule != null) {
-			genAudit.setRule(createGenConstraint(rule));
-		}
-
-		Severity severity = audit.getSeverity();
-		GenSeverity genSeverity = null;
-		if (severity == Severity.INFO_LITERAL) {
-			genSeverity = GenSeverity.INFO_LITERAL;
-		} else if (severity == Severity.WARNING_LITERAL) {
-			genSeverity = GenSeverity.WARNING_LITERAL;
-		} else if (severity == Severity.ERROR_LITERAL) {
-			genSeverity = GenSeverity.ERROR_LITERAL;
-		}
-		if (genSeverity != null) {
-			genAudit.setSeverity(genSeverity);
-		}
-		return genAudit;
-	}
-
-	private GenRuleTarget createRuleTarget(EObject ruleTarget) {
-		if (ruleTarget instanceof DomainElementTarget) {
-			DomainElementTarget domainTarget = (DomainElementTarget) ruleTarget;
-			GenDomainElementTarget genDomainTarget = GMFGenFactory.eINSTANCE.createGenDomainElementTarget();
-			genDomainTarget.setElement(domainTarget.getElement() != null ? findGenClass(domainTarget.getElement()) : null);
-			return genDomainTarget;
-		} else if (ruleTarget instanceof NotationElementTarget) {
-			NotationElementTarget notationTarget = (NotationElementTarget) ruleTarget;
-			GenNotationElementTarget genNotationTarget = GMFGenFactory.eINSTANCE.createGenNotationElementTarget();
-			// XXX findGenClass gives GenClass from domain model, is that what's expected here (NotationTarget)?
-			genNotationTarget.setElement(notationTarget.getElement() != null ? findGenClass(notationTarget.getElement()) : null);
-			return genNotationTarget;
-
-		} else if (ruleTarget instanceof DiagramElementTarget) {
-			GenDiagramElementTarget diagramTarget = GMFGenFactory.eINSTANCE.createGenDiagramElementTarget();
-			MappingEntry mappingEntry = ((DiagramElementTarget) ruleTarget).getElement();
-			if (mappingEntry != null) {
-				LinkMapping lm = mappingEntry instanceof LinkMapping ? (LinkMapping) mappingEntry : null;
-				GenCommonBase genBase = null;
-				if (lm != null) {
-					genBase = myHistory.find(lm);
-					assert genBase != null;
-					boolean isGenBaseNull = genBase == null;
-					if (!isGenBaseNull) {
-						diagramTarget.getElement().add(genBase);
-					}
-				} else {
-					NodeMapping nm = mappingEntry instanceof NodeMapping ? (NodeMapping) mappingEntry : null;
-					// There may be few GenChildNodes corresponding to same mapping entry.					
-					// @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=136701					
-					genBase = myHistory.findTopNode(nm);
-					if (genBase != null) {
-						diagramTarget.getElement().add(genBase);
-					}
-					diagramTarget.getElement().addAll(Arrays.asList(myHistory.findChildNodes(nm)));
-				}
-			}
-			return diagramTarget;
-		} else if (ruleTarget instanceof AuditedMetricTarget) {
-			GenAuditedMetricTarget genMetricTarget = GMFGenFactory.eINSTANCE.createGenAuditedMetricTarget();
-			AuditedMetricTarget metricTarget = (AuditedMetricTarget) ruleTarget;
-			if (metricTarget.getMetric() != null) {
-				genMetricTarget.setMetric(myHistory.find(metricTarget.getMetric()));
-			}
-			GenClassifier resultClassifier = myEcoreGenModelMatch.findGenClassifier(EcorePackage.eINSTANCE.getEDoubleObject());
-			assert resultClassifier instanceof GenDataType;
-			if (resultClassifier instanceof GenDataType) {
-				genMetricTarget.setMetricValueContext((GenDataType) resultClassifier);
-			}
-			return genMetricTarget;
-		} else if (ruleTarget instanceof DomainAttributeTarget) {
-			DomainAttributeTarget attrTarget = (DomainAttributeTarget) ruleTarget;
-			GenDomainAttributeTarget genAttrTarget = GMFGenFactory.eINSTANCE.createGenDomainAttributeTarget();
-			if (attrTarget.getAttribute() != null) {
-				genAttrTarget.setAttribute(findGenFeature(attrTarget.getAttribute()));
-			}
-			genAttrTarget.setNullAsError(attrTarget.isNullAsError());
-			return genAttrTarget;
-		} else {
-			assert false : "Unknown rule target type"; //$NON-NLS-1$
-		}
-		return null;
-	}
-
-	private GenMetricRule createGenMetric(MetricRule metric) {
-		GenMetricRule genMetric = GMFGenFactory.eINSTANCE.createGenMetricRule();
-		genMetric.setKey(metric.getKey());
-		genMetric.setName(metric.getName());
-		genMetric.setDescription(metric.getDescription());
-		genMetric.setLowLimit(metric.getLowLimit());
-		genMetric.setHighLimit(metric.getHighLimit());
-
-		if (metric.getRule() != null) {
-			genMetric.setRule(createValueExpression(metric.getRule()));
-		}
-
-		if (metric.getTarget() != null) {
-			GenRuleTarget genTarget = createRuleTarget(metric.getTarget());
-			assert genTarget instanceof GenMeasurable;
-			if (genTarget instanceof GenMeasurable) {
-				genMetric.setTarget((GenMeasurable) genTarget);
-			}
-		}
-		myHistory.log(metric, genMetric);
-		return genMetric;
-	}
-
-	/**
-	 * ValueExpressions may be reused, as such clients should treat second
-	 * argument as template and record return value as actual expression.
-	 * 
-	 * FIXME when ValueExpression in Java language and non-empty body, create
-	 * JavaProvider with injectBody set to true. Also respect this condition in
-	 * search for existing provider
-	 * 
-	 * @return actual gmfgen::ValueExpression to reference
-	 */
-	private <T extends ValueExpression> T bindToProvider(org.eclipse.papyrus.gmf.mappings.ValueExpression expression, T genExpression) {
-		if (myProcessedExpressions.containsKey(expression)) {
-			// Note: may have already been bound during transformation of reused node mapping
-			@SuppressWarnings("unchecked")
-			T reuse = (T) myProcessedExpressions.get(expression);
-			return reuse;
-		}
-		GenLanguage language = detectGenLanguage(expression.getLanguage());
-		if (language == null) {
-			return genExpression;
-		}
-		GenExpressionProviderContainer providerContainer = getGenEssence().getExpressionProviders();
-		if (providerContainer == null) {
-			providerContainer = GMFGenFactory.eINSTANCE.createGenExpressionProviderContainer();
-			getGenEssence().setExpressionProviders(providerContainer);
-		}
-		GenExpressionProviderBase provider = null;
-		for (GenExpressionProviderBase nextProvider : providerContainer.getProviders()) {
-			if (language.equals(nextProvider.getLanguage())) {
-				provider = nextProvider;
-				break;
-			}
-		}
-		if (provider == null) {
-			provider = createExpressionProvider(language);
-			providerContainer.getProviders().add(provider);
-		}
-		provider.getExpressions().add(genExpression);
-		myProcessedExpressions.put(expression, genExpression);
-		return genExpression;
-	}
-
-	private GenExpressionProviderBase createExpressionProvider(GenLanguage language) {
-		switch (language.getValue()) {
-		case GenLanguage.JAVA:
-			return GMFGenFactory.eINSTANCE.createGenJavaExpressionProvider();
-		case GenLanguage.OCL:
-		case GenLanguage.REGEXP:
-		case GenLanguage.NREGEXP: {
-			GenExpressionInterpreter regexpProvider = GMFGenFactory.eINSTANCE.createGenExpressionInterpreter();
-			regexpProvider.setLanguage(language);
-			return regexpProvider;
-		}
-		case GenLanguage.LITERAL:
-			return GMFGenFactory.eINSTANCE.createGenLiteralExpressionProvider();
-		default: {
-			assert false : language;
-			return GMFGenFactory.eINSTANCE.createGenExpressionInterpreter();
-			// fake provider with no language set to fail validation (XXX perhaps, makes sense to add 'unrecognized' language?)
-		}
-		}
-	}
-
-	private void addPreferencePages(GenDiagram diagram) {
-		GenPreferencePage general = createStandardPreferencePage(diagram, "general", diagram.getEditorGen().getModelID() + " Diagram", StandardPreferencePages.GENERAL_LITERAL);
-		diagram.getPreferencePages().add(general);
-		general.getChildren().add(createStandardPreferencePage(diagram, "appearance", "Appearance", StandardPreferencePages.APPEARANCE_LITERAL));
-		general.getChildren().add(createStandardPreferencePage(diagram, "connections", "Connections", StandardPreferencePages.CONNECTIONS_LITERAL));
-		general.getChildren().add(createStandardPreferencePage(diagram, "printing", "Printing", StandardPreferencePages.PRINTING_LITERAL));
-		general.getChildren().add(createStandardPreferencePage(diagram, "rulersAndGrid", "Rulers And Grid", StandardPreferencePages.RULERS_AND_GRID_LITERAL));
-	}
-
-	private GenPreferencePage createStandardPreferencePage(GenDiagram diagram, String id, String name, StandardPreferencePages kind) {
-		GenStandardPreferencePage page = GMFGenFactory.eINSTANCE.createGenStandardPreferencePage();
-		page.setID(diagram.getEditorGen().getPlugin().getID() + '.' + id);
-		page.setName(name);
-		page.setKind(kind);
-		return page;
-	}
-
-	private void addContributions(GenApplication application) {
-		GenMenuManager mainMenu = GMFGenFactory.eINSTANCE.createGenMenuManager();
-		mainMenu.getItems().add(createFileMenu(application.getSharedContributionItems()));
-		mainMenu.getItems().add(createEditMenu(application.getSharedContributionItems()));
-		mainMenu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS")); //$NON-NLS-1$
-		mainMenu.getItems().add(createWindowMenu(application.getSharedContributionItems()));
-		mainMenu.getItems().add(createHelpMenu(application.getSharedContributionItems()));
-		application.setMainMenu(mainMenu);
-
-		GenToolBarManager mainToolBar = GMFGenFactory.eINSTANCE.createGenToolBarManager();
-		mainToolBar.getItems().add(createGroupMarker("\"group.file\"")); //$NON-NLS-1$
-		mainToolBar.getItems().add(createFileToolBar(application.getSharedContributionItems()));
-		mainToolBar.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS")); //$NON-NLS-1$
-		mainToolBar.getItems().add(createGroupMarker("\"group.nav\"")); //$NON-NLS-1$
-		mainToolBar.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.GROUP_EDITOR")); //$NON-NLS-1$
-		mainToolBar.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.GROUP_HELP")); //$NON-NLS-1$
-		mainToolBar.getItems().add(createHelpToolBar(application.getSharedContributionItems()));
-		application.setMainToolBar(mainToolBar);
-	}
-
-	private GenGroupMarker createGroupMarker(String groupName) {
-		GenGroupMarker gm = GMFGenFactory.eINSTANCE.createGenGroupMarker();
-		gm.setGroupName(groupName);
-		return gm;
-	}
-
-	private GenSeparator createSeparator(String groupName) {
-		GenSeparator s = GMFGenFactory.eINSTANCE.createGenSeparator();
-		s.setGroupName(groupName);
-		return s;
-	}
-
-	private GenActionFactoryContributionItem createActionFactoryItem(String name) {
-		GenActionFactoryContributionItem item = GMFGenFactory.eINSTANCE.createGenActionFactoryContributionItem();
-		item.setName(name);
-		return item;
-	}
-
-	private GenSharedContributionItem createSharedItem(List<GenContributionItem> sharedItems, GenContributionItem actualItem) {
-		GenSharedContributionItem sitem = GMFGenFactory.eINSTANCE.createGenSharedContributionItem();
-		if (actualItem instanceof GenActionFactoryContributionItem) {
-			GenActionFactoryContributionItem afActualItem = (GenActionFactoryContributionItem) actualItem;
-			for (GenContributionItem item : sharedItems) {
-				if (item instanceof GenActionFactoryContributionItem) {
-					GenActionFactoryContributionItem afItem = (GenActionFactoryContributionItem) item;
-					if (afItem.getName().equals(afActualItem.getName())) {
-						// shared action factory item is already contributed
-						sitem.setActualItem(afItem);
-						actualItem = null;
-						break;
-					}
-				}
-			}
-		}
-		if (actualItem != null) {
-			sitem.setActualItem(actualItem);
-			sharedItems.add(actualItem);
-		}
-		return sitem;
-	}
-
-	private GenMenuManager createFileMenu(List<GenContributionItem> sharedItems) {
-		GenMenuManager menu = GMFGenFactory.eINSTANCE.createGenMenuManager();
-		menu.setID("org.eclipse.ui.IWorkbenchActionConstants.M_FILE"); //$NON-NLS-1$
-		menu.setName("&File"); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.FILE_START")); //$NON-NLS-1$
-		GenMenuManager newMenu = GMFGenFactory.eINSTANCE.createGenMenuManager();
-		newMenu.setID("\"new\""); //$NON-NLS-1$
-		newMenu.setName("&New"); //$NON-NLS-1$
-		newMenu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS")); //$NON-NLS-1$
-		menu.getItems().add(newMenu);
-		menu.getItems().add(GMFGenFactory.eINSTANCE.createGenSeparator());
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS")); //$NON-NLS-1$
-		menu.getItems().add(GMFGenFactory.eINSTANCE.createGenSeparator());
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("CLOSE"))); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("CLOSE_ALL"))); //$NON-NLS-1$
-		menu.getItems().add(GMFGenFactory.eINSTANCE.createGenSeparator());
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("SAVE"))); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("SAVE_AS"))); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("SAVE_ALL"))); //$NON-NLS-1$
-		menu.getItems().add(GMFGenFactory.eINSTANCE.createGenSeparator());
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("QUIT"))); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.FILE_END")); //$NON-NLS-1$
-		return menu;
-	}
-
-	private GenMenuManager createEditMenu(List<GenContributionItem> sharedItems) {
-		GenMenuManager menu = GMFGenFactory.eINSTANCE.createGenMenuManager();
-		menu.setID("org.eclipse.ui.IWorkbenchActionConstants.M_EDIT"); //$NON-NLS-1$
-		menu.setName("&Edit"); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.EDIT_START")); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("UNDO"))); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("REDO"))); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.UNDO_EXT")); //$NON-NLS-1$
-		menu.getItems().add(GMFGenFactory.eINSTANCE.createGenSeparator());
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("CUT"))); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("COPY"))); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("PASTE"))); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.CUT_EXT")); //$NON-NLS-1$
-		menu.getItems().add(GMFGenFactory.eINSTANCE.createGenSeparator());
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("DELETE"))); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("SELECT_ALL"))); //$NON-NLS-1$
-		menu.getItems().add(GMFGenFactory.eINSTANCE.createGenSeparator());
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.ADD_EXT")); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.EDIT_END")); //$NON-NLS-1$
-		menu.getItems().add(createSeparator("org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS")); //$NON-NLS-1$
-		return menu;
-	}
-
-	private GenMenuManager createWindowMenu(List<GenContributionItem> sharedItems) {
-		GenMenuManager menu = GMFGenFactory.eINSTANCE.createGenMenuManager();
-		menu.setID("org.eclipse.ui.IWorkbenchActionConstants.M_WINDOW"); //$NON-NLS-1$
-		menu.setName("&Window"); //$NON-NLS-1$
-		menu.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("OPEN_NEW_WINDOW"))); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS")); //$NON-NLS-1$
-		// TODO : menu.add(ContributionItemFactory.OPEN_WINDOWS.create(window));
-		return menu;
-	}
-
-	private GenMenuManager createHelpMenu(List<GenContributionItem> sharedItems) {
-		GenMenuManager menu = GMFGenFactory.eINSTANCE.createGenMenuManager();
-		menu.setID("org.eclipse.ui.IWorkbenchActionConstants.M_HELP"); //$NON-NLS-1$
-		menu.setName("&Help"); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.HELP_START")); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.HELP_END")); //$NON-NLS-1$
-		menu.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS")); //$NON-NLS-1$
-		return menu;
-	}
-
-	private GenToolBarManager createFileToolBar(List<GenContributionItem> sharedItems) {
-		GenToolBarManager toolBar = GMFGenFactory.eINSTANCE.createGenToolBarManager();
-		toolBar.setID("org.eclipse.ui.IWorkbenchActionConstants.TOOLBAR_FILE"); //$NON-NLS-1$
-		toolBar.getItems().add(createSeparator("org.eclipse.ui.IWorkbenchActionConstants.NEW_GROUP")); //$NON-NLS-1$
-		toolBar.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.NEW_EXT")); //$NON-NLS-1$
-		toolBar.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.SAVE_GROUP")); //$NON-NLS-1$
-		toolBar.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("SAVE"))); //$NON-NLS-1$
-		toolBar.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.SAVE_EXT")); //$NON-NLS-1$
-		toolBar.getItems().add(createSharedItem(sharedItems, createActionFactoryItem("PRINT"))); //$NON-NLS-1$
-		toolBar.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.PRINT_EXT")); //$NON-NLS-1$
-		toolBar.getItems().add(createSeparator("org.eclipse.ui.IWorkbenchActionConstants.MB_ADDITIONS")); //$NON-NLS-1$
-		return toolBar;
-	}
-
-	private GenToolBarManager createHelpToolBar(List<GenContributionItem> sharedItems) {
-		GenToolBarManager toolBar = GMFGenFactory.eINSTANCE.createGenToolBarManager();
-		toolBar.setID("org.eclipse.ui.IWorkbenchActionConstants.TOOLBAR_HELP"); //$NON-NLS-1$
-		toolBar.getItems().add(createSeparator("org.eclipse.ui.IWorkbenchActionConstants.GROUP_HELP")); //$NON-NLS-1$
-		toolBar.getItems().add(createGroupMarker("org.eclipse.ui.IWorkbenchActionConstants.GROUP_APP")); //$NON-NLS-1$
-		return toolBar;
-	}
-
-	private GenParserImplementation getOrCreateParser(FeatureLabelMapping flMapping) {
-		if (isEnumLabelMapping(flMapping)) {
-			return getOrCreateEnumParser(flMapping);
-		} else {
-			return getOrCreatePredefinedParser(flMapping);
-		}
-	}
-	
-	private boolean isEnumLabelMapping(FeatureLabelMapping flMapping) {
-		EList<EAttribute> features = flMapping.getFeatures();
-		EList<EAttribute> editFeatures = flMapping.getEditableFeatures();
-		if (features.size() != 1){
-			return false;
-		}
-		if (editFeatures.size() > features.size()){
-			return false;
-		}
-		if (!editFeatures.isEmpty() && editFeatures.get(0) != features.get(0)) {
-			return false;
-		}
-		return features.get(0).getEType() instanceof EEnum;
-	}
-
-	private GenParserImplementation getOrCreateEnumParser(FeatureLabelMapping flMapping) {
-		for (GenParserImplementation pi : getGenParsers().getImplementations()) {
-			if (pi instanceof PredefinedEnumParser) {
-				return (PredefinedEnumParser) pi;
-			}
-		}
-		PredefinedEnumParser result = GMFGenFactory.eINSTANCE.createPredefinedEnumParser();
-		getGenParsers().getImplementations().add(result);
-		return result;
-	}
-
-	private GenParserImplementation createOclChoiceParser(OclChoiceLabelMapping oclMapping) {
-		OclChoiceParser result = GMFGenFactory.eINSTANCE.createOclChoiceParser();
-		if (oclMapping.getItemsExpression() != null) {
-			result.setItemsExpression(createValueExpression(oclMapping.getItemsExpression()));
-		}
-		if (oclMapping.getShowExpression() != null) {
-			result.setShowExpression(createValueExpression(oclMapping.getShowExpression()));
-		}
-		getGenParsers().getImplementations().add(result);
-		return result;
-	}
-
-	private GenParserImplementation getOrCreatePredefinedParser(FeatureLabelMapping flMapping) {
-		final LabelTextAccessMethod editMethod = LabelTextAccessMethod.get(flMapping.getEditMethod().getValue());
-		final LabelTextAccessMethod viewMethod = LabelTextAccessMethod.get(flMapping.getViewMethod().getValue());
-		for (GenParserImplementation pi : getGenParsers().getImplementations()) {
-			if (pi instanceof PredefinedParser) {
-				PredefinedParser pp = (PredefinedParser) pi;
-				boolean same = pp.getEditMethod() == editMethod;
-				same &= pp.getViewMethod() == viewMethod;
-				if (same) {
-					return pp;
-				}
-			}
-		}
-		PredefinedParser result = GMFGenFactory.eINSTANCE.createPredefinedParser();
-		result.setEditMethod(editMethod);
-		result.setViewMethod(viewMethod);
-		getGenParsers().getImplementations().add(result);
-		return result;
-	}
-
-	private GenParserImplementation getOrCreateParser(DesignLabelMapping flMapping) {
-		if (myDesignLabelParser == null) {
-			myDesignLabelParser = GMFGenFactory.eINSTANCE.createExternalParser();
-			getGenParsers().getImplementations().add(myDesignLabelParser);
-		}
-		return myDesignLabelParser;
-	}
-
-	private GenParserImplementation getOrCreateParser(LabelMapping flMapping) {
-		if (myAuxParser == null) {
-			myAuxParser = GMFGenFactory.eINSTANCE.createExternalParser();
-			getGenParsers().getImplementations().add(myAuxParser);
-		}
-		return myAuxParser;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramRunTimeModelHelper.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramRunTimeModelHelper.java
deleted file mode 100644
index aac0074007e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramRunTimeModelHelper.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-
-/**
- * Bridges diagram definition elements with classes that represent diagram at runtime.
- * @author artem
- */
-public interface DiagramRunTimeModelHelper {
-
-	public GenClass get(NodeMapping nodeMapping);
-
-	public GenClass get(LinkMapping linkMapping);
-
-	public GenClass get(CanvasMapping canvasMapping);
-
-	public GenClass getChildContainerDefault();
-
-	public GenClass get(LabelMapping mapping);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramRunTimeModelTransformer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramRunTimeModelTransformer.java
deleted file mode 100644
index 21417c9f419..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DiagramRunTimeModelTransformer.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Identity;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-
-/**
- * Creates bare extended version of basic Diagram Run-Time model from gmfmap. 
- * This extended version is expected to be modified by toolsmith to capture additional
- * attributes/features of diagram.
- * @author artem
- */
-public class DiagramRunTimeModelTransformer extends MappingTransformer {
-	private final EPackage myPackage;
-
-	public DiagramRunTimeModelTransformer(String modelName, String modelNsURI) {
-		myPackage = EcoreFactory.eINSTANCE.createEPackage();
-		myPackage.setName(modelName);
-		myPackage.setNsPrefix(modelName+"-drt");
-		myPackage.setNsURI(modelNsURI);
-	}
-
-	public EPackage getResult() {
-		return myPackage;
-	}
-
-	protected void process(CanvasMapping cme) {
-		addEClass(cme.getDiagramCanvas(), NotationPackage.eINSTANCE.getDiagram());
-	}
-
-	protected void process(TopNodeReference topNode) {
-		addEClass(topNode.getChild().getDiagramNode(), NotationPackage.eINSTANCE.getNode());
-	}
-
-	protected void process(LinkMapping lme) {
-		addEClass(lme.getDiagramLink(), NotationPackage.eINSTANCE.getEdge());
-	}
-
-	private void addEClass(Identity diaDefElement, EClass superClass) {
-		EClass c = createEClass(diaDefElement.getName(), superClass);
-		myPackage.getEClassifiers().add(c);
-//		for (Iterator it = diaDefElement.getProperties().iterator(); it.hasNext();) {
-//			RunTimeProperty p = (RunTimeProperty) it.next();
-//			EAttribute a = EcoreFactory.eINSTANCE.createEAttribute();
-//			a.setName(p.getName());
-//			a.setEType(EcorePackage.eINSTANCE.getEString());
-//			c.getEStructuralFeatures().add(a);
-//		}
-	}
-
-	private EClass createEClass(String name, EClass superClass) {
-		EClass c = EcoreFactory.eINSTANCE.createEClass();
-		c.setName(name);
-		c.getESuperTypes().add(superClass);
-		return c;
-	}
-
-	protected void process(AuditContainer audits) {
-	}
-
-	protected void process(MetricContainer metrics) {
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DummyGenModel.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DummyGenModel.java
deleted file mode 100644
index aefe58c61e9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/DummyGenModel.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModelFactory;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * @see org.eclipse.emf.codegen.ecore.Generator#run(java.lang.Object) (-ecore2GenModel key)
- * @author artem
- */
-public class DummyGenModel {
-	protected final EPackage myModel;
-	protected final Collection<EPackage> myAdditionalPackages;
-	private String myPluginID;
-
-	public DummyGenModel(EPackage primaryPackage, Collection<EPackage> additionalPackages) {
-		assert primaryPackage != null;
-		myModel = primaryPackage;
-		myAdditionalPackages = additionalPackages;
-	}
-
-	public GenModel create() {
-		GenModel genModel = GenModelFactory.eINSTANCE.createGenModel();
-		if (myAdditionalPackages == null) {
-			genModel.initialize(Collections.singleton(myModel));
-		} else {
-			LinkedHashSet<EPackage> allPacks = new LinkedHashSet<EPackage>();
-			allPacks.add(myModel);
-			allPacks.addAll(myAdditionalPackages);
-			genModel.initialize(allPacks);
-		}
-		final String pluginID = getPluginID();
-		genModel.setModelName(getModelName());
-		genModel.setModelPluginID(pluginID);
-		genModel.setModelDirectory("/" + pluginID + "/src/"); //$NON-NLS-1$ //$NON-NLS-2$
-
-		// need different prefix to avoid name collisions with code generated
-		// for domain model
-		final String basePackage = asValidPackageName(pluginID);
-		for (GenPackage genPackage : genModel.getGenPackages()) {
-			if (basePackage != null) {
-				if (basePackage.endsWith('.' + genPackage.getEcorePackage().getName())) {
-					genPackage.setBasePackage(basePackage.substring(0, basePackage.lastIndexOf('.')));
-				} else {
-					genPackage.setBasePackage(basePackage);
-				}
-			}
-			genPackage.setPrefix(constructGenPackagePrefix(genPackage));
-		}
-		return genModel;
-	}
-
-	protected String constructGenPackagePrefix(GenPackage genPackage) {
-		return CodeGenUtil.capName(genPackage.getEcorePackage().getName());
-	}
-
-	protected String getModelName() {
-		return CodeGenUtil.capName(myModel.getName());
-	}
-
-	public void setPluginID(String pluginID) {
-		myPluginID = pluginID;
-	}
-
-	private String getPluginID() {
-		if (myPluginID == null) {
-			return "org.sample." + getModelName().toLowerCase(); //$NON-NLS-1$
-		}
-		return myPluginID;
-	}
-
-	private String asValidPackageName(String pluginID) {
-		String rv = pluginID.toLowerCase();
-		final String complianceLevel = JavaCore.VERSION_1_4;
-		if (JavaConventions.validatePackageName(rv, complianceLevel, complianceLevel).getSeverity() != IStatus.ERROR) {
-			return rv;
-		}
-		StringBuilder sb = new StringBuilder(rv.length());
-		StringTokenizer st = new StringTokenizer(rv, "."); //$NON-NLS-1$
-		while (st.hasMoreTokens()) {
-			if (appendOnlyJavaChars(sb, st.nextToken())) {
-				sb.append('.');
-			}
-		}
-		if (sb.length() == 0) {
-			return null;
-		}
-		sb.setLength(sb.length() - 1); // strip last dot
-		if (!Character.isJavaIdentifierStart(sb.charAt(0))) {
-			sb.insert(0, 'a');
-		}
-		assert JavaConventions.validatePackageName(sb.toString(), complianceLevel, complianceLevel).isOK();
-		return sb.toString();
-	}
-
-	private static boolean appendOnlyJavaChars(StringBuilder sb, String rv) {
-		boolean added = false;
-		for (int i = 0; i < rv.length(); i++) {
-			if (Character.isJavaIdentifierPart(rv.charAt(i))) {
-				sb.append(rv.charAt(i));
-				added = true;
-			}
-		}
-		return added;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/EcoreGenModelMatcher.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/EcoreGenModelMatcher.java
deleted file mode 100644
index a52eeebebd2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/EcoreGenModelMatcher.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *     Radek Dvorak (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenClassifier;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.codegen.ecore.genmodel.impl.GenBaseImpl;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-
-/**
- * Provides access to Ecore genmodel elements.
- * <p>
- * The purpose of this matcher is to return referenceable genmodel elements for 
- * ecore generated elements. The standard matcher returns fake singleton elements 
- * without eResource set for EcorePackage.eINSTANCE.XXX input.
- * <p>
- * (This mechanism is hardcoded in ecore.genmodel).
- * 
- * @see GenBaseImpl#findGenPackage(EPackage)
- */
-public class EcoreGenModelMatcher extends GenModelMatcher {
-
-	public EcoreGenModelMatcher() {
-		super(getEcoreModel());		
-	}
-		
-	/**
-	 * @param domainPackage
-	 * @return <code>null</code> in case <code>domainPackage</code> is <code>null</code> or no matching package found.
-	 */
-	public GenPackage findGenPackage(EPackage domainPackage) {
-		if(domainPackage == EcorePackage.eINSTANCE) {
-			for (GenPackage genPackage : getGenModel().getGenPackages()) {
-				if(genPackage.getEcorePackage() != null && safeEquals(domainPackage.getNsURI(), genPackage.getEcorePackage().getNsURI())) {
-					return genPackage;
-				}
-			}
-		}
-		return domainPackage == null ? null : getGenModel().findGenPackage(domainPackage);
-	}
-	
-	/**
-	 * @param domainMetaClass
-	 * @return respective <code>GenClass</code>, or <code>null</code> if <code>domainMetaClass</code> is <code>null</code>.
-	 * @throws IllegalStateException if no matching <code>GenClass</code> found.
-	 */
-	public GenClass findGenClass(EClass domainMetaClass) {
-		GenClassifier genClassifier = findGenClassifier(domainMetaClass);
-		if(genClassifier instanceof GenClass) {
-			return (GenClass)genClassifier;
-		}
-		throw new IllegalStateException("Can't find genClass for class '" + domainMetaClass.getName());
-	}
-	
-	/**
-	 * @param domainMetaClassifier
-	 * @return respective <code>GenClassifier</code>, or <code>null</code> if <code>domainMetaClassifier</code> is <code>null</code>.
-	 * @throws IllegalStateException if no matching <code>GenClass</code> found.
-	 */
-	public GenClassifier findGenClassifier(EClassifier domainMetaClassifier) {
-		if (domainMetaClassifier == null) {
-			return null;
-		}
-		GenPackage gp = findGenPackage(domainMetaClassifier.getEPackage());
-		if (gp == null) {
-			throw new IllegalStateException("Can't find genPackage for " + domainMetaClassifier.getEPackage());
-		}
-		for (GenClassifier genClassifier : gp.getGenClassifiers()) {
-			if (genClassifier.getEcoreClassifier() != null && safeEquals(genClassifier.getEcoreClassifier().getName(), domainMetaClassifier.getName())) {
-				return genClassifier;
-			}
-		}
-		throw new IllegalStateException("Can't find genClassifier for classifier '" + domainMetaClassifier.getName() + "' in package " + gp.getPackageName());
-	}
-	
-	private static GenModel getEcoreModel() {
-		URI genModelUri = URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel"); //$NON-NLS-1$		
-		FileGenModelAccess access = new FileGenModelAccess(genModelUri);
-		access.load();
-		return access.model();
-	}
-	
-	private static boolean safeEquals(String s1, String s2) {
-		return (s1 != null) ? s1.equals(s2) : (s2 == s1 || s2.equals(s1));
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/FileGenModelAccess.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/FileGenModelAccess.java
deleted file mode 100644
index b1ab04b437d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/FileGenModelAccess.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-/**
- * @author artem
- */
-public class FileGenModelAccess implements GenModelAccess {
-	private final URI myLocation;
-	private GenModel myModel;
-
-	public FileGenModelAccess(URI genModelResource) {
-		myLocation = genModelResource;
-	}
-
-	public FileGenModelAccess(IFile genModelWorkspaceFile) {
-		this(URI.createPlatformResourceURI(genModelWorkspaceFile.getFullPath().toString(), true));
-	}
-
-	public GenModel model() {
-		return myModel;
-	}
-
-	public IStatus load() {
-		return load(new ResourceSetImpl());
-	}
-
-	public IStatus load(ResourceSet resourceSet) {
-		if (myModel != null) {
-			return Status.OK_STATUS;
-		}
-		try {
-			Resource res = resourceSet.getResource(myLocation, true);
-			Object root = res.getContents().get(0);
-			if (root instanceof GenModel) {
-				myModel = (GenModel) root;
-				return Status.OK_STATUS;
-			} else {
-				return new Status(IStatus.ERROR, "org.eclipse.papyrus.gmf.bridge", 0, "Root object of resource " + myLocation + " is not GenModel", null);
-			}
-		} catch (RuntimeException ex) {
-			return new Status(IStatus.ERROR, "org.eclipse.papyrus.gmf.bridge", 0, "Can't load resource " + myLocation, ex);
-		}
-	}
-
-	public void unload() {
-		if (myModel != null) {
-			myModel.eResource().unload();
-			myModel = null;
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelAccess.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelAccess.java
deleted file mode 100644
index 22d8866a9c8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelAccess.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-/**
- * @author artem
- *
- */
-public interface GenModelAccess {
-
-	GenModel model();
-	IStatus load();
-	IStatus load(ResourceSet resourceSet);
-	void unload();
-
-	public class Adapter implements GenModelAccess {
-		private final GenModel model;
-
-		public Adapter(GenModel aModel) {
-			model = aModel;
-		}
-		public GenModel model() {
-			return model;
-		}
-		public IStatus load() {
-			return Status.OK_STATUS;
-		}
-		public IStatus load(ResourceSet rs) {
-			return load();
-		}
-		public void unload() {
-			// do nothing
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelMatcher.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelMatcher.java
deleted file mode 100644
index e54024ecd6f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelMatcher.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * @author artem
- */
-public class GenModelMatcher {
-	private final GenModel myEMFGenModel;
-
-	public GenModelMatcher(GenModel genModel) {
-		assert genModel != null;
-		myEMFGenModel = genModel;
-	}
-
-	/**
-	 * Rather use some subtype of {@link GenModelAccess} to 
-	 * get {@link GenModel} and {@link #GenModelMatcher(GenModel)}.
-	 * @param domainModel
-	 * @throws IllegalStateException if genmodel could not be found
-	 */
-	public GenModelMatcher(EPackage domainModel) {
-		BasicGenModelAccess gma = new BasicGenModelAccess(domainModel);
-		gma.initDefault();
-		if (gma.load().isOK()) {
-			myEMFGenModel = gma.model();
-		} else {
-			throw new IllegalStateException("Can't find genModel for domain model with nsURI=" + domainModel.getNsURI());
-		}
-	}
-
-	public GenModel getGenModel() {
-		return myEMFGenModel;
-	}
-
-	/**
-	 * @param domainPackage
-	 * @return <code>null</code> in case <code>domainPackage</code> is <code>null</code> or no matching package found.
-	 */
-	public GenPackage findGenPackage(EPackage domainPackage) {
-		return domainPackage == null ? null : getGenModel().findGenPackage(domainPackage);
-	}
-
-	/**
-	 * @param domainMetaClass
-	 * @return respective <code>GenClass</code>, or <code>null</code> if <code>domainMetaClass</code> is <code>null</code>.
-	 * @throws IllegalStateException if no matching <code>GenClass</code> found.
-	 */
-	public GenClass findGenClass(EClass domainMetaClass) {
-		if (domainMetaClass == null) {
-			return null;
-		}
-		GenPackage gp = findGenPackage(domainMetaClass.getEPackage());
-		if (gp == null) {
-			throw new IllegalStateException("Can't find genPackage for " + domainMetaClass.getEPackage());
-		}
-		for (GenClass genClass : gp.getGenClasses()) {
-			if (genClass.getEcoreClass().equals(domainMetaClass)) {
-				return genClass;
-			}
-		}
-		throw new IllegalStateException("Can't find genClass for class '" + domainMetaClass.getName() + "' in package " + gp.getPackageName());
-	}
-
-	/**
-	 * 
-	 * @param domainMetaFeature
-	 * @return respective <code>GenFeature</code>, or <code>null</code> if <code>domainMetaFeature</code> is <code>null</code>.
-	 * @throws IllegalStateException if no matching <code>GenFeature</code> found.
-	 */
-	public GenFeature findGenFeature(EStructuralFeature domainMetaFeature) {
-		if (domainMetaFeature == null) {
-			return null;
-		}
-		GenClass genClass = findGenClass(domainMetaFeature.getEContainingClass());
-		for (GenFeature next : genClass.getGenFeatures()) {
-			if (next.getEcoreFeature().equals(domainMetaFeature)) {
-				return next;
-			}
-		}
-		throw new IllegalStateException("Can't find genFeature for feature '" + domainMetaFeature.getName() + "' in class " + genClass.getName());
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelProducer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelProducer.java
deleted file mode 100644
index 330b981356b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/GenModelProducer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-
-/**
- * @author artem
- */
-public interface GenModelProducer {
-
-	GenEditorGenerator process(Mapping mapping, IProgressMonitor progress) throws CoreException;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/InnerClassViewmapProducer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/InnerClassViewmapProducer.java
deleted file mode 100644
index a289995b0e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/InnerClassViewmapProducer.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FigureViewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.InnerClassViewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ParentAssignedViewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap;
-import org.eclipse.papyrus.gmf.gmfgraph.Border;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderRef;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-import org.eclipse.papyrus.gmf.graphdef.codegen.FigureGenerator;
-import org.eclipse.papyrus.gmf.graphdef.codegen.MapModeCodeGenStrategy;
-
-/**
- * @author artem
- */
-public class InnerClassViewmapProducer extends DefaultViewmapProducer {
-
-	private final FigureGenerator figureGenerator;
-	private final int[] figuresWithExtraRTBehaviour;
-
-	public InnerClassViewmapProducer() {
-		this(null, MapModeCodeGenStrategy.DYNAMIC, null);
-	}
-
-	public InnerClassViewmapProducer(String runtimeToken, MapModeCodeGenStrategy mapModeCodeGenStrategy, URL[] dynamicFigureTemplates) {
-		figureGenerator = new FigureGenerator(runtimeToken, null, mapModeCodeGenStrategy, null, true, dynamicFigureTemplates);
-		if (runtimeToken == null || "full".equalsIgnoreCase(runtimeToken)) {
-			figuresWithExtraRTBehaviour = new int[] { GMFGraphPackage.POLYLINE_CONNECTION, GMFGraphPackage.LABEL };
-			Arrays.sort(figuresWithExtraRTBehaviour);
-		} else {
-			figuresWithExtraRTBehaviour = new int[0];
-		}
-	}
-
-	@Override
-	public Viewmap create(Node node) {
-		if (node.getFigure() == null) {
-			return super.create(node);
-		}
-		final Viewmap viewmap = createViewmap(node.getFigure());
-		setupResizeConstraints(viewmap, node);
-		setupLayoutType(viewmap, node);
-		setupDefaultSize(viewmap, node);
-		return viewmap;
-	}
-	
-	@Override
-	public Viewmap create(Connection link) {
-		if (link.getFigure() == null) {
-			return super.create(link);
-		}
-		return createViewmap(link.getFigure());
-	}
-
-	@Override
-	public Viewmap create(DiagramLabel diagramLabel) {
-		if (diagramLabel.getFigure() == null) {
-			return super.create(diagramLabel);
-		}
-		if (diagramLabel.getAccessor() == null) {
-			return createViewmap(diagramLabel.getFigure());
-		} else {
-			return createViewmap(diagramLabel.getFigure(), diagramLabel.getAccessor());
-		}
-	}
-	
-	@Override
-	public Viewmap create(Compartment compartment) {
-		if (compartment.getFigure() == null){
-			return super.create(compartment);
-		}
-		if (compartment.getAccessor() == null) {
-			return createViewmap(compartment.getFigure());
-		} else {
-			return createViewmap(compartment.getFigure(), compartment.getAccessor());
-		}
-	}
-
-	private Viewmap createViewmap(FigureDescriptor figureDescriptor) {
-		Viewmap result;
-		if (figureDescriptor.getActualFigure() == null) {
-			throw new NullPointerException();
-		}
-		final Figure figure = figureDescriptor.getActualFigure();
-		if (figure instanceof RealFigure && isBareInstance((RealFigure) figure)) {
-			FigureViewmap v = GMFGenFactory.eINSTANCE.createFigureViewmap();
-			v.setFigureQualifiedClassName(figureGenerator.fqnSwitch(figure));
-			result = v;
-			// XXX perhaps, create SnippetViewmap when there are no children but some props
-		} else {
-			InnerClassViewmap v = GMFGenFactory.eINSTANCE.createInnerClassViewmap();
-			v.setClassBody(figureGenerator.go(figureDescriptor));
-			v.setClassName(getCompilationUnitName(figureDescriptor));
-			result = v;
-		}
-		setupPluginDependencies(result, figureDescriptor.getActualFigure());
-		setupStyleAttributes(result, figureDescriptor.getActualFigure());
-		return result;
-	}
-
-	private Viewmap createViewmap(FigureDescriptor owner, ChildAccess labelAccess) {
-		ParentAssignedViewmap v = GMFGenFactory.eINSTANCE.createParentAssignedViewmap();
-		v.setGetterName(labelAccess.getAccessor());
-		v.setFigureQualifiedClassName(figureGenerator.fqnSwitch(labelAccess.getFigure()));
-		setupStyleAttributes(v, labelAccess.getFigure());
-		return v;
-	}
-
-	// XXX shouldn't that reside in superclass - 
-	// use of fqnSwitch is questionable anyway, for all but first gallery
-	// we don't need to delegate to switch, and should rather use 
-	// implementationBundle field directly (though that's true only
-	// if borders and layouts are from another FG, if there are FigureRefs,
-	// delegating to fqnSwitch to find out dependencies may be reasonable)
-	private void setupPluginDependencies(Viewmap viewmap, Figure figure){
-		for (FigureGallery gallery : findAllGalleriesForImport(figure)) {
-			if (gallery.getImplementationBundle() != null){
-				myDependencies.add(gallery.getImplementationBundle());
-			}
-		}
-		if (figuresWithExtraRTBehaviour.length > 0 && Arrays.binarySearch(figuresWithExtraRTBehaviour, figure.eClass().getClassifierID()) >= 0) {
-			myDependencies.add("org.eclipse.gmf.runtime.draw2d.ui"); //$NON-NLS-1$
-		}
-	}
-
-	// public to have access from tests. FIXME may need extra check for endless
-	// recursion (like CompoundBorder.outer = BorderRef which points to same CompoundBorder)
-	public static Collection<FigureGallery> findAllGalleriesForImport(Figure figure) {
-		LinkedHashSet<FigureGallery> rv = new LinkedHashSet<FigureGallery>();
-		rv.add(findAncestorFigureGallery(figure));
-		LinkedList<Figure> queue = new LinkedList<Figure>();
-		queue.add(figure);
-		do {
-			final RealFigure fig;
-			if (queue.peek() instanceof RealFigure) {
-				fig = (RealFigure) queue.removeFirst();
-			} else if (queue.peek() instanceof FigureRef) {
-				fig = ((FigureRef) queue.removeFirst()).getFigure();
-			} else {
-				assert false; // no more known subclasses of Figure at the time.
-				queue.removeFirst();
-				continue;
-			}
-			if (fig.getLayout() instanceof LayoutRef && ((LayoutRef) fig.getLayout()).getActual() instanceof CustomLayout) {
-				rv.add(findAncestorFigureGallery(((LayoutRef) fig.getLayout()).getActual()));
-			}
-			if (fig.getBorder() != null) {
-				LinkedList<Border> borderQueue = new LinkedList<Border>();
-				borderQueue.add(fig.getBorder());
-				do {
-					if (borderQueue.peek() instanceof BorderRef) {
-						borderQueue.add(((BorderRef) borderQueue.peek()).getActual());
-					} else if (borderQueue.peek() instanceof CompoundBorder) {
-						CompoundBorder b = (CompoundBorder) borderQueue.peek();
-						borderQueue.addLast(b.getInner());
-						borderQueue.addLast(b.getOuter());
-					} else if (borderQueue.peek() instanceof CustomBorder) {
-						rv.add(findAncestorFigureGallery(borderQueue.peek()));
-					}
-					borderQueue.removeFirst(); // effectively removes any null value as well
-				} while (!borderQueue.isEmpty());
-			}
-			queue.addAll(fig.getChildren());
-		} while (!queue.isEmpty());
-		rv.remove(null);
-		return rv;
-	}
-
-	public static FigureGallery findAncestorFigureGallery(EObject figure){
-		EObject current = figure;
-		while (true){
-			EObject next = current.eContainer();
-			if (next == null){
-				return null;
-			} else if (next instanceof FigureGallery){
-				return (FigureGallery)next;
-			} else {
-				current = next;
-			}
-		}
-	}
-
-	private static String getCompilationUnitName(FigureDescriptor fd) {
-		// XXX either use Util.ext or have some template to invoke
-		return CodeGenUtil.validJavaIdentifier(CodeGenUtil.capName(fd.getName()));
-	}
-
-	private static boolean isBareInstance(RealFigure figure) {
-		if (!figure.getChildren().isEmpty()) {
-			return false;
-		}
-		final Collection<EStructuralFeature> featuresToCheck = new LinkedList<EStructuralFeature>(figure.eClass().getEAllStructuralFeatures());
-		featuresToCheck.remove(GMFGraphPackage.eINSTANCE.getRealFigure_Name());
-		featuresToCheck.remove(GMFGraphPackage.eINSTANCE.getRealFigure_Children());
-		if (figure instanceof CustomFigure) {
-			featuresToCheck.remove(GMFGraphPackage.eINSTANCE.getCustomClass_QualifiedClassName());
-			featuresToCheck.remove(GMFGraphPackage.eINSTANCE.getCustomFigure_CustomChildren());
-		}
-		for (EStructuralFeature next : featuresToCheck) {
-			if (next.isDerived()) {
-				continue;
-			}
-			if (figure.eIsSet(next)) {
-				return false;
-			}
-		}
-		return true;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/MappingTransformer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/MappingTransformer.java
deleted file mode 100644
index cfd5e824946..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/MappingTransformer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-
-/**
- * Encapsulates iteration over diagram definition.
- * @author artem
- */
-public abstract class MappingTransformer {
-
-	public void transform(Mapping m) {
-		process(m.getDiagram());
-		for (TopNodeReference element : m.getNodes()) {
-			process(element);
-		}
-		for (LinkMapping element : m.getLinks()) {
-			process(element);
-		}
-		
-		process(m.getMetrics());		
-		process(m.getAudits());
-		complete();
-	}
-
-	protected abstract void process(CanvasMapping cme);
-	protected abstract void process(TopNodeReference topNode);
-	protected abstract void process(LinkMapping lme);
-	protected abstract void process(AuditContainer audits);
-	protected abstract void process(MetricContainer metrics);
-
-	// chances for some late after-hours work, no-op by default
-	protected void complete() {
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/ModeledViewmapProducer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/ModeledViewmapProducer.java
deleted file mode 100644
index 0ed2f197bb8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/ModeledViewmapProducer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2012, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ModeledViewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-
-public class ModeledViewmapProducer extends DefaultViewmapProducer {
-
-	@Override
-	public Viewmap create(Canvas canvasElement) {
-		ModeledViewmap result = GMFGenFactory.eINSTANCE.createModeledViewmap();
-		result.setFigureModel(canvasElement);
-		return result;
-	}
-
-	@Override
-	public Viewmap create(Node node) {
-		Viewmap viewmap = createModeledViewmap(node);
-		setupResizeConstraints(viewmap, node);
-		setupLayoutType(viewmap, node);
-		setupDefaultSize(viewmap, node);
-		return viewmap;
-	}
-
-	@Override
-	public Viewmap create(Connection link) {
-		return createModeledViewmap(link);
-	}
-
-	@Override
-	public Viewmap create(Compartment compartment) {
-		return createModeledViewmap(compartment);
-	}
-
-	@Override
-	public Viewmap create(DiagramLabel label) {
-		return createModeledViewmap(label);
-	}
-
-	@Override
-	public String[] dependencies() {
-		return new String[0];
-	}
-
-	private ModeledViewmap createModeledViewmap(DiagramElement diagramElement) {
-		ModeledViewmap result = GMFGenFactory.eINSTANCE.createModeledViewmap();
-		result.setFigureModel(diagramElement);
-		if (diagramElement.getFigure() != null && diagramElement.getFigure().getActualFigure() != null) {
-			setupStyleAttributes(result, diagramElement.getFigure().getActualFigure());
-		}
-		return result;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/PropertySheetHandler.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/PropertySheetHandler.java
deleted file mode 100644
index 3da2afec5f9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/PropertySheetHandler.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCustomPropertyTab;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenPropertySheet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenPropertyTab;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenStandardPropertyTab;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GeneratedType;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.TypeTabFilter;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-
-/**
- * @author artem
- */
-public class PropertySheetHandler {
-
-	protected static final String APPEARANCE = "appearance";
-	protected static final String DIAGRAM = "diagram";
-	protected static final String ADVANCED = "advanced";
-	protected static final String DOMAIN = "domain";
-
-	private GenPropertySheet myPropertySheet;
-
-	public void initialize(GenPropertySheet propertySheet) {
-		assert propertySheet != null;
-		myPropertySheet = propertySheet;
-	}
-
-	public void process(CanvasMapping canvas) {
-		addStandardTabs();
-		addCustomTabs(canvas);
-	}
-
-	protected void addStandardTabs() {
-		GenStandardPropertyTab t1 = GMFGenFactory.eINSTANCE.createGenStandardPropertyTab();
-		t1.setID(APPEARANCE);
-		addTab(t1);
-		t1 = GMFGenFactory.eINSTANCE.createGenStandardPropertyTab();
-		t1.setID(DIAGRAM);
-		addTab(t1);
-	}
-
-	protected void addCustomTabs(CanvasMapping canvas) {
-		if (!hasDomainModel(canvas)) {
-			return;
-		}
-		GenCustomPropertyTab t1 = GMFGenFactory.eINSTANCE.createGenCustomPropertyTab();
-		t1.setID(DOMAIN);
-		t1.setLabel("Core");
-		TypeTabFilter f = GMFGenFactory.eINSTANCE.createTypeTabFilter();
-		f.getTypes().add(View.class.getName());
-		f.getTypes().add("org.eclipse.gef.EditPart");
-		if (myPropertySheet.getEditorGen().getNavigator() != null) {
-			f.getGeneratedTypes().add(GeneratedType.ABSTRACT_NAVIGATOR_ITEM_LITERAL);
-		}
-		t1.setFilter(f);
-		addTab(t1);
-	}
-
-	private void addTab(GenPropertyTab tab) {
-		myPropertySheet.getTabs().add(tab);
-	}
-
-	private static boolean hasDomainModel(CanvasMapping canvas) {
-		return canvas.getDomainModel() != null;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/QVTDiagramGenModelTransformer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/QVTDiagramGenModelTransformer.java
deleted file mode 100644
index 4ef7c5d04d1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/QVTDiagramGenModelTransformer.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2011, 2020 Montages A.G., CEA LIST, Artal
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License 2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/legal/epl-2.0/
-*
-* Contributors:
-*  	Guillaume Hillairet (Montages A.G.) : initial implementation
-*    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-*****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.m2m.internal.qvt.oml.InternalTransformationExecutor;
-import org.eclipse.m2m.internal.qvt.oml.trace.Trace;
-import org.eclipse.m2m.qvt.oml.BasicModelExtent;
-import org.eclipse.m2m.qvt.oml.ExecutionContext;
-import org.eclipse.m2m.qvt.oml.ExecutionDiagnostic;
-import org.eclipse.m2m.qvt.oml.ModelExtent;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.internal.bridge.VisualIdentifierDispenser;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-
-/**
- * @since 2.0
- */
-@SuppressWarnings("restriction")
-public class QVTDiagramGenModelTransformer {
-	
-	private final static String myTransfPath = "platform:/plugin/org.eclipse.papyrus.gmf.bridge/transforms/Map2Gen.qvto";
-	private URI myTransfURI;
-	private Trace myTrace;
-	private final ResourceSet myResourceSet;
-	private Registry myRegistry;
-	
-	public QVTDiagramGenModelTransformer(ResourceSet resourceSet, VisualIdentifierDispenser idDespenser) {
-		myResourceSet = resourceSet;
-		VisualIdentifierDispenserFacade.Provider.setDispenser(idDespenser);
-	}
-	
-	public static URL getDefaultTransformation() {
-		try {
-			return new URL(myTransfPath);
-		} catch (MalformedURLException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-	
-	public ExecutionDiagnostic transform(final Mapping m, final GenModel genModel, final ModelExtent output, final ExecutionContext context) {
-		final Resource trace = m.eResource() == null ? myResourceSet.createResource(URI.createURI("trace.qvtotrace")) : myResourceSet.createResource(
-				m.eResource().getURI().trimFileExtension().appendFileExtension("qvtotrace"));
-		
-		final InternalTransformationExecutor executor = new InternalTransformationExecutor(getTransformation()) {
-			@Override
-			protected void handleExecutionTraces(Trace traces) {
-				super.handleExecutionTraces(traces);
-				trace.getContents().add(traces);
-			}
-		};
-		RuntimeGenModelAccess runtimeAccess = new RuntimeGenModelAccess();
-		runtimeAccess.ensure();
-		
-		final ExecutionDiagnostic result = executor.execute(context, 
-				getModelExtent(m), 
-				getModelExtent(genModel), 
-				getModelExtent(runtimeAccess.genPackage().getGenModel()), 
-				output);
-		
-		this.myTrace = trace.getContents().isEmpty() ? null : (Trace) trace.getContents().get(0);
-		
-		return result;
-	}
-	
-	public void setRegistry(EPackage.Registry registry) {
-		this.myRegistry = registry;
-	}
-	
-	public ExecutionDiagnostic transform(final Mapping m, final GenModel genModel, ModelExtent output, final ExecutionContext context, final URI... extensions) {
-		ExecutionDiagnostic result = transform(m, genModel, output, context);
-		if (Diagnostic.OK != result.getSeverity()) {
-			return result;
-		}
-		
-		GenEditorGenerator outputGenModel = null;
-		if (output.getContents().size() == 1 && output.getContents().get(0) instanceof GenEditorGenerator) {
-			outputGenModel = (GenEditorGenerator) output.getContents().get(0);
-		}
-		if (outputGenModel == null) {
-			return result;
-		}
-		
-		output = getModelExtent(outputGenModel);
-		for (URI extension: extensions) {
-			final InternalTransformationExecutor exec = myRegistry == null ? 
-					new InternalTransformationExecutor(extension) : new InternalTransformationExecutor(extension, myRegistry);
-			exec.loadTransformation(new NullProgressMonitor());
-
-			if (1 == exec.getTransformation().getModelParameter().size()) {
-				result = exec.execute(context, output);
-			} else {
-				result = exec.execute(context, getModelExtent(m), getModelExtent(myTrace), output);
-			}
-		}
-		
-		return result;
-	}
-	
-	public Trace getTrace() {
-		return myTrace;
-	}
-	
-	private BasicModelExtent getModelExtent(EObject rootObject) {
-		final EList<EObject> mapObjects = new BasicEList<EObject>();
-		mapObjects.add(rootObject);
-		return new BasicModelExtent(mapObjects);
-	}
-
-	public void setTransformationL(URL mainTransformation) {
-		myTransfURI = URI.createURI(mainTransformation.toString());
-	}
-	
-	public URI getTransformation() {
-		if (myTransfURI == null) {
-			myTransfURI = URI.createURI(myTransfPath);
-		}
-		return myTransfURI;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/RuntimeGenModelAccess.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/RuntimeGenModelAccess.java
deleted file mode 100644
index 69b7ef7860b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/RuntimeGenModelAccess.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.gmf.runtime.notation.NotationPackage;
-
-/**
- * @author artem
- *
- */
-public class RuntimeGenModelAccess extends BasicGenModelAccess {
-
-	private GenPackage genPackage;
-
-	public RuntimeGenModelAccess() {
-		super(NotationPackage.eINSTANCE);
-		registerLocation(fromExtpoint());
-	}
-
-	/**
-	 * Make sure genmodel is initialized prior to calling this method.
-	 * @return
-	 */
-	public GenPackage genPackage() {
-		if (genPackage == null) {
-		// XXX perhaps, different logic could be here to 
-		// workaround elements from same metamodel are not equal case  
-			genPackage = model().findGenPackage(NotationPackage.eINSTANCE);
-		}
-		return genPackage;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/SpecificDiagramRunTimeModelHelper.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/SpecificDiagramRunTimeModelHelper.java
deleted file mode 100644
index 15e6aa4f8f4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/SpecificDiagramRunTimeModelHelper.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-
-/**
- * Provides user-tuned runtime diagram presentation.
- * @author artem
- */
-public class SpecificDiagramRunTimeModelHelper extends BasicDiagramRunTimeModelHelper {
-	private final Map<String, GenClass> myName2GenClassMap;
-
-	/**
-	 * @param drtGenModel user-defined diagram run-time model (still, should extend basic RT model)
-	 */
-	public SpecificDiagramRunTimeModelHelper(GenModel drtGenModel) {
-		assert !drtGenModel.getGenPackages().isEmpty();
-		myName2GenClassMap = collectGenClasses(drtGenModel);
-	}
-	
-	public GenClass get(NodeMapping nodeMapping) {
-		GenClass gc = getGenClass(nodeMapping.getDiagramNode().getName());
-		if (gc != null) {
-			return gc;
-		}
-		return super.get(nodeMapping);
-	}
-
-	public GenClass get(LinkMapping linkMapping) {
-		GenClass gc = getGenClass(linkMapping.getDiagramLink().getName());
-		if (gc != null) {
-			return gc;
-		}
-		return super.get(linkMapping);
-	}
-
-	public GenClass get(CanvasMapping canvasMapping) {
-		GenClass gc = getGenClass(canvasMapping.getDiagramCanvas().getName());
-		if (gc != null) {
-			return gc;
-		}
-		return super.get(canvasMapping);
-	}
-
-	public GenClass get(LabelMapping labelMapping) {
-		GenClass gc = getGenClass(labelMapping.getDiagramLabel().getName());
-		if (gc != null) {
-			return gc;
-		}
-		return super.get(labelMapping);
-	}
-
-	private Map<String, GenClass> collectGenClasses(GenModel drtGenModel) {
-		TreeMap<String, GenClass> rv = new TreeMap<String, GenClass>();
-		GenPackage genPack = drtGenModel.getGenPackages().get(0);
-		for (GenClass next : genPack.getGenClasses()) {
-			rv.put(next.getName(), next);
-		}
-		return rv;
-	}
-
-	private GenClass getGenClass(String name) {
-		return myName2GenClassMap.get(name);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/ViewmapProducer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/ViewmapProducer.java
deleted file mode 100644
index de0dc157c4e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/ViewmapProducer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-
-/**
- * @author artem
- * XXX rename 'create' to 'get'? 
- */
-public abstract class ViewmapProducer {
-
-	public abstract Viewmap create(Canvas canvasElement);
-
-	// XXX with Node split to AbstractNode, may need to reconsider this API
-	public abstract Viewmap create(Node node);
-
-	public abstract Viewmap create(Connection link);
-
-	public abstract Viewmap create(Compartment compartment);
-
-	public abstract Viewmap create(DiagramLabel label);
-
-	/**
-	 * 
-	 * @return collection of plug-in identifiers that viewmaps depend from
-	 */
-	public abstract String[] dependencies();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/VisualIdentifierDispenserFacade.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/VisualIdentifierDispenserFacade.java
deleted file mode 100644
index b38fde19eb6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/VisualIdentifierDispenserFacade.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2011, 2020 Montages A.G., CEA LIST, Artal
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License 2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/legal/epl-2.0/
-*
-* Contributors:
-*  	Guillaume Hillairet (Montages A.G.) : initial implementation
-*    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-*****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel;
-
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenTopLevelNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroup;
-import org.eclipse.papyrus.gmf.internal.bridge.NaiveIdentifierDispenser;
-import org.eclipse.papyrus.gmf.internal.bridge.VisualIdentifierDispenser;
-
-/**
- * {@link VisualIdentifierDispenserFacade} is a QVTO black box providing access to 
- * a {@link VisualIdentifierDispenser}. 
- *
- */
-public class VisualIdentifierDispenserFacade {
-		
-	public VisualIdentifierDispenserFacade() {}
-	
-	@Operation(contextual = true, kind = Kind.QUERY)
-	public int getVisualID(Object self) {
-		VisualIdentifierDispenser dispenser = Provider.getDisenser();
-		assert dispenser != null;
-		
-		int visualID = -1;
-		
-		if (self instanceof GenDiagram)
-			visualID = dispenser.get((GenDiagram) self);
-		
-		else if (self instanceof GenTopLevelNode)
-			visualID = dispenser.get((GenTopLevelNode) self);
-		
-		else if (self instanceof GenChildNode)
-			visualID = dispenser.get((GenChildNode) self);
-		
-		else if (self instanceof GenCompartment)
-			visualID = dispenser.get((GenCompartment) self);
-		
-		else if (self instanceof GenNodeLabel)
-			visualID = dispenser.get((GenNodeLabel) self);
-		
-		else if (self instanceof GenLink)
-			visualID = dispenser.get((GenLink) self);
-		
-		else if (self instanceof GenLinkLabel)
-			visualID = dispenser.get((GenLinkLabel) self);
-		
-		else if (self instanceof ToolGroup)
-			visualID = dispenser.get((ToolGroup) self);
-		
-		return visualID;
-	}
-	
-	/**
-	 * {@link Provider} is a singleton holding the current visual identifier dispenser. 
-	 */
-	public static final class Provider {
-		
-		private static VisualIdentifierDispenser dispenser;
-		
-		public static VisualIdentifierDispenser getDisenser() {
-			if (dispenser == null) {
-				dispenser = new NaiveIdentifierDispenser();
-			}
-			return dispenser;
-		}
-		
-		public static void setDispenser(VisualIdentifierDispenser dispenser) {
-			Provider.dispenser = dispenser;
-		}
-		
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/navigator/NavigatorHandler.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/navigator/NavigatorHandler.java
deleted file mode 100644
index c788178245c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/genmodel/navigator/NavigatorHandler.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.genmodel.navigator;
-
-import java.util.Collection;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildContainer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkEnd;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNavigator;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNavigatorChildReference;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNavigatorReferenceType;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenTopLevelNode;
-
-public class NavigatorHandler {
-
-	private GenDiagram myDiagram;
-
-	private GenNavigator myNavigator;
-
-	private boolean myShowLinkTargets;
-
-	private boolean myShowOutgoingLinks;
-
-	private boolean myShowLinkSources;
-
-	private boolean myShowIncomingLinks;
-	
-	public NavigatorHandler() {
-		myShowIncomingLinks = true;
-		myShowOutgoingLinks = true;
-		myShowLinkSources = true;
-		myShowLinkTargets = true;
-	}
-
-	public void initialize(GenDiagram genDiagram, GenNavigator genNavigator) {
-		myDiagram = genDiagram;
-		myNavigator = genNavigator;
-		process(myDiagram);
-	}
-
-	public void process(GenDiagram diagram) {
-		createChildReference(diagram, null, GenNavigatorReferenceType.CHILDREN_LITERAL);
-	}
-
-	public void process(GenTopLevelNode topLevelNode) {
-		createChildNodeReference(topLevelNode, myDiagram);
-	}
-
-	public void process(GenChildNode childNode, GenChildContainer container) {
-		GenNode parent = null;
-		if (container instanceof GenCompartment) {
-			parent = ((GenCompartment) container).getNode();
-		} else if (container instanceof GenNode) {
-			parent = (GenNode) container;
-		}
-		assert parent != null;
-		createChildNodeReference(childNode, parent);
-	}
-
-	public void process(GenLink link) {
-		GenNavigatorChildReference childReference = createChildReference(link, myDiagram, GenNavigatorReferenceType.CHILDREN_LITERAL);
-		childReference.setGroupName("links");
-		childReference.setGroupIcon("icons/linksNavigatorGroup.gif");
-
-
-		for (GenLinkEnd linkEnd : getTargetGenNodes(link)) {
-			if (myShowLinkTargets) {
-				GenNavigatorChildReference reference = createChildReference(linkEnd, link, GenNavigatorReferenceType.OUT_TARGET_LITERAL);
-				reference.setGroupName("target");
-				reference.setGroupIcon("icons/linkTargetNavigatorGroup.gif");
-			}
-			
-			if (myShowIncomingLinks) {
-				GenNavigatorChildReference reference = createChildReference(link, linkEnd, GenNavigatorReferenceType.IN_SOURCE_LITERAL);
-				reference.setGroupName("incoming links");
-				reference.setGroupIcon("icons/incomingLinksNavigatorGroup.gif");
-			}
-		}
-
-		for (GenLinkEnd linkEnd : getSourceGenNodes(link)) {
-			if (myShowLinkSources) {
-				GenNavigatorChildReference reference = createChildReference(linkEnd, link, GenNavigatorReferenceType.IN_SOURCE_LITERAL);
-				reference.setGroupName("source");
-				reference.setGroupIcon("icons/linkSourceNavigatorGroup.gif");
-			}
-			
-			if (myShowOutgoingLinks) {
-				GenNavigatorChildReference reference = createChildReference(link, linkEnd, GenNavigatorReferenceType.OUT_TARGET_LITERAL);
-				reference.setGroupName("outgoing links");
-				reference.setGroupIcon("icons/outgoingLinksNavigatorGroup.gif");
-			}
-		}
-	}
-
-	private Collection<? extends GenLinkEnd> getTargetGenNodes(GenLink link) {
-		// FIXME link.getTargets gives empty list when no model facet set, but allNodes (which is legacy approach) is perhaps the 
-		// correct one, and GenLink#sources/targets should be modified? 
-		if (link.getModelFacet() == null) {
-			return myDiagram.getAllNodes();
-		}
-		return link.getTargets();
-	}
-
-	private Collection<? extends GenLinkEnd> getSourceGenNodes(GenLink link) {
-		if (link.getModelFacet() == null) {
-			return myDiagram.getAllNodes();
-		}
-		return link.getSources();
-	}
-
-	private void createChildNodeReference(GenNode childNode, GenCommonBase parent) {
-		createChildReference(childNode, parent, GenNavigatorReferenceType.CHILDREN_LITERAL);
-	}
-
-	private GenNavigatorChildReference createChildReference(GenCommonBase child, GenCommonBase parent, GenNavigatorReferenceType referenceType) {
-		GenNavigatorChildReference childReference = GMFGenFactory.eINSTANCE.createGenNavigatorChildReference();
-		if (parent != null) {
-			childReference.setParent(parent);
-		}
-		childReference.setChild(child);
-		childReference.setReferenceType(referenceType);
-		myNavigator.getChildReferences().add(childReference);
-		return childReference;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/AbstractGenNamingStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/AbstractGenNamingStrategy.java
deleted file mode 100644
index d527ee70d07..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/AbstractGenNamingStrategy.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.naming;
-
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNodeLabel;
-import org.eclipse.papyrus.gmf.internal.common.NamesDispenser;
-
-/**
- * @author dstadnik
- */
-public abstract class AbstractGenNamingStrategy implements GenNamingStrategy {
-
-	private final String suffix;
-
-	private final NamesDispenser namesDispenser;
-
-	private final GenNamingStrategy chainedNamingStrategy;
-
-	private final GenNamingStrategy prefixNamingStrategy;
-
-	public AbstractGenNamingStrategy(String suffix, NamesDispenser namesDispenser, GenNamingStrategy chainedNamingStrategy, GenNamingStrategy prefixNamingStrategy) {
-		this.suffix = suffix;
-		this.namesDispenser = namesDispenser;
-		this.chainedNamingStrategy = chainedNamingStrategy;
-		this.prefixNamingStrategy = prefixNamingStrategy;
-	}
-
-	protected final GenNamingStrategy getChainedNamingStrategy() {
-		return chainedNamingStrategy;
-	}
-
-	protected final GenNamingStrategy getPrefixNamingStrategy() {
-		return prefixNamingStrategy;
-	}
-
-	public String get(GenDiagram element) {
-		if (chainedNamingStrategy != null) {
-			return chainedNamingStrategy.get(element);
-		}
-		return null;
-	}
-
-	public String get(GenNode element) {
-		if (chainedNamingStrategy != null) {
-			return chainedNamingStrategy.get(element);
-		}
-		return null;
-	}
-
-	public String get(GenCompartment element) {
-		if (chainedNamingStrategy != null) {
-			return chainedNamingStrategy.get(element);
-		}
-		return null;
-	}
-
-	public String get(GenLink element) {
-		if (chainedNamingStrategy != null) {
-			return chainedNamingStrategy.get(element);
-		}
-		return null;
-	}
-
-	public String get(GenLabel element) {
-		if (chainedNamingStrategy != null) {
-			return chainedNamingStrategy.get(element);
-		}
-		return null;
-	}
-
-	protected String createClassName(String s) {
-		s = getValidClassName(s);
-		if (namesDispenser == null) {
-			return suffix == null ? s : s + suffix;
-		}
-		return namesDispenser.get(s, suffix);
-	}
-
-	protected String getValidClassName(String s) {
-		assert !isEmpty(s);
-		s = CodeGenUtil.validJavaIdentifier(s);
-		return Character.toUpperCase(s.charAt(0)) + s.substring(1);
-	}
-
-	protected boolean isEmpty(String s) {
-		return s == null || s.length() == 0;
-	}
-
-	protected String getCompartmentHostPrefix(GenCompartment element) {
-		return getPrefixNamingStrategy() != null ? getPrefixNamingStrategy().get(element.getNode()) : GenNode.CLASS_NAME_PREFIX;
-	}
-
-	protected String getLabelHostPrefix(GenLabel element) {
-		if (element instanceof GenNodeLabel) {
-			return getPrefixNamingStrategy() != null ? getPrefixNamingStrategy().get(((GenNodeLabel) element).getNode()) : GenNode.CLASS_NAME_PREFIX;
-		} else if (element instanceof GenLinkLabel) {
-			return getPrefixNamingStrategy() != null ? getPrefixNamingStrategy().get(((GenLinkLabel) element).getLink()) : GenLink.CLASS_NAME_PREFIX;
-		} else {
-			throw new IllegalArgumentException(String.valueOf(element));
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/ClassGenNamingStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/ClassGenNamingStrategy.java
deleted file mode 100644
index b3771483935..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/ClassGenNamingStrategy.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.naming;
-
-import java.util.Collection;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FeatureLabelModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FeatureLinkModelFacet;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.TypeLinkModelFacet;
-import org.eclipse.papyrus.gmf.internal.common.NamesDispenser;
-
-/**
- * Generates names based on model facet identifiers.
- * Should be consistent with genmodel naming strategy
- * and GenCommonBase.getClassNamePrefix() in particular.
- * 
- * @author dstadnik
- */
-public class ClassGenNamingStrategy extends AbstractGenNamingStrategy {
-
-	/**
-	 * Max length of semantic segment.
-	 * Concatenated feature names is the primary target.
-	 */
-	private static final int MAX_SEGMENT_LENGTH = 23;
-
-	public ClassGenNamingStrategy(String suffix, NamesDispenser namesDispenser, GenNamingStrategy chainedNamingStrategy, GenNamingStrategy prefixNamingStrategy) {
-		super(suffix, namesDispenser, chainedNamingStrategy, prefixNamingStrategy);
-	}
-
-	public String get(GenDiagram element) {
-		if (element.getDomainDiagramElement() != null) {
-			String name = element.getDomainDiagramElement().getName();
-			if (!isEmpty(name)) {
-				return createClassName(name);
-			}
-		}
-		return super.get(element);
-	}
-
-	public String get(GenNode element) {
-		if (element.getModelFacet() != null && element.getModelFacet().getMetaClass() != null) {
-			String name = element.getModelFacet().getMetaClass().getName();
-			if (!isEmpty(name)) {
-				return createClassName(name);
-			}
-		}
-		return super.get(element);
-	}
-
-	public String get(GenCompartment element) {
-		String name = element.getTitle();
-		if (!isEmpty(name)) {
-			name = Character.toUpperCase(name.charAt(0)) + name.substring(1);
-			name = getCompartmentHostPrefix(element) + name;
-			return createClassName(name);
-		}
-		return super.get(element);
-	}
-
-	public String get(GenLink element) {
-		if (element.getModelFacet() instanceof TypeLinkModelFacet) {
-			GenClass type = ((TypeLinkModelFacet) element.getModelFacet()).getMetaClass();
-			if (type != null) {
-				String name = type.getName();
-				if (!isEmpty(name)) {
-					return createClassName(name);
-				}
-			}
-		}
-		if (element.getModelFacet() instanceof FeatureLinkModelFacet) {
-			GenFeature feature = ((FeatureLinkModelFacet) element.getModelFacet()).getMetaFeature();
-			if (feature != null) {
-				String name = feature.getName();
-				if (!isEmpty(name)) {
-					name = name.length() > 1 ? Character.toUpperCase(name.charAt(0)) + name.substring(1) : name.toUpperCase();
-					name = feature.getGenClass().getName() + name;
-					return createClassName(name);
-				}
-			}
-		}
-		return super.get(element);
-	}
-
-	public String get(GenLabel element) {
-		if (element.getModelFacet() instanceof FeatureLabelModelFacet) {
-			StringBuffer sb = new StringBuffer();
-			for (GenFeature feature : (Collection<? extends GenFeature>) ((FeatureLabelModelFacet) element.getModelFacet()).getMetaFeatures()) {
-				String name = feature.getName();
-				if (!isEmpty(name)) {
-					name = name.length() > 1 ? Character.toUpperCase(name.charAt(0)) + name.substring(1) : name.toUpperCase();
-					sb.append(name);
-				}
-			}
-			if (sb.length() > 0) {
-				String name = sb.toString();
-				if (name.length() > MAX_SEGMENT_LENGTH) {
-					name = name.substring(0, MAX_SEGMENT_LENGTH);
-				}
-				return createClassName(getLabelHostPrefix(element) + name);
-			}
-		}
-		return super.get(element);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/DefaultGenNamingStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/DefaultGenNamingStrategy.java
deleted file mode 100644
index 347fd0ba450..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/DefaultGenNamingStrategy.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.naming;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.internal.common.NamesDispenser;
-
-/**
- * Provides default names that do not reflect element semantic.
- * 
- * @author dstadnik
- */
-public class DefaultGenNamingStrategy extends AbstractGenNamingStrategy {
-
-	public DefaultGenNamingStrategy(String suffix, NamesDispenser namesDispenser, GenNamingStrategy chainedNamingStrategy, GenNamingStrategy prefixNamingStrategy) {
-		super(suffix, namesDispenser, chainedNamingStrategy, prefixNamingStrategy);
-	}
-
-	public String get(GenDiagram element) {
-		return createClassName(GenDiagram.CLASS_NAME_PREFIX);
-	}
-
-	public String get(GenNode element) {
-		return createClassName(GenNode.CLASS_NAME_PREFIX);
-	}
-
-	public String get(GenCompartment element) {
-		return createClassName(getCompartmentHostPrefix(element) + GenCompartment.CLASS_NAME_PREFIX);
-	}
-
-	public String get(GenLink element) {
-		return createClassName(GenLink.CLASS_NAME_PREFIX);
-	}
-
-	public String get(GenLabel element) {
-		return createClassName(getLabelHostPrefix(element) + GenLabel.CLASS_NAME_PREFIX);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/DesignGenNamingStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/DesignGenNamingStrategy.java
deleted file mode 100644
index 9443cb38cf7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/DesignGenNamingStrategy.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.naming;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FigureViewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.InnerClassViewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ParentAssignedViewmap;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap;
-import org.eclipse.papyrus.gmf.internal.common.NamesDispenser;
-
-/**
- * Uses names from graphical definition elements if available.
- * 
- * @author dstadnik
- */
-public class DesignGenNamingStrategy extends AbstractGenNamingStrategy {
-
-	public DesignGenNamingStrategy(String suffix, NamesDispenser namesDispenser, GenNamingStrategy chainedNamingStrategy, GenNamingStrategy prefixNamingStrategy) {
-		super(suffix, namesDispenser, chainedNamingStrategy, prefixNamingStrategy);
-	}
-
-	public String get(GenDiagram element) {
-		String name = getDesignName(element.getViewmap());
-		if (name != null) {
-			return createClassName(name);
-		}
-		return super.get(element);
-	}
-
-	public String get(GenNode element) {
-		String name = getDesignName(element.getViewmap());
-		if (name != null) {
-			return createClassName(name);
-		}
-		return super.get(element);
-	}
-
-	public String get(GenCompartment element) {
-		String name = getDesignName(element.getViewmap());
-		if (name != null) {
-			return createClassName(getCompartmentHostPrefix(element) + name);
-		}
-		return super.get(element);
-	}
-
-	public String get(GenLink element) {
-		String name = getDesignName(element.getViewmap());
-		if (name != null) {
-			return createClassName(name);
-		}
-		return super.get(element);
-	}
-
-	public String get(GenLabel element) {
-		String name = getDesignName(element.getViewmap());
-		if (name != null) {
-			return createClassName(name);
-		}
-		return super.get(element);
-	}
-
-	/**
-	 * Try to infer name from associated figure.
-	 */
-	protected String getDesignName(Viewmap viewmap) {
-		if (viewmap == null) {
-			return null;
-		}
-		String name = null;
-		if (viewmap instanceof FigureViewmap) {
-			name = ((FigureViewmap) viewmap).getFigureQualifiedClassName();
-		} else if (viewmap instanceof InnerClassViewmap) {
-			name = ((InnerClassViewmap) viewmap).getClassName();
-		} else if (viewmap instanceof ParentAssignedViewmap) {
-			name = ((ParentAssignedViewmap) viewmap).getFigureQualifiedClassName();
-		}
-		if (name == null || name.length() == 0) {
-			return null;
-		}
-		name = name.substring(name.lastIndexOf('.') + 1);
-		if (name.endsWith("Figure") && name.length() > "Figure".length()) { //$NON-NLS-1$ //$NON-NLS-2$
-			name = name.substring(0, name.length() - "Figure".length()); //$NON-NLS-1$
-		}
-		if (name.length() == 0) {
-			return null;
-		}
-		if (name.length() < 2) {
-			return name.toUpperCase();
-		}
-		return Character.toUpperCase(name.charAt(0)) + name.substring(1);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/GenNamingStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/GenNamingStrategy.java
deleted file mode 100644
index 65f70ef06ab..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/GenNamingStrategy.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.naming;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-
-/**
- * @author dstadnik
- */
-public interface GenNamingStrategy {
-
-	public String get(GenDiagram element);
-
-	public String get(GenNode element);
-
-	public String get(GenCompartment element);
-
-	public String get(GenLink element);
-
-	public String get(GenLabel element);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/gen/GenNamingMediator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/gen/GenNamingMediator.java
deleted file mode 100644
index 1479a5b3fcb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/gen/GenNamingMediator.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.naming.gen;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-
-/**
- * @author dstadnik
- */
-public interface GenNamingMediator {
-
-	public void feed(GenDiagram element);
-
-	public void feed(GenNode element);
-
-	public void feed(GenLink element);
-
-	public void feed(GenCompartment element);
-
-	public void feed(GenLabel element);
-
-	public void reset();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/gen/GenNamingMediatorImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/gen/GenNamingMediatorImpl.java
deleted file mode 100644
index 6f262721990..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/naming/gen/GenNamingMediatorImpl.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.naming.gen;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildContainer;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenContainerBase;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLabel;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.MetamodelType;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.SpecializationType;
-import org.eclipse.papyrus.gmf.internal.bridge.naming.ClassGenNamingStrategy;
-import org.eclipse.papyrus.gmf.internal.bridge.naming.DefaultGenNamingStrategy;
-import org.eclipse.papyrus.gmf.internal.bridge.naming.DesignGenNamingStrategy;
-import org.eclipse.papyrus.gmf.internal.bridge.naming.GenNamingStrategy;
-import org.eclipse.papyrus.gmf.internal.common.IncrementalNamesDispenser;
-import org.eclipse.papyrus.gmf.internal.common.NamesDispenser;
-
-/**
- * @author dstadnik
- */
-public class GenNamingMediatorImpl implements GenNamingMediator {
-
-	public enum Mode {
-		COLLECT_NAMES,
-		DISPENSE_NAMES
-	}
-
-	private final GMFGenPackage M = GMFGenPackage.eINSTANCE;
-
-	private Mode mode;
-
-	private NamesDispenser dispenser;
-
-	private GenNamingStrategy viewFactory;
-
-	private GenNamingStrategy editPart;
-
-	private GenNamingStrategy itemSemanticPolicy;
-
-	private GenNamingStrategy canonicalPolicy;
-
-	private GenNamingStrategy nodeGraphicalPolicy;
-
-	private GenNamingStrategy editHelper;
-
-	private GenNamingStrategy editHelperAdvice;
-
-	private GenNamingStrategy linkCreateCommand;
-
-	private GenNamingStrategy nodeCreateCommand;
-
-	private GenNamingStrategy linkReorientCommand;
-
-	public GenNamingMediatorImpl() {
-		this(new IncrementalNamesDispenser());
-	}
-
-	public GenNamingMediatorImpl(NamesDispenser dispenser) {
-		this.dispenser = dispenser;
-		mode = Mode.DISPENSE_NAMES;
-		setViewFactory(createNamingStrategy(GenCommonBase.NOTATION_VIEW_FACTORY_SUFFIX));
-		setEditPart(createNamingStrategy(GenCommonBase.EDIT_PART_SUFFIX));
-		setItemSemanticPolicy(createNamingStrategy(GenCommonBase.ITEM_SEMANTIC_EDIT_POLICY_SUFFIX));
-		setCanonicalPolicy(createNamingStrategy(GenChildContainer.CANONICAL_EDIT_POLICY_SUFFIX));
-		setNodeGraphicalPolicy(createNamingStrategy(GenNode.GRAPHICAL_NODE_EDIT_POLICY_SUFFIX));
-		setEditHelper(createNamingStrategy(MetamodelType.EDIT_HELPER_SUFFIX));
-		setEditHelperAdvice(createNamingStrategy(SpecializationType.EDIT_HELPER_ADVICE_SUFFIX));
-		setLinkCreateCommand(createNamingStrategy(GenLink.CREATE_COMMAND_SUFFIX));
-		setNodeCreateCommand(createNamingStrategy(GenNode.CREATE_COMMAND_SUFFIX));
-		setLinkReorientCommand(createNamingStrategy(GenLink.REORIENT_COMMAND_SUFFIX));
-	}
-
-	protected GenNamingStrategy createNamingStrategy(String suffixPart) {
-		// prefix stack
-		GenNamingStrategy pns = new DefaultGenNamingStrategy(null, null, null, null);
-		pns = new DesignGenNamingStrategy(null, null, pns, null);
-		pns = new ClassGenNamingStrategy(null, null, pns, null);
-		// primary stack
-		GenNamingStrategy ns = new DefaultGenNamingStrategy(suffixPart, dispenser, null, pns);
-		ns = new DesignGenNamingStrategy(suffixPart, dispenser, ns, pns);
-		ns = new ClassGenNamingStrategy(suffixPart, dispenser, ns, pns);
-		return ns;
-	}
-
-	public void reset() {
-		if (dispenser != null) {
-			dispenser.clear();
-		}
-	}
-
-	public final Mode getMode() {
-		return mode;
-	}
-
-	public void setMode(Mode mode) {
-		this.mode = mode;
-	}
-
-	protected void feedName(EObject element, EAttribute feature, GenNamingStrategy strategy, EObject refElement) {
-		switch (getMode()) {
-		case COLLECT_NAMES:
-			if (element.eIsSet(feature)) {
-				dispenser.add((String) element.eGet(feature));
-			}
-			break;
-		case DISPENSE_NAMES:
-			if (!element.eIsSet(feature)) {
-				element.eSet(feature, getName(refElement, strategy));
-			}
-			break;
-		}
-	}
-
-	protected void feedName(EObject element, EAttribute feature, GenNamingStrategy strategy) {
-		feedName(element, feature, strategy, element);
-	}
-
-	public void feed(GenDiagram element) {
-		dispenser.add(element.getBaseExternalNodeLabelEditPartClassName());
-		dispenser.add(element.getBaseItemSemanticEditPolicyClassName());
-		dispenser.add(element.getBaseGraphicalNodeEditPolicyClassName());
-		dispenser.add(element.getBaseEditHelperClassName());
-
-		feedContainer(element);
-	}
-
-	public void feed(GenNode element) {
-		feedContainer(element);
-		feedName(element, M.getGenNode_GraphicalNodeEditPolicyClassName(), getNodeGraphicalPolicy());
-		feedName(element, M.getGenNode_CreateCommandClassName(), getNodeCreateCommand());
-	}
-
-	public void feed(GenCompartment element) {
-		feedContainer(element);
-	}
-
-	public void feed(GenLink element) {
-		feedCommon(element);
-		feedName(element, M.getGenLink_CreateCommandClassName(), getLinkCreateCommand());
-		feedName(element, M.getGenLink_ReorientCommandClassName(), getLinkReorientCommand());
-	}
-
-	public void feed(GenLabel element) {
-		feedCommon(element);
-	}
-
-	protected void feedContainer(GenContainerBase element) {
-		feedCommon(element);
-		feedName(element, M.getGenContainerBase_CanonicalEditPolicyClassName(), getCanonicalPolicy());
-	}
-
-	protected void feedCommon(GenCommonBase element) {
-		feedName(element, M.getGenCommonBase_EditPartClassName(), getEditPart());
-		feedName(element, M.getGenCommonBase_ItemSemanticEditPolicyClassName(), getItemSemanticPolicy());
-		if (element.getElementType() instanceof MetamodelType) {
-			MetamodelType type = (MetamodelType) element.getElementType();
-			feedName(type, M.getMetamodelType_EditHelperClassName(), getEditHelper(), element);
-//		} else if (element.getElementType() instanceof SpecializationType) {
-//			/*
-//			 * Uncoment once we generate anything reasonable in the advice's body;
-//			 * otherwise no reason to generate empty class
-//			 */
-//			SpecializationType type = (SpecializationType) element.getElementType();
-//			feedName(type, M.getSpecializationType_EditHelperAdviceClassName(), getEditHelperAdvice(), element);
-		}
-	}
-
-	protected String getName(EObject element, GenNamingStrategy strategy) {
-		if (element instanceof GenDiagram) {
-			return strategy.get((GenDiagram) element);
-		} else if (element instanceof GenNode) {
-			return strategy.get((GenNode) element);
-		} else if (element instanceof GenCompartment) {
-			return strategy.get((GenCompartment) element);
-		} else if (element instanceof GenLink) {
-			return strategy.get((GenLink) element);
-		} else if (element instanceof GenLabel) {
-			return strategy.get((GenLabel) element);
-		}
-		throw new IllegalArgumentException();
-	}
-
-	public void traverse(GenEditorGenerator gen) {
-		GenDiagram diagram = gen.getDiagram();
-		feed(diagram);
-		for (GenNode node : diagram.getTopLevelNodes()) {
-			feed(node);
-			for (GenLabel label : node.getLabels()) {
-				feed(label);
-			}
-		}
-		for (GenNode node : diagram.getChildNodes()) {
-			feed(node);
-			for (GenLabel label : node.getLabels()) {
-				feed(label);
-			}
-		}
-		for (GenCompartment node : diagram.getCompartments()) {
-			feed(node);
-		}
-		for (GenLink link : diagram.getLinks()) {
-			feed(link);
-			for (GenLabel label : link.getLabels()) {
-				feed(label);
-			}
-		}
-	}
-
-	public GenNamingStrategy getViewFactory() {
-		return viewFactory;
-	}
-
-	public void setViewFactory(GenNamingStrategy viewFactory) {
-		this.viewFactory = viewFactory;
-	}
-
-	public GenNamingStrategy getEditPart() {
-		return editPart;
-	}
-
-	public void setEditPart(GenNamingStrategy editPart) {
-		this.editPart = editPart;
-	}
-
-	public GenNamingStrategy getItemSemanticPolicy() {
-		return itemSemanticPolicy;
-	}
-
-	public void setItemSemanticPolicy(GenNamingStrategy itemSemanticPolicy) {
-		this.itemSemanticPolicy = itemSemanticPolicy;
-	}
-
-	public GenNamingStrategy getCanonicalPolicy() {
-		return canonicalPolicy;
-	}
-
-	public void setCanonicalPolicy(GenNamingStrategy canonicalPolicy) {
-		this.canonicalPolicy = canonicalPolicy;
-	}
-
-	public GenNamingStrategy getNodeGraphicalPolicy() {
-		return nodeGraphicalPolicy;
-	}
-
-	public void setNodeGraphicalPolicy(GenNamingStrategy nodeGraphicalPolicy) {
-		this.nodeGraphicalPolicy = nodeGraphicalPolicy;
-	}
-
-	public GenNamingStrategy getEditHelper() {
-		return editHelper;
-	}
-
-	public void setEditHelper(GenNamingStrategy editHelper) {
-		this.editHelper = editHelper;
-	}
-
-	public GenNamingStrategy getEditHelperAdvice() {
-		return editHelperAdvice;
-	}
-
-	public void setEditHelperAdvice(GenNamingStrategy editHelperAdvice) {
-		this.editHelperAdvice = editHelperAdvice;
-	}
-
-	public GenNamingStrategy getLinkCreateCommand() {
-		return linkCreateCommand;
-	}
-
-	public void setLinkCreateCommand(GenNamingStrategy linkCreateCommand) {
-		this.linkCreateCommand = linkCreateCommand;
-	}
-
-	public GenNamingStrategy getNodeCreateCommand() {
-		return nodeCreateCommand;
-	}
-
-	public void setNodeCreateCommand(GenNamingStrategy nodeCreateCommand) {
-		this.nodeCreateCommand = nodeCreateCommand;
-	}
-
-	public GenNamingStrategy getLinkReorientCommand() {
-		return linkReorientCommand;
-	}
-
-	public void setLinkReorientCommand(GenNamingStrategy linkReorientCommand) {
-		this.linkReorientCommand = linkReorientCommand;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/tooldef/PaletteHandler.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/tooldef/PaletteHandler.java
deleted file mode 100644
index 59d47f9793f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/src/org/eclipse/papyrus/gmf/internal/bridge/tooldef/PaletteHandler.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.tooldef;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.AbstractToolEntry;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.EntryBase;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenFactory;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Palette;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Separator;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.StandardEntry;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.StandardEntryKind;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolEntry;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroup;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolGroupItem;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.BundleImage;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-import org.eclipse.papyrus.gmf.tooldef.PaletteSeparator;
-import org.eclipse.papyrus.gmf.tooldef.StandardTool;
-import org.eclipse.papyrus.gmf.tooldef.StandardToolKind;
-import org.eclipse.papyrus.gmf.tooldef.ToolContainer;
-import org.eclipse.papyrus.gmf.tooldef.util.GMFToolSwitch;
-import org.osgi.framework.Bundle;
-
-/**
- * Invoke {@link #initialize(Palette)} prior to use. Not intented to be reused, although may work.
- * Unless initialized, <code>process()</code> methods has no effect.
- * Mapping entries that reference tools from palette other than specified in the Mapping element,
- * will get into predefined group under genPalette. 
- * @author artem
- */
-public class PaletteHandler {
-	private final HashMap<AbstractTool, ToolGroupItem> myToolHistory; // keeps track of tooldef-to-gmfgen tool transformations. Container maps to group as well
-	private Palette myGenPalette;
-	private ToolGroup myMisreferencedTools;
-
-	public PaletteHandler() {
-		myToolHistory = new HashMap<AbstractTool, ToolGroupItem>();
-	}
-
-	public void initialize(Palette genPalette) {
-		assert genPalette != null; // TODO remove after debug
-		myGenPalette = genPalette;
-		myToolHistory.clear();
-	}
-
-	protected final Palette getGenPalette() {
-		assert isInitialized(); // TODO remove after debug
-		return myGenPalette;
-	}
-
-	/**
-	 * There's nothing to do if handler was not initialized, 
-	 * @return
-	 */
-	protected final boolean isInitialized() {
-		return myGenPalette != null;
-	}	
-
-	public void process(org.eclipse.papyrus.gmf.tooldef.Palette palette) {
-		if (!isInitialized()) {
-			return;
-		}
-		// perhaps, moving this code to ToolSwitch and just doSwitch(palette) would be better?
-		ArrayList<ToolGroup> groups = new ArrayList<ToolGroup>(palette.getTools().size());
-		ArrayList<ToolGroupItem> topLevelTools = new ArrayList<ToolGroupItem>(palette.getTools().size());
-		for (ToolGroupItem next : new ToolSwitch(myToolHistory).toGroupItems(palette.getTools())) {
-			if (next instanceof ToolGroup) {
-				groups.add((ToolGroup) next);
-			} else {
-				topLevelTools.add(next);
-			}
-		}
-		if (!topLevelTools.isEmpty()) {
-			ToolGroup defaultGroup = GMFGenFactory.eINSTANCE.createToolGroup();
-			defaultGroup.setTitle("Default");
-			defaultGroup.setDescription("Holds top-level non-container tools");
-			defaultGroup.setCollapse(false);
-			defaultGroup.getEntries().addAll(topLevelTools);
-			getGenPalette().getGroups().add(defaultGroup);
-		}
-		getGenPalette().getGroups().addAll(groups);
-		if (palette.getDefault() != null) {
-			assert false == myToolHistory.get(palette.getDefault()) instanceof Separator;
-			EntryBase eb = (EntryBase) myToolHistory.get(palette.getDefault());
-			if (false == eb instanceof ToolEntry) {
-				logWarning("There's default tool specified for palette, but can't find gmfgen counterpart");
-			} else {
-				((ToolEntry) eb).setDefault(true);
-			}
-		}
-		getGenPalette().setFlyout(true); // FIXME option
-	}
-
-	public void process(NodeMapping nme, GenNode genNode) {
-		if (!isInitialized() || nme.getTool() == null) {
-			return;
-		}
-		ToolEntry te = toToolEntry(nme.getTool());
-		if (te != null) {
-			te.getGenNodes().add(genNode);
-		}
-	}
-
-	public void process(LinkMapping lme, GenLink genLink) {
-		if (!isInitialized() || lme.getTool() == null) {
-			return;
-		}
-		ToolEntry te = toToolEntry(lme.getTool());
-		if (te != null) {
-			te.getGenLinks().add(genLink);
-		}
-	}
-
-	/**
-	 * Finds existing entry for tool or creates special 'missing' one if none found. 
-	 */
-	private ToolEntry toToolEntry(AbstractTool tool) {
-		if (checkIsContainer(tool)) {
-			return null;
-		}
-		ToolEntry te = findToolEntry(tool);
-		if (te == null) {
-			te = createMissingToolEntry(tool);
-		}
-		return te;
-	}
-
-	private static boolean checkIsContainer(AbstractTool tool) {
-		if (tool instanceof ToolContainer) {
-			logWarning("Can't use container here");
-			return true;
-		}
-		return false;
-	}
-
-	private ToolEntry findToolEntry(AbstractTool tool) {
-		assert !checkIsContainer(tool);
-		return (ToolEntry) myToolHistory.get(tool);
-	}
-
-	private ToolEntry createMissingToolEntry(AbstractTool tool) {
-		assert tool != null;
-		if (myMisreferencedTools == null) {
-			myMisreferencedTools = GMFGenFactory.eINSTANCE.createToolGroup();
-			myMisreferencedTools.setCollapse(false);
-			myMisreferencedTools.setStack(false);
-			myMisreferencedTools.setTitle("-- Mis-referenced tools --");
-			myMisreferencedTools.setDescription("Mapping element referenced tools from palette other than one specified in Mapping instance");
-			getGenPalette().getGroups().add(myMisreferencedTools);
-		}
-		ToolEntry t = (ToolEntry) new ToolSwitch(myToolHistory).doSwitch(tool);
-		if (t != null) {
-			myToolHistory.put(tool, t);
-			myMisreferencedTools.getEntries().add(t);
-		}
-		return t;
-	}
-
-	private static String constructIconPath(BundleImage icon) {
-		assert icon != null;
-		if (icon.getPath() == null || icon.getPath().trim().length() == 0) {
-			// no idea why to go on
-			return null;
-		}
-		if (icon.getBundle() == null || icon.getBundle().trim().length() == 0) {
-			// Plugin.javajet#findImageDescriptor treats relative paths as bundle-local
-			return new Path(icon.getPath()).makeRelative().toString();
-		} else {
-			// makeAbsolute on bundle segment only to avoid unwinding of ".." 
-			return new Path(icon.getBundle()).makeAbsolute().append(icon.getPath()).toString();
-		}
-	}
-
-	private static void logWarning(String message) {
-		final Bundle b = Platform.getBundle("org.eclipse.papyrus.gmf.bridge");
-		Platform.getLog(b).log(new Status(IStatus.WARNING, b.getSymbolicName(), 0, message, null));
-	}
-
-
-	// XXX handle other tool types (action, whatever)
-	private static class ToolSwitch extends GMFToolSwitch<ToolGroupItem> {
-		private final Map<AbstractTool, ToolGroupItem> toolHistory;
-
-		private ToolSwitch(Map<AbstractTool, ToolGroupItem> toolMap) {
-			assert toolMap != null;
-			toolHistory = toolMap;
-		}
-
-		public List<ToolGroupItem> toGroupItems(List<AbstractTool> toolDefinitions) {
-			assert toolDefinitions != null;
-			List<ToolGroupItem> rv = new LinkedList<ToolGroupItem>();
-			for (AbstractTool next : toolDefinitions) {
-				ToolGroupItem value = doSwitch(next);
-				if (value == null) {
-					logWarning("Can't transform '" + next + " to ToolGroupItem");
-				} else {
-					toolHistory.put(next, value);
-					rv.add(value);
-				}
-			}
-			return rv;
-		}
-
-		public ToolGroupItem casePaletteSeparator(PaletteSeparator object) {
-			return GMFGenFactory.eINSTANCE.createSeparator();
-		}
-		
-		public ToolGroupItem caseCreationTool(CreationTool tool) {
-			ToolEntry ne = GMFGenFactory.eINSTANCE.createToolEntry();
-			setupCommonToolEntry(ne, tool);
-			return ne;
-		}
-
-		public ToolGroupItem caseStandardTool(StandardTool standardTool) {
-			StandardEntry entry = GMFGenFactory.eINSTANCE.createStandardEntry();
-			switch (standardTool.getToolKind().getValue()) {
-				case StandardToolKind.SELECT : {
-					entry.setKind(StandardEntryKind.SELECT_LITERAL);
-					break;
-				}
-				case StandardToolKind.MARQUEE : {
-					entry.setKind(StandardEntryKind.MARQUEE_LITERAL);
-					break;
-				}
-				case StandardToolKind.ZOOM_PAN : {
-					entry.setKind(StandardEntryKind.ZOOM_LITERAL);
-					break;
-				}
-			}
-			setupCommonToolEntry(entry, standardTool);
-			return entry;
-		}
-
-		public ToolGroupItem caseGenericTool(GenericTool tool) {
-			if (tool.getToolClass() == null) {
-				logWarning("GenericTool element without a class, no palette entry createed");
-				return null;
-			}
-			ToolEntry ne = GMFGenFactory.eINSTANCE.createToolEntry();
-			ne.setQualifiedToolName(tool.getToolClass());
-			setupCommonToolEntry(ne, tool);
-			return ne;
-		}
-
-		public ToolGroupItem caseToolGroup(org.eclipse.papyrus.gmf.tooldef.ToolGroup toolGroup) {
-			ToolGroup tg = GMFGenFactory.eINSTANCE.createToolGroup();
-			tg.setCollapse(toolGroup.isCollapsible());
-			tg.setStack(toolGroup.isStack());
-			setupCommonToolEntry(tg, toolGroup);
-			tg.getEntries().addAll(toGroupItems(toolGroup.getTools()));
-			if (toolGroup.getActive() != null) {
-				assert false == toolHistory.get(toolGroup.getActive()) instanceof Separator;
-				EntryBase eb = (EntryBase) toolHistory.get(toolGroup.getActive());
-				if (eb == null || false == eb instanceof AbstractToolEntry) {
-					logWarning("Can't find entry to became default in the group:" + toolGroup);
-				} else {
-					((AbstractToolEntry) eb).setDefault(true);
-				}
-			}
-			return tg;
-		}
-
-		private static void setupCommonToolEntry(EntryBase te, AbstractTool tool) {
-			te.setTitle(tool.getTitle() == null ? "" : tool.getTitle()); // same at (*1*)
-			te.setDescription(tool.getDescription());
-			// FIXME need to change this once better tooling definition is in place.
-			// FIXME update gmfgen model to explicitly understand images from different bundles
-			if (tool.getLargeIcon() instanceof BundleImage) {
-				te.setLargeIconPath(constructIconPath((BundleImage) tool.getLargeIcon()));
-			}
-			if (tool.getSmallIcon() instanceof BundleImage) {
-				te.setSmallIconPath(constructIconPath((BundleImage) tool.getSmallIcon()));
-			}
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Actions.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Actions.qvto
deleted file mode 100644
index 54c1b6f6b18..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Actions.qvto
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-
-transformation Actions(in mapModel : GMFMAP, inout gmfgenModel : GMFGEN);
-
-main() {
-	var canvasMapping := mapModel.rootObjects()![GMFMAP::Mapping].diagram;
-	var genEditor := gmfgenModel.rootObjects()![GMFGEN::GenEditorGenerator];
-	var diagramContextMenu := genEditor.diagram.map contextMenu();
-	genEditor.contextMenus += diagramContextMenu;
-	if genEditor.diagram.generateCreateShortcutAction() then diagramContextMenu.items += object GMFGEN::CreateShortcutAction {} endif;
-	diagramContextMenu.items += object GMFGEN::LoadResourceAction {};
-}
-
-mapping GMFGEN::GenCommonBase::contextMenu() : GMFGEN::GenContextMenu {
-	result._context := OrderedSet { self };
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Audits.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Audits.qvto
deleted file mode 100644
index 726a561de80..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Audits.qvto
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library Audits;
- 
-import Utils;
-import Mappings;
-import gmf.GenModelAccess;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFTOOL uses tooldef('http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype GMFGRAPH uses gmfgraph('http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-
--- 
--- Audits
--- 
-
-mapping GMFMAP::AuditContainer::audits() : GMFGEN::GenAuditRoot {
-	result.categories += self.allContainers().map category();
-	result.rules += self.allContainers().audits.map rule();
-	
-	var allRulesWithContext := result.rules->select(not target.oclIsUndefined());
-	var rulesWithDiagramElementTarget := allRulesWithContext->select(target.oclIsTypeOf(GMFGEN::GenDiagramElementTarget));
-	rulesWithDiagramElementTarget.target[GMFGEN::GenDiagramElementTarget]->forEach(t) {
-		-- Basically, all rules with targets != null
-		-- get a context (emf.validation), which is a scope or set of elements audit is evaluated against.
-		-- For certain cases, e.g. diagram elements as audit targets, special logic to select these
-		-- elements should get generated - to filter diagram views by visualID, and hence
-		-- there's another implementation of IClientSelector and dedicated context.
-		var ctx : GMFGEN::GenAuditContext;
-		-- use of exists seems to be sufficient, as all ruleTargets for a given context should get same elements
-		-- by the nature of construction. However, more honest way would be to use forAll, accompanied with not isEmpty():
-		-- not cc.ruleTargets[GMFGEN::GenDiagramElementTarget]->isEmpty() and cc.ruleTargets[...]->forAll(element = t.element) 
-		ctx := result.clientContexts->selectOne(cc | cc.ruleTargets[GMFGEN::GenDiagramElementTarget]->exists(element = t.element));
-		-- there might be already a context to pick same elements this target has 
-		if ctx.oclIsUndefined() then {
-			ctx := object GMFGEN::GenAuditContext {
-				id := t.element.visualID.repr()->asList()->joinfields('_','Ctx_','')
-			};
-			result.clientContexts += ctx;
-		} endif;
-		t.contextSelector := ctx;
-	};
-	var defaultAuditContext := object GMFGEN::GenAuditContext {};
-	result.clientContexts += defaultAuditContext;
-	(allRulesWithContext - rulesWithDiagramElementTarget).target->forEach(t) { t.contextSelector := defaultAuditContext };
-}
-
-mapping GMFMAP::AuditContainer::category() : GMFGEN::GenAuditContainer {
-	id := self.id;
-	name := self.name;
-	description := self.description;
-	path += self.parentContainer.resolveone(GMFGEN::GenAuditContainer).path;
-	-- alternative, not sure which one is better: 
-	-- path += self.parentContainer.map category().path;
-	path += result;
-}
-
-mapping GMFMAP::AuditRule::rule() : GMFGEN::GenAuditRule {
-	id := self.id;
-	name := self.name;
-	message := self.message;
-	description := self.description;
-	useInLiveMode := self.useInLiveMode;
-	target := self.target.map auditTarget();
-	rule := self.rule.map createConstraint();
-	severity := self.severity.severity();
-	category := self.container.map category();
-}
-
-mapping GMFMAP::Auditable::auditTarget() : GMFGEN::GenAuditable  
-	disjuncts 
-		GMFMAP::DomainElementTarget::ruleTarget, 
-		GMFMAP::NotationElementTarget::ruleTarget, 
-		GMFMAP::DiagramElementTarget::ruleTarget,
-		GMFMAP::AuditedMetricTarget::ruleTarget, 
-		GMFMAP::DomainAttributeTarget::ruleTarget
-	{} --assert (false) with log ('Unknown rule target', self);
-	
-mapping GMFMAP::DomainElementTarget::ruleTarget() : GMFGEN::GenDomainElementTarget {
-	element := self.element.findGenClass();
-}
-
-mapping GMFMAP::NotationElementTarget::ruleTarget() : GMFGEN::GenNotationElementTarget {
-	element := self.element.findGenClass(); -- XXX double-check if domain's genmodel should be consulted here, not notation's
-}
-
-mapping GMFMAP::DiagramElementTarget::ruleTarget() : GMFGEN::GenDiagramElementTarget {
-	-- alternatives:
-	if self.element.oclIsKindOf(LinkMapping) then {
-		element += self.element.oclAsType(LinkMapping).map structure();
-	} else if self.element.oclIsKindOf(NodeMapping) then {
-		var el := self.element.container();
-		if el.oclIsKindOf(TopNodeReference) then
-			element += el.oclAsType(TopNodeReference).map structure()
-		else
-			element += el.oclAsType(ChildReference).map structure(self.element.oclAsType(NodeMapping)) 
-		endif
-	} endif
-	endif;
---	element += self.element.resolveIn(GMFMAP::NodeMapping::structure, GMFGEN::GenCommonBase);
---	element += self.element.resolveIn(GMFMAP::LinkMapping::structure, GMFGEN::GenCommonBase);
---	element += self.element.resolveIn(GMFMAP::TopNodeReference::structure, GMFGEN::GenCommonBase);
---	element += self.element.resolve(GMFGEN::GenCommonBase);
-}
-
-mapping GMFMAP::AuditedMetricTarget::ruleTarget() : GMFGEN::GenAuditedMetricTarget {
-	result.metric := self.metric.map rule();
-	var resultClassifier := loadEcoreGenModel().genPackages->first().genClassifiers[GENMODEL::GenDataType]->selectOne(ecoreDataType.name='EDoubleObject');
-	assert (not resultClassifier.oclIsUndefined()) with log ('Troubles loading ecore.genmodel and accessing EDoubleObject');
-	result.metricValueContext := resultClassifier;
-}
-
-mapping GMFMAP::DomainAttributeTarget::ruleTarget() : GMFGEN::GenDomainAttributeTarget {
-	attribute := self.attribute.findGenFeature();
-	nullAsError := self.nullAsError;
-}
-
--- 
--- Metrics
--- 
-
-mapping GMFMAP::MetricContainer::metrics() : GMFGEN::GenMetricContainer {
-	metrics += self.metrics.map rule();
-}
-
-mapping GMFMAP::MetricRule::rule() : GMFGEN::GenMetricRule {
-	key := self.key;
-	name := self.name;
-	description := self.description;
-	lowLimit := self.lowLimit;
-	highLimit := self.highLimit;
-	rule := self.rule.map createValueExpression();
-	target := self.target.map metricTarget();
-}
-
-mapping GMFMAP::Measurable::metricTarget() : GMFGEN::GenMeasurable
-	disjuncts 
-		GMFMAP::DomainElementTarget::ruleTarget, 
-		GMFMAP::NotationElementTarget::ruleTarget, 
-		GMFMAP::DiagramElementTarget::ruleTarget
-	{} --assert (false) with log ('Unknown rule target', self);
-	
---
---	Queries
---
-
-query GMFMAP::AuditContainer::allContainers() : Sequence(GMFMAP::AuditContainer) =
-	self.childContainers.allContainers()->flatten()->prepend(self);
-	
-query GMFMAP::Severity::severity() : GMFGEN::GenSeverity =
-	switch  {
-		case (self = GMFMAP::Severity::INFO) return GMFGEN::GenSeverity::INFO;
-		case (self = GMFMAP::Severity::WARNING) return GMFGEN::GenSeverity::WARNING;
-		case (self = GMFMAP::Severity::ERROR) return GMFGEN::GenSeverity::ERROR;
-		else return null;
-	};
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Behaviours.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Behaviours.qvto
deleted file mode 100644
index a63615bd2b0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Behaviours.qvto
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2020 Montages A.G., CEA LIST, Artal
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- * 	Guillaume Hillairet (Montages A.G.) : initial implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-*/
-library Behaviours;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype GMFGRAPH uses gmfgraph('http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-
---
---	Custom Behaviour
---
-
-helper GMFMAP::CanvasMapping::handleRelatedDiagram(in mapElement : GMFMAP::MappingEntry) : GMFGEN::OpenDiagramBehaviour =
-	object GMFGEN::OpenDiagramBehaviour {
-		-- XXX alternative approach to tell whether related diagram is the same we are processing now, 
-		-- originally self.eResource() != mapElement.eResource()
-		if self <> mapElement.container() then {
-			diagramKind := 'FIXME put GenEditorGenerator.modelID value here';
-			editorID := 'FIXME put GenEditorView.id value here';
-		} endif;
-	};
-
---
---	VisualEffect
---
-
-mapping GMFMAP::VisualEffectMapping::createVisualEffects(parent: GMFGEN::GenCommonBase, diagramElement: GMFGRAPH::DiagramElement): GMFGEN::GenVisualEffect {
-	name := self.diagramPin.name;
-	pinKind := self.diagramPin.oclAsType(EObject).eClass().name;
-	operationName := diagramElement.getOperationName(self.diagramPin);
-	operationType := self.diagramPin.getOperationType();
-	oclExpression := self.oclExpression;
-	
-	editPolicyQualifiedClassName := parent.getEditPolicyQualifiedClassName(self.diagramPin);
-	key := result.editPolicyQualifiedClassName + '.KEY';
-}
-
---
---	Helpers
---
-
-helper GMFGEN::GenCommonBase::getEditPolicyQualifiedClassName(pin: Pin): String =
-	self.getDiagram().editPoliciesPackageName + '.' + 
-		pin.name.firstToUpper() + // FIXME Should be valid Java Class Name
-		self.visualID.toString() + 'Policy';
-
-helper GMFGRAPH::DiagramElement::getOperationName(pin: GMFGRAPH::Pin): String =
-	if not self.figure.actualFigure.hasFigurePin(pin) then
-		let graphChildAccess = self.figure.accessors->any(figure.hasFigurePin(pin)) in
-		if graphChildAccess.oclIsUndefined() then
-			pin.getOperationName()	
-		else
-			 graphChildAccess.accessor + "()." + pin.getOperationName()
-		endif 
-	else pin.getOperationName() endif;
-
-helper GMFGRAPH::Figure::hasFigurePin(pin: GMFGRAPH::Pin): Boolean =
-	let realFigure = 
-		if self.oclIsTypeOf(FigureRef) then 
-			self.oclAsType(FigureRef).figure 
-		else self.oclAsType(RealFigure) endif
-	in 
-		realFigure.pins->includes(pin);
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/DiagramRunTimeModel.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/DiagramRunTimeModel.qvto
deleted file mode 100644
index 601e763f4e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/DiagramRunTimeModel.qvto
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-
-transformation DiagramRunTimeModel(in diagramRuntimeGenModel : GENMODEL, inout gmfgenModel : GMFGEN);
-
-main() {
-	var genModel = diagramRuntimeGenModel.rootObjects()![GENMODEL::GenModel];
-	var genEditor = gmfgenModel.rootObjects()![GMFGEN::GenEditorGenerator];
-	
-	var notationPackage = genModel.genPackages[ecorePackage.name = 'notation'];
-	var nodeClass : GENMODEL::GenClass = notationPackage.genClasses![ecoreClass.name = 'Node'];
-	var linkClass : GENMODEL::GenClass = notationPackage.genClasses![ecoreClass.name = 'Edge'];
-	var diagramClass : GENMODEL::GenClass = notationPackage.genClasses![ecoreClass.name = 'Diagram'];
-	var labelClass : GENMODEL::GenClass = nodeClass;
-	
-	var gd = genEditor.diagram;
-	gd.diagramRunTimeClass := diagramClass;-- Notation.Diagram;
-	genEditor.diagram.getAllNodes()->forEach(n) { n.diagramRunTimeClass := nodeClass };
-	genEditor.diagram.compartments->forEach(c) { c.diagramRunTimeClass := nodeClass };
-	genEditor.diagram.links->forEach(l) { l.diagramRunTimeClass := linkClass };
-	genEditor.diagram.getAllNodes().labels->forEach(l) { l.diagramRunTimeClass := nodeClass };
-	genEditor.diagram.links.labels->forEach(l) { l.diagramRunTimeClass := nodeClass };
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Identity.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Identity.qvto
deleted file mode 100644
index f096fea7467..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Identity.qvto
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.) 
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library Identity;
- 
-import gmf.VisualIdentifierDispenser;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype GMFGRAPH uses gmfgraph('http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition');
-
-
-query GMFGEN::GenCommonBase::visualID(): Integer = self.getVisualID();
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Map2Gen.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Map2Gen.qvto
deleted file mode 100644
index a345b949780..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Map2Gen.qvto
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-import Utils;
-import Mappings;
-import DiagramRunTimeModel;
-import PropertySheet;
-import PreferencePages;
-import Navigator;
-import Actions;
-import RichClientPlatformApp;
-import Audits;
-import Parsers;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-
-transformation Map2Gen(
-	in mapModel: GMFMAP, 
-	in domainGenModel: GENMODEL, 
-	in diagramRuntimeGenModel: GENMODEL, 
-	out gmfgenModel: GMFGEN);
-
-configuration property rcp: Boolean;
-configuration property useMapMode: Boolean;
-configuration property useFullRunTime: Boolean;
-configuration property useInTransformationCodeGen: Boolean;
-
-main() {
-	var mapRoot := mapModel.rootObjects()![GMFMAP::Mapping]; 
-	genModel := domainGenModel.rootObjects()![GENMODEL::GenModel];
-	
-	Viewmaps::setMapMode(useMapMode);
-	useModeledViewmaps := not useInTransformationCodeGen;
-	
-	var genEditor := mapRoot.map structure();
-	genEditor.diagram.palette := mapRoot.diagram.map palette();
-	genEditor.domainGenModel := mapRoot.diagram.domainModel.findGenPackage().genModel;
-	genEditor.plugin := mapRoot.map editorPlugin();
-	genEditor.editor := object GenEditorView {};
-			
-	genEditor.diagramUpdater := object GenDiagramUpdater {};
-	genEditor.audits := mapRoot.audits.map audits(); -- these two should go before expression providers collection
-	genEditor.metrics := mapRoot.metrics.map metrics();
-	
-	if not GMFGEN::GenParserImplementation.allInstances()->isEmpty() then {
-		genEditor.labelParsers := mapRoot.map createGenParsers()
-	} endif;
-	
-	new DiagramRunTimeModel(diagramRuntimeGenModel, gmfgenModel).transform();
-	
-	if not rcp then new Navigator(mapModel, gmfgenModel).transform() endif;
-	
-	new PropertySheet(mapModel, gmfgenModel).transform();
-	new PreferencePages(mapModel, gmfgenModel).transform();
-	new Actions(mapModel, gmfgenModel).transform();
-	
-	if rcp then new RichClientPlatformApp(mapModel, gmfgenModel).transform() endif;
-	
-	-- collect orphan palette items and add them to the Default group.
-	var toolGroup :=  GMFGEN::ToolGroup.allInstances()->any(title = 'Default');
-	GMFGEN::ToolGroupItem.allInstances()->select(e | e.container().oclIsUndefined())->forEach(element) {
-		toolGroup.entries += element;
-	}
-}
-
--- 
--- Editor Plugin
--- 
-
-mapping GMFMAP::Mapping::editorPlugin() : GMFGEN::GenPlugin {
-	requiredPlugins := Set{'org.eclipse.gmf.tooling.runtime', 'org.eclipse.draw2d'};
-	
-	if self.links->notEmpty() or GMFMAP::LabelMapping.allInstances()->notEmpty() then
-		
-		requiredPlugins += 'org.eclipse.gmf.runtime.draw2d.ui'
-	endif;
-	
-	self.diagram.diagramCanvas.figures->forEach(fg) {
-		if not fg.implementationBundle.oclIsUndefined() then {
-			result.requiredPlugins += fg.implementationBundle
-		} endif;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Mappings.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Mappings.qvto
deleted file mode 100644
index 992b253992b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Mappings.qvto
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library Mappings;
-
-import Utils;
-import ModelFacets;
-import Palette;
-import Viewmaps;
-import ModeledViewmaps;
-import Identity;
-import Behaviours;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFTOOL uses tooldef('http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype GMFGRAPH uses gmfgraph('http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-
---
---	Mapping
---
-
-property genEditorGenerator : GMFGEN::GenEditorGenerator = null;
-
-mapping GMFMAP::Mapping::structure() : GMFGEN::GenEditorGenerator {
-	init {
-		result := object GMFGEN::GenEditorGenerator {
-			diagram := self.diagram.map structure();
-		}
-	}
-	genEditorGenerator := result;
-	
-	childReferences := self.getChildReferences();
-	self.nodes->map structure();
-	diagram.links := self.links->map structure();
-		
-	diagram.getAllNodes()->forEach(n) { setupElementType(n) };
-	diagram.links->forEach(l) { setupElementType(l) };
-		 
-	if self.expressionsByLanguages()->notEmpty() then 
-		expressionProviders := self.map createProviderContainer()
-	endif;
-}
-
-mapping GMFMAP::Mapping::createProviderContainer(): GMFGEN::GenExpressionProviderContainer {
-	self.expressionsByLanguages()->forEach(e) {
-		providers += e.map createExpressionProvider()
-	}
-}
-
-mapping GMFMAP::CanvasMapping::structure() : GMFGEN::GenDiagram {
-	init {
-		result := object GenDiagram {
-			viewmap := self.viewmap();
-			domainDiagramElement := self.domainMetaElement.findGenClass();
-			iconProviderPriority := GMFGEN::ProviderPriority::Low;
-			validationProviderPriority := GMFGEN::ProviderPriority::Low;
-		}
-	}
-	
-	result.visualID := result.visualID();
-	
-	if result.domainDiagramElement.oclIsUndefined() then 
-		result.elementType := object GMFGEN::NotationType {}
-	else
-		result.elementType := result.domainDiagramElement.getOrCreateRuntimeMetamodelType()
-	endif;
-}
-
--- 
--- TopLevelNode
--- 
-
-mapping GMFMAP::TopNodeReference::structure() : GMFGEN::GenTopLevelNode {
-	init {
-		result := object GenTopLevelNode {
-			modelFacet := self.createModelFacet();
-			viewmap := self.viewmap();		
-		}
-	}
-	genEditorGenerator.diagram.topLevelNodes += result;
-	result.visualID := result.visualID();
-	self.child.tool.map paletteEntry().oclAsType(ToolEntry).genNodes += result;
-	
-	self.child.map abstractStructure(result);
-		
-	labels += self.child.labelMappings->map createNodeLabel(self, result);
-	behaviour += self.child.relatedDiagrams.handleRelatedDiagram(self.child);
-	behaviour += self.child.visualEffects->map createVisualEffects(result, self.child.diagramNode); 
-}
-
---
---
---
-mapping GMFMAP::NodeMapping::abstractStructure(inout genNode: GMFGEN::GenNode) {
-	var mapOfCompartments : Dict(CompartmentMapping, GenCompartment) = Dict{};
-	self.compartments->forEach(c) {
-		var childCompartment := object GMFGEN::GenCompartment {
-			title := c.compartment.name;
-			canCollapse := c.compartment.collapsible;
-			needsTitle := c.compartment.needsTitle;
-			viewmap := c.viewmap();
-		};
-		mapOfCompartments->put(c, childCompartment);
-		genEditorGenerator.diagram.compartments += childCompartment;
-		genNode.compartments += childCompartment;
-		childCompartment.node := genNode;
-		childCompartment.visualID := childCompartment.visualID();
-	};
-	
-	self.children->forEach(childNodeRef) {
-		var compartmentMapping := childNodeRef.compartment;
-		var genChildContainer : GenChildContainer = null; 
-		if not compartmentMapping.oclIsUndefined() and not mapOfCompartments->get(compartmentMapping).oclIsUndefined() then
-			genChildContainer := mapOfCompartments->get(compartmentMapping)
-		else
-			 genChildContainer := genNode
-		endif;
-		
-		var childNodeMapping := childNodeRef.child;
-		var node := childNodeRef.findProcessableChildReference();
-		var childNode := node.map structure(childNodeMapping);
-		if genChildContainer.oclIsKindOf(GenCompartment) and childNodeMapping.children->size() > 0 then
-			genChildContainer.oclAsType(GenCompartment).listLayout := false
-		endif;
-		genChildContainer.childNodes += childNode;
-	};
-}
-
--- 
--- GenChildNode
--- 
-abstract mapping GMFMAP::ChildReference::abstractStructure(nodeMapping: GMFMAP::NodeMapping): GMFGEN::GenChildNode {
-	modelFacet := self.createModelFacet();
-	viewmap := self.viewmap(nodeMapping);
-
-	self.child.tool.map paletteEntry().oclAsType(ToolEntry).genNodes += result;
-}
-
-mapping GMFMAP::ChildReference::structure(nodeMapping: GMFMAP::NodeMapping) : GMFGEN::GenChildNode
-disjuncts 
-	GMFMAP::ChildReference::createGenChildLabelNode, 
-	GMFMAP::ChildReference::createGenChildSideAffixedNode, 
-	GMFMAP::ChildReference::createGenChildNode 
-{}
-
-mapping GMFMAP::ChildReference::createGenChildLabelNode(nodeMapping: GMFMAP::NodeMapping) : GMFGEN::GenChildLabelNode
-inherits GMFMAP::ChildReference::abstractStructure 
-when { 
-	nodeMapping.isPureLabelNode() 
-} 
-{
-	init {
-		result := object GMFGEN::GenChildLabelNode {}
-	}
-	genEditorGenerator.diagram.childNodes += result;
-	result.visualID := result.visualID();
-	
-	var soleLabel := nodeMapping.labelMappings->first();
-	labelModelFacet := soleLabel.map createLabelModelFacet(self);
-	labelReadOnly := soleLabel.readOnly;
-	labelElementIcon := soleLabel.diagramLabel.elementIcon;
-}
-
-mapping GMFMAP::ChildReference::createGenChildSideAffixedNode(nodeMapping: GMFMAP::NodeMapping) : GMFGEN::GenChildSideAffixedNode
-inherits GMFMAP::ChildReference::abstractStructure 
-when { 
-	nodeMapping.diagramNode.affixedParentSide <> GMFGRAPH::Direction::NONE
-} 
-{
-	init {
-		result := object GMFGEN::GenChildSideAffixedNode {}
-	}
-	
-	genEditorGenerator.diagram.childNodes += result;
-	result.visualID := result.visualID();
-	self.child.map abstractStructure(result);
-	
-	preferredSideName := nodeMapping.diagramNode.getAffixedSideAsPositionConstantsName();	
-	labels += nodeMapping.labelMappings->map createNodeLabel(self, result);
-	behaviour += nodeMapping.relatedDiagrams.handleRelatedDiagram(nodeMapping);
-	behaviour +=  nodeMapping.visualEffects->map createVisualEffects(result, nodeMapping.diagramNode);
-}
-
-mapping GMFMAP::ChildReference::createGenChildNode(nodeMapping: GMFMAP::NodeMapping) : GMFGEN::GenChildNode 
-inherits GMFMAP::ChildReference::abstractStructure
-{
-	init {
-		result := object GMFGEN::GenChildNode {}
-	}
-	genEditorGenerator.diagram.childNodes += result;
-	result.visualID := result.visualID();
-	self.child.map abstractStructure(result);
-	
-	nodeMapping.labelMappings->map createNodeLabel(self, result); 	
-	behaviour += nodeMapping.relatedDiagrams.handleRelatedDiagram(nodeMapping);
-	behaviour +=  nodeMapping.visualEffects->map createVisualEffects(result, nodeMapping.diagramNode);
-}
-
--- 
--- NodeLabel
--- 
-
-mapping GMFMAP::LabelMapping::createNodeLabel(node: NodeReference, inout genNode: GMFGEN::GenNode) : GMFGEN::GenNodeLabel {
-	init {
-		if self.diagramLabel.external then
-			result := object GenExternalNodeLabel {}
-		else 
-			result := object GenNodeLabel {}
-		endif
-	}
-	
-	result.viewmap := self.viewmap();
-	result.modelFacet := self.map createLabelModelFacet(node);
-	result.readOnly := self.readOnly;
-	result.elementIcon := self.diagramLabel.elementIcon;
-	genNode.labels += result;
-	result.visualID := result.visualID();
-}
-
---
---	GenLink
---
-mapping GMFMAP::LinkMapping::structure() : GMFGEN::GenLink 
-when {
-	not self.diagramLink.oclIsUndefined() and
-	not self.linkMetaFeature.oclIsUndefined()
-}{
-	init {
-		result := object GMFGEN::GenLink {
-			-- model facet
-			if not (self.domainMetaElement.oclIsUndefined() and self.linkMetaFeature.oclIsUndefined()) then 
-				modelFacet := self.map createModelFacet()
-			endif;
-			
-			viewmap := self.viewmap();		
-		}
-	}
-	
-	genEditorGenerator.diagram.links += result;
-	result.visualID := result.visualID();
-	
-	-- labels
-	self.labelMappings->map structure(self, result);
-			
-	self.tool.map paletteEntry().oclAsType(ToolEntry).genLinks += result;
-	result.creationConstraints := self.creationConstraints.map structure();
-	
-	behaviour += self.visualEffects->map createVisualEffects(result, self.diagramLink);
-}
-
-mapping LabelMapping::structure(link: GMFMAP::LinkMapping, inout genLink: GMFGEN::GenLink): GenLinkLabel {
-	init {
-		result := object GMFGEN::GenLinkLabel {
-			readOnly := self.readOnly;
-			elementIcon := self.diagramLabel.elementIcon;
-			modelFacet := self.map createLabelModelFacet(link);
-			viewmap := self.viewmap();
-			
-			var alignmentFacet := self.diagramLabel.findAlignmentFacet();
-			if not alignmentFacet.oclIsUndefined() then
-				alignment := switch  {
-					case (alignmentFacet.alignment = GMFGRAPH::Alignment::BEGINNING) LinkLabelAlignment::SOURCE;
-					case (alignmentFacet.alignment = GMFGRAPH::Alignment::CENTER) LinkLabelAlignment::MIDDLE;
-					case (alignmentFacet.alignment = GMFGRAPH::Alignment::END) LinkLabelAlignment::TARGET;
-					else LinkLabelAlignment::MIDDLE;
-				}
-			endif;
-		}
-	}
-	
-	genLink.labels += result;
-	result.visualID := result.visualID()
-}
-
-
--- XXX ElementType as return value, disjunct?
-mapping GENMODEL::GenClass::gmfRuntimeMetamodelType() : GMFGEN::MetamodelType {}
-
---
---	Helpers
---
-
-query GENMODEL::GenClass::getOrCreateRuntimeMetamodelType() : GMFGEN::ElementType {
-	var mmt = self.resolveoneIn(GENMODEL::GenClass::gmfRuntimeMetamodelType, GMFGEN::MetamodelType);
-	if mmt.oclIsUndefined() then 
-		return self.map gmfRuntimeMetamodelType() 
-	endif;
-	return object GMFGEN::SpecializationType { metamodelType := mmt }
-}
-
--- XXX review - Specialization type is created again and again - why not reuse it?
--- static, for some reasons, helpers couldn't specify 'inout' for context element
--- XXX, actually, don't need GenNode here, GenClass should be sufficient
-helper setupElementType(inout genNode : GMFGEN::GenNode) {
-	if genNode.modelFacet.oclIsUndefined() then genNode.elementType := object GMFGEN::NotationType {}
-	else genNode.elementType := genNode.modelFacet.metaClass.getOrCreateRuntimeMetamodelType() endif;
-	return;
-}
-
-helper setupElementType(inout genLink : GMFGEN::GenLink) {
-	if genLink.modelFacet.oclIsUndefined() then 
-		genLink.elementType := object GMFGEN::NotationType {}
-	else 
-		if genLink.modelFacet.oclIsKindOf(GMFGEN::TypeModelFacet) then
-			genLink.elementType := genLink.modelFacet.oclAsType(GMFGEN::TypeModelFacet).metaClass.getOrCreateRuntimeMetamodelType()
-		else { -- ref-based link; specialize null
-			genLink.elementType := object GMFGEN::SpecializationType {};
-		--	genLink.elementType.displayName := genLink.modelFacet.oclAsType(FeatureLinkModelFacet).metaFeature.ecoreFeature.name.firstToUpper();
-		} endif
-	endif;
-	return;
-}
-
-helper GMFMAP::CanvasMapping::viewmap(): Viewmap =
-	if useModeledViewmaps then
-		object ModeledViewmap {
-			figureModel := self.diagramCanvas.oclAsType(EObject);
-		}
-	else
-		self.diagramCanvas.map Viewmaps::viewmap()
-	endif;
-
-helper GMFMAP::TopNodeReference::viewmap(): Viewmap =
-	if useModeledViewmaps then
-		self.child.diagramNode.ModeledViewmaps::viewmap()
-	else
-		self.child.diagramNode.Viewmaps::viewmap()
-	endif;
-
-helper GMFMAP::ChildReference::viewmap(_mapping: NodeMapping): Viewmap =
-	if useModeledViewmaps then
-		self.child.diagramNode.ModeledViewmaps::viewmap()
-	else
-		self.Viewmaps::viewmap(_mapping)
-	endif;
-
-helper GMFMAP::LinkMapping::viewmap(): Viewmap =
-	if useModeledViewmaps then
-		self.diagramLink.ModeledViewmaps::viewmap()
-	else
-		self.diagramLink.Viewmaps::viewmap()
-	endif;
-
-helper GMFMAP::LabelMapping::viewmap(): Viewmap =
-	if useModeledViewmaps then
-		self.diagramLabel.ModeledViewmaps::viewmap()
-	else
-		self.diagramLabel.Viewmaps::viewmap()
-	endif;
-
-helper GMFMAP::CompartmentMapping::viewmap(): Viewmap =
-	if useModeledViewmaps then
-		self.compartment.ModeledViewmaps::viewmap()
-	else
-		self.compartment.Viewmaps::viewmap()
-	endif;
-
---	
---	Queries
---
-	
-query GMFMAP::Mapping::expressionsByLanguages(): Sequence(ValueExpression) =
-	GMFMAP::ValueExpression.allInstances()->iterate(it; res: Sequence(ValueExpression) = Sequence{} |
-		if res->exists(e | e.language = it.language) then res else res->including(it) endif
-	);
-
-query GMFGRAPH::Node::getAffixedSideAsPositionConstantsName() : String =
-	switch {
-		case (self.affixedParentSide = GMFGRAPH::Direction::NONE) assert (false) with log('DiagramNode is not side-affixed', self);
-		case (self.affixedParentSide = GMFGRAPH::Direction::EAST) return 'EAST';
-		case (self.affixedParentSide = GMFGRAPH::Direction::WEST) return 'WEST';
-		case (self.affixedParentSide = GMFGRAPH::Direction::NORTH) return 'NORTH';
-		case (self.affixedParentSide = GMFGRAPH::Direction::SOUTH) return 'SOUTH';
-		case (self.affixedParentSide = GMFGRAPH::Direction::NSEW) return 'NONE'; -- any side
-		else return 'NONE'; -- any side
-	};
-
-query DiagramElement::findAlignmentFacet(): AlignmentFacet =
-	self.facets->selectOne(e | e.oclIsKindOf(AlignmentFacet)).oclAsType(AlignmentFacet);
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ModelFacets.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ModelFacets.qvto
deleted file mode 100644
index 9b27a0001db..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ModelFacets.qvto
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library ModelFacets;
-
-import Utils;
-import ValueExpressions;
-import Parsers;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFTOOL uses tooldef('http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype GMFGRAPH uses gmfgraph('http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-
---	
---	TypeModelFacet
---
-
-helper GMFMAP::NodeReference::createModelFacet() : GMFGEN::TypeModelFacet {
-	if self.child.domainMetaElement.oclIsUndefined() then return null endif;
-	var mf := object TypeModelFacet {};
-	
-	mf.metaClass := self.child.domainMetaElement.findGenClass();
-	mf.containmentMetaFeature := self.containmentFeature.findGenFeature();
-	
-	if self.childrenFeature.oclIsUndefined() then 
-		mf.childMetaFeature := mf.containmentMetaFeature 
-	else 
-		mf.childMetaFeature := self.childrenFeature.findGenFeature() 
-	endif;
-	
-	mf.modelElementSelector := self.child.domainSpecialization.map createConstraint(); 
-	mf.modelElementInitializer := self.child.domainInitializer.map structure();
-	return mf;
-}
-
---
---	LinkModelFacet
---
-
-mapping GMFMAP::LinkMapping::createModelFacet(): GMFGEN::LinkModelFacet 
-	disjuncts 
-		GMFMAP::LinkMapping::createFeatureLinkModelFacet,
-		GMFMAP::LinkMapping::createTypeLinkModelFacet
-	{}
-
-mapping GMFMAP::LinkMapping::createFeatureLinkModelFacet() : GMFGEN::FeatureLinkModelFacet 
-when {
-	self.domainMetaElement.oclIsUndefined() and not self.linkMetaFeature.oclIsUndefined()
-}
-{	
-	metaFeature := self.linkMetaFeature.findGenFeature();
-}
-
-mapping GMFMAP::LinkMapping::createTypeLinkModelFacet() : GMFGEN::TypeLinkModelFacet 
-when {
-	not self.domainMetaElement.oclIsUndefined()
-} 
-{	
-	metaClass := self.domainMetaElement.findGenClass();
-	containmentMetaFeature := self.containmentFeature.findGenFeature();
-	childMetaFeature := containmentMetaFeature;
-	sourceMetaFeature := self.sourceMetaFeature.findGenFeature();
-	targetMetaFeature := self.linkMetaFeature.findGenFeature();
-	modelElementSelector := self.domainSpecialization.map createConstraint(); -- ALTERNATIVE: if not self.domainSpecialization.oclIsUndefined() then modelElementSelector := self.domainSpecialization.map structure() endif; 
-	modelElementInitializer := self.domainInitializer.map structure();
-}
-
---
---	LabelModelFacet
---
-
-mapping GMFMAP::LabelMapping::createLabelModelFacet(node: NeedsContainment) : GMFGEN::LabelModelFacet 
-	disjuncts 
-		GMFMAP::LabelMapping::createDefaultLabelModelFacet,
-		GMFMAP::FeatureLabelMapping::createFeatureLabelModelFacet,
-		GMFMAP::DesignLabelMapping::createDesignLabelModelFacet,
-		GMFMAP::ExpressionLabelMapping::createExpressionLabelModelFacet,
-		GMFMAP::OclChoiceLabelMapping::createOclChoiceLabelModelFacet
-	{}
-
-mapping GMFMAP::LabelMapping::createDefaultLabelModelFacet(node: NeedsContainment) : GMFGEN::LabelModelFacet 
-	when {self.oclIsTypeOf(LabelMapping)} 
-{
---	init {
---		if auxParser = null then 
---			auxParser := object GMFGEN::ExternalParser {}
---		endif;
---	}
---	parser := auxParser;
-	parser := self.map createExternalParser();
-}
-
-mapping GMFMAP::FeatureLabelMapping::createFeatureLabelModelFacet(node: NeedsContainment) : GMFGEN::FeatureLabelModelFacet {
-	metaFeatures += self.features.findGenFeature();
-	editableMetaFeatures += self.editableFeatures.findGenFeature();
-	viewPattern := self.viewPattern;
-	editPattern := self.editPattern;
-	editorPattern := self.editorPattern;
-	viewMethod := self.viewMethod.convertLabelTextAccessMethod();
-	editMethod := self.editMethod.convertLabelTextAccessMethod();
-	
-	parser := if self.isEnumLabelMapping() then self.getOrCreateEnumParser() else self.getOrCreatePredefinedParser() endif;
-}
-
-mapping GMFMAP::DesignLabelMapping::createDesignLabelModelFacet(node: NeedsContainment) : GMFGEN::DesignLabelModelFacet {
---	if designLabelParser = null then 
---		designLabelParser := object GMFGEN::ExternalParser {} 
---	endif;	
---	parser := designLabelParser;
-	parser := self.map createExternalParser();
-}
-
-mapping GMFMAP::ExpressionLabelMapping::createExpressionLabelModelFacet(node: NeedsContainment): GMFGEN::ExpressionLabelModelFacet {
-	parser := self.map createExpressionLabelParser();
-}
-
-mapping GMFMAP::OclChoiceLabelMapping::createOclChoiceLabelModelFacet(node: NeedsContainment): GMFGEN::FeatureLabelModelFacet {
-	var genFeature = self.feature.findGenFeature();  
-	metaFeatures += genFeature;
-	editableMetaFeatures += genFeature;
-	parser := self.map createOclChoiceParser();
-}
-
--- 
--- FeatureInitializer
--- 
-
-mapping GMFMAP::FeatureInitializer::structure() : GMFGEN::GenFeatureInitializer {
-	init {
-		assert (false) with log ('No idea how to process FeatureInitializer', self);
-	}
-}
-
-mapping GMFMAP::FeatureValueSpec::structure() : GMFGEN::GenFeatureInitializer {
-	init {
-		result := object GenFeatureValueSpec {
-			feature := self.feature.findGenFeature();
-			value := self.value.map createValueExpression();
-		}
-	}
-}
-
-mapping GMFMAP::ReferenceNewElementSpec::structure() : GMFGEN::GenFeatureInitializer {
-	init {
-		result := object GenReferenceNewElementSpec {
-			feature := self.feature.findGenFeature();
-			-- cast to GenFeatureSeqInitializer was in the original DGMT
-			newElementInitializers += self.newElementInitializers.map structure().oclAsType(GMFGEN::GenFeatureSeqInitializer);
-		}
-	}
-}
-
--- 
--- ElementInitializer
--- 
-
-mapping GMFMAP::ElementInitializer::structure() : GMFGEN::GenElementInitializer {
-	init {
-		assert (false) with log ('No idea how to process ElementInitializer', self);
-	}
-}
-
-mapping GMFMAP::FeatureSeqInitializer::structure() : GMFGEN::GenElementInitializer {
-	init {
-		result := object GenFeatureSeqInitializer {
-			initializers += self.initializers.map structure();
-			if not self.elementClass.oclIsUndefined() then
-				elementClass := self.elementClass.findGenClass()
-			endif;
-		}
-	}
-}
-
---	
---	Queries
---	
-
-query GMFMAP::ValueExpression::selectProvider(mapRoot: GMFMAP::Mapping): GenExpressionProviderBase =
-	mapRoot->resolveone(GMFGEN::GenExpressionProviderContainer).providers->any(e | 
-		e.getLanguage().equals(self.language)
-	);
-
-query GenLanguage::equals(lang: Language) : Boolean = self.repr() = lang.repr();
-
-query GMFMAP::LabelTextAccessMethod::convertLabelTextAccessMethod() : GMFGEN::LabelTextAccessMethod =
-	switch {
-		case (self = GMFMAP::LabelTextAccessMethod::NATIVE) return GMFGEN::LabelTextAccessMethod::NATIVE;
-		case (self = GMFMAP::LabelTextAccessMethod::REGEXP) return GMFGEN::LabelTextAccessMethod::REGEXP;
-		case (self = GMFMAP::LabelTextAccessMethod::PRINTF) return GMFGEN::LabelTextAccessMethod::PRINTF;
-		else return GMFGEN::LabelTextAccessMethod::MESSAGE_FORMAT;
-	};
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ModeledViewmaps.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ModeledViewmaps.qvto
deleted file mode 100644
index db61ec55f9d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ModeledViewmaps.qvto
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2020 Montages A.G., CEA LIST, Artal
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- * 	Guillaume Hillairet (Montages A.G.) : initial implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library ModeledViewmaps;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype GMFGRAPH uses gmfgraph('http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-
---
--- Modeled Viewmaps
---
-
-helper GMFGRAPH::Node::viewmap() : GMFGEN::Viewmap {
-	var rs := object ModeledViewmap { 
-		figureModel := self.oclAsType(ECORE::EObject); 
-	};
-	
-	return rs;
-}
-
-helper GMFGRAPH::Connection::viewmap() : GMFGEN::Viewmap {
-	var rs := object ModeledViewmap { 
-		figureModel := self.oclAsType(ECORE::EObject); 
-	};
-	
-	return rs;
-}
-helper GMFGRAPH::Compartment::viewmap() : GMFGEN::Viewmap {
-	var rs := object ModeledViewmap { 
-		figureModel := self.oclAsType(ECORE::EObject); 
-	};
-	
-	return rs;
-}
-helper GMFGRAPH::DiagramLabel::viewmap() : GMFGEN::Viewmap {
-	var rs := object ModeledViewmap { 
-		figureModel := self.oclAsType(ECORE::EObject); 
-	};
-	
-	-- for GenLinkLabel, need to specify alignment based on AlignmentFacet
-	-- besides, need to create LabelOffsetAttributes and optionally populate it from LabelOffsetFacet
-	return rs;
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Navigator.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Navigator.qvto
deleted file mode 100644
index 61235cd5de8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Navigator.qvto
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-import Utils;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-
-transformation Navigator(in mapModel : GMFMAP, inout gmfgenModel : GMFGEN);
-
--- FIXME result is not completely correct now
-main() {
-	var mapRoot := mapModel.rootObjects()![GMFMAP::Mapping];
-	var genEditor := gmfgenModel.rootObjects()![GMFGEN::GenEditorGenerator];
-	genEditor.navigator := mapRoot.diagram.map navigator(genEditor.diagram);
-}
-
-mapping GMFMAP::CanvasMapping::navigator(genDiagram : GMFGEN::GenDiagram) : GMFGEN::GenNavigator {
-	childReferences += genDiagram.map navigator();
-	childReferences += genDiagram.childNodes->collect(n | n.containers.getNode().map navigator(n));
-	childReferences += genDiagram.topLevelNodes.map navigator();
-	childReferences += genDiagram.links.map navigator();
-	childReferences += genDiagram.links->collect(l | l.getTargetGenNodes()->asSet().showLinkTargets(l));
-	childReferences += genDiagram.links->collect(l | l.getSourceGenNodes().showLinkSources(l));
-	-- Instead, may use GenLinkEnd.genOutgoingLinks/genIncomingLinks, but they seem to be less effective as they 
-	-- go through GenLink.sources/targets anyway
-	childReferences += genDiagram.links->collect(l | l.getTargetGenNodes().showIncomingLinks(l));
-	childReferences += genDiagram.links->collect(l | l.getSourceGenNodes().showOutgoingLinks(l));
-}
-
-mapping GMFGEN::GenDiagram::navigator() : GMFGEN::GenNavigatorChildReference {
-	GMFGEN::GenNavigatorReferenceType::children.populate(result, self, null);
-}
-mapping GMFGEN::GenTopLevelNode::navigator() : GMFGEN::GenNavigatorChildReference {
-	parent := self.diagram;
-	child := self;
-	referenceType := GenNavigatorReferenceType::children;
-}
-mapping GMFGEN::GenNode::navigator(childNode : GMFGEN::GenChildNode) : GMFGEN::GenNavigatorChildReference {
-	parent := self;
-	child := childNode;
-	referenceType := GenNavigatorReferenceType::children;
-}
-mapping GMFGEN::GenLink::navigator() : GMFGEN::GenNavigatorChildReference {
-	GMFGEN::GenNavigatorReferenceType::children.populate(result, self, self.diagram);
-	groupName := 'links';
-	groupIcon := 'icons/linksNavigatorGroup.gif';
-}
-
-helper GMFGEN::GenNavigatorReferenceType::populate(inout ref : GMFGEN::GenNavigatorChildReference, child : GMFGEN::GenCommonBase, parent : GMFGEN::GenCommonBase) : GMFGEN::GenNavigatorChildReference {
-	ref.child := child;
-	ref.referenceType := self;
-	ref.parent := parent;
-	return ref;
-}
-
-helper GMFGEN::GenLinkEnd::showLinkTargets(link : GMFGEN::GenLink) : GMFGEN::GenNavigatorChildReference {
-	var rv := object GMFGEN::GenNavigatorChildReference {};
-	GMFGEN::GenNavigatorReferenceType::out_target.populate(rv, self, link);
-	rv.groupName := 'target';
-	rv.groupIcon := 'icons/linkTargetNavigatorGroup.gif';
-	return rv;
-}
--- XXX Odd. Processing a link, adding a childreference to GenNode. Perhaps, using GenLinkEnd.genIncomingLinks would be better?
-helper GMFGEN::GenLinkEnd::showIncomingLinks(link : GMFGEN::GenLink) : GMFGEN::GenNavigatorChildReference {
-	var rv := object GMFGEN::GenNavigatorChildReference {};
-	GMFGEN::GenNavigatorReferenceType::in_source.populate(rv, link, self);
-	rv.groupName := 'incoming links';
-	rv.groupIcon := 'icons/incomingLinksNavigatorGroup.gif';
-	return rv;
-}
-helper GMFGEN::GenLinkEnd::showLinkSources(link : GMFGEN::GenLink) : GMFGEN::GenNavigatorChildReference {
-	var rv := object GMFGEN::GenNavigatorChildReference {};
-	GMFGEN::GenNavigatorReferenceType::in_source.populate(rv, self, link);
-	rv.groupName := 'source';
-	rv.groupIcon := 'icons/linkSourceNavigatorGroup.gif';
-	return rv;
-}
-helper GMFGEN::GenLinkEnd::showOutgoingLinks(link : GMFGEN::GenLink) : GMFGEN::GenNavigatorChildReference {
-	var rv := object GMFGEN::GenNavigatorChildReference {};
-	GMFGEN::GenNavigatorReferenceType::out_target.populate(rv, link, self);
-	rv.groupName := 'outgoing links';
-	rv.groupIcon := 'icons/outgoingLinksNavigatorGroup.gif';
-	return rv;
-}
-
-query GMFGEN::GenChildContainer::getNode() : GMFGEN::GenNode { assert (false) with log ('Abstract query call'); return null }
-query GMFGEN::GenNode::getNode() : GMFGEN::GenNode { return self }
-query GMFGEN::GenCompartment::getNode() : GMFGEN::GenNode { return self.node }
-
-query GMFGEN::GenLink::getSourceGenNodes() : OrderedSet(GMFGEN::GenLinkEnd) {
-	if self.modelFacet.oclIsUndefined() then return self.diagram.getAllPossibleLinkEnds() endif;
-	return self.sources;
-}
-query GMFGEN::GenLink::getTargetGenNodes() : OrderedSet(GMFGEN::GenLinkEnd) {
-	if self.modelFacet.oclIsUndefined() then {
-		return self.diagram.getAllPossibleLinkEnds() 
-	} endif;
-	return self.targets;
-}
-
-query GMFGEN::GenDiagram::getAllPossibleLinkEnds() : OrderedSet(GMFGEN::GenLinkEnd) {
-	-- XXX original DGMT's NavigatorHandler used getAllNodes here, which is not completely correct:
-	-- first, links can go to links, second, links can't go to GenChildLabelNode
-	var rs : OrderedSet(GenLinkEnd) = OrderedSet{};	
-	rs += self.topLevelNodes;
-	rs += self.childNodes->reject(oclIsKindOf(GMFGEN::GenChildLabelNode)); -- child nodes, excluding labels
-	rs += self.links;	
-	return rs;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Palette.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Palette.qvto
deleted file mode 100644
index f7df9cca705..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Palette.qvto
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library Palette;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFTOOL uses tooldef('http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-
--- 
--- Palette
--- 
-
-mapping GMFMAP::CanvasMapping::palette() : GMFGEN::Palette
-{
-	var paletteItems := self.palette.tools.map paletteEntry();
-	var topLevelTools := paletteItems->reject(e | e.oclIsKindOf(GMFGEN::ToolGroup));
-	
-	if topLevelTools->notEmpty() then {
-		var defaultGroup := object GMFGEN::ToolGroup {
-			title := 'Default';
-			description := 'Holds top-level non-container tools';
-			collapse := false;
-			entries += topLevelTools;
-		};
-		result.groups := result.groups->prepend(defaultGroup);
-	} endif;
-	
-	result.groups += paletteItems[GMFGEN::ToolGroup];
-	result.flyout := true;
-	
-	if (self.palette._default <> null) then {
-		var te := self.palette._default.resolveone(GMFGEN::ToolEntry);
-		if te <> null then te._default := true else log ('There\'s default tool specified for palette, but can\'t find gmfgen counterpart') endif;
-	} endif;
-}
-
-mapping GMFTOOL::AbstractTool::paletteEntry() : GMFGEN::ToolGroupItem {
-	init {
-		assert (false) with log('Can\'t dispatch paletteEntry() for ', self);
-	}
-}
-
-mapping GMFTOOL::PaletteSeparator::paletteEntry() : GMFGEN::ToolGroupItem {
-	init {
-		result := object GMFGEN::Separator {};
-	}
-}
-
-mapping GMFTOOL::CreationTool::paletteEntry() : GMFGEN::ToolGroupItem {
-	init {
-		var r := object GMFGEN::ToolEntry {};
-		setupCommonToolEntry(self, r);
-		result := r;
-	}
-}
-
-mapping GMFTOOL::GenericTool::paletteEntry() : GMFGEN::ToolGroupItem 
-when {
-	not self.toolClass.oclIsUndefined() or self.toolClass->notEmpty()
-}
-{
-	init {
-		var r := object GMFGEN::ToolEntry {};
-		r.qualifiedToolName := self.toolClass;
-		setupCommonToolEntry(self, r);
-		result := r;
-	}
-}
-
-mapping GMFTOOL::StandardTool::paletteEntry() : GMFGEN::ToolGroupItem {
-	init {
-		var r := object GMFGEN::StandardEntry {};
-		switch {
-			case (self.toolKind = StandardToolKind::SELECT) r.kind := StandardEntryKind::SELECT;  
-			case (self.toolKind = StandardToolKind::MARQUEE) r.kind := StandardEntryKind::MARQUEE;			
-			case (self.toolKind = StandardToolKind::ZOOM_PAN) r.kind := StandardEntryKind::ZOOM;			
-		};
-		setupCommonToolEntry(self, r);
-		result := r;
-	}
-}
-
-mapping GMFTOOL::ToolGroup::paletteEntry() : GMFGEN::ToolGroupItem {
-	init {
-		var r := object GMFGEN::ToolGroup {};
-		r.stack := self.stack;
-		r.collapse := self.collapsible;
-		setupCommonToolEntry(self, r);
-		r.entries += self.tools.map paletteEntry();
-		result := r;
-	}
-}
-
--- XXX or helper GMFGEN::EntryBase::setupCommonToolEntry()?
-helper setupCommonToolEntry(in tool : GMFTOOL::AbstractTool, inout genTool : GMFGEN::EntryBase) {
-	genTool.title := tool.title;
-	genTool.description := tool.description;
-	
-	if tool.largeIcon.oclIsTypeOf(GMFTOOL::BundleImage) then 
-		genTool.largeIconPath := tool.largeIcon.oclAsType(GMFTOOL::BundleImage).constructIconPath() 
-	endif;
-	
-	if tool.smallIcon.oclIsTypeOf(GMFTOOL::BundleImage) then 
-		genTool.smallIconPath := tool.smallIcon.oclAsType(GMFTOOL::BundleImage).constructIconPath()
-	endif;
-}
-
--- FIXME process path (makeRelative/makeAbsolute) as in original java code
-query GMFTOOL::BundleImage::constructIconPath() : String =
-	if self.path.oclIsUndefined() or self.path.trim().size() = 0 then null else
-		if self.bundle.oclIsUndefined() or self.bundle.trim().size() = 0 then 
-			self.path.makeRelative() 
-		else 
-			self.bundle.makeAbsolute() + self.path
-		endif
-	endif;
-
--- FIXME
-query String::makeRelative(): String = self;
-
-query String::makeAbsolute(): String =
-	if self.startsWith('/') or self->exists(e | e = ':') then self + '/' else '/' + self + '/' endif;
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Parsers.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Parsers.qvto
deleted file mode 100644
index b40b6c9a780..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Parsers.qvto
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library Parsers;
-
-import ValueExpressions;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-
--- 
--- Parsers
--- 
-
-mapping GMFMAP::Mapping::createGenParsers(): GenParsers {
-	extensibleViaService := true;
-}
-
-mapping GMFMAP::LabelMapping::createExternalParser(): ExternalParser {
-	init {
-		var parser := GMFGEN::ExternalParser.allInstances()![ExternalParser];
-		result := if parser.oclIsUndefined() then object ExternalParser {} else parser endif;
-	}
-	
-	if parser.oclIsUndefined() then
-		GMFMAP::Mapping.allInstances()![Mapping].map createGenParsers().implementations += result
-	endif
-}
-
-mapping GMFMAP::ExpressionLabelMapping::createExpressionLabelParser(): GMFGEN::ExpressionLabelParser {
-	init {
-		result := object GMFGEN::ExpressionLabelParser {
-			expressionContext := GENMODEL::GenClass.allInstances()->any(e | e.ecoreClass = self.mapEntry.getDomainContext());
-			viewExpression := if not self.viewExpression.oclIsUndefined() then self.viewExpression.map createValueExpression() endif;
-			editExpression := if not self.editExpression.oclIsUndefined() then self.editExpression.map createValueExpression() endif;	
-			validateExpression := if not self.validateExpression.oclIsUndefined() then self.validateExpression.map createConstraint() endif;		
-		}
-	}
-	
-	GMFMAP::Mapping.allInstances()![Mapping].map createGenParsers().implementations += result;
-}
-
-mapping GMFMAP::OclChoiceLabelMapping::createOclChoiceParser(): GMFGEN::OclChoiceParser {
-	if not self.itemsExpression.oclIsUndefined() then
-		result.itemsExpression := self.itemsExpression.map createValueExpression() 
-	endif;
-	if not self.showExpression.oclIsUndefined() then
-		result.showExpression := self.showExpression.map createValueExpression()
-	endif;
-	
-	GMFMAP::Mapping.allInstances()![Mapping].map createGenParsers().implementations += result;
-}
-
-helper GMFMAP::FeatureLabelMapping::getOrCreateEnumParser(): GMFGEN::PredefinedEnumParser =
-	let enumParser = findPredefinedEnumParser() in
-	if enumParser.oclIsUndefined() then
-		createPredefinedEnumParser()
-	else 
-		enumParser 
-	endif;
-
-helper findPredefinedEnumParser(): GMFGEN::PredefinedEnumParser =
-	GMFGEN::GenParserImplementation.allInstances()![GMFGEN::PredefinedEnumParser];
-
-helper createPredefinedEnumParser(): GMFGEN::PredefinedEnumParser {
-	var parser := object GMFGEN::PredefinedEnumParser {};
-	GMFMAP::Mapping.allInstances()![Mapping].map createGenParsers().implementations += parser;
-	
-	return parser;
-}
-
-helper GMFMAP::FeatureLabelMapping::getOrCreatePredefinedParser(): GMFGEN::PredefinedParser = 
-	let editMethod = self.editMethod.get() in
-	let viewMethod = self.viewMethod.get() in
-	let parser = findPredefinedParser(editMethod, viewMethod) in
-	if parser.oclIsUndefined() then
-		createPredefinedParser(editMethod, viewMethod)
-	else parser endif;
-	
-helper findPredefinedParser(editMethod: GMFGEN::LabelTextAccessMethod, viewMethod: GMFGEN::LabelTextAccessMethod): GMFGEN::PredefinedParser =
-	GMFGEN::GenParserImplementation.allInstances()[GMFGEN::PredefinedParser]->any(e | e.editMethod = editMethod and e.viewMethod = viewMethod);
-
-helper createPredefinedParser(editMethod: GMFGEN::LabelTextAccessMethod, viewMethod: GMFGEN::LabelTextAccessMethod): GMFGEN::PredefinedParser {
-	var parser := object GMFGEN::PredefinedParser {};
-	parser.editMethod := editMethod;
-	parser.viewMethod := viewMethod;
-	
-	GMFMAP::Mapping.allInstances()![Mapping].map createGenParsers().implementations += parser;
-	
-	return parser;
-}
-
-helper GMFMAP::LabelTextAccessMethod::get(): GMFGEN::LabelTextAccessMethod =
-	switch {
-		case (self = GMFMAP::LabelTextAccessMethod::MESSAGE_FORMAT) GMFGEN::LabelTextAccessMethod::MESSAGE_FORMAT;
-		case (self = GMFMAP::LabelTextAccessMethod::NATIVE) GMFGEN::LabelTextAccessMethod::NATIVE;
-		case (self = GMFMAP::LabelTextAccessMethod::REGEXP) GMFGEN::LabelTextAccessMethod::REGEXP;
-		case (self = GMFMAP::LabelTextAccessMethod::PRINTF) GMFGEN::LabelTextAccessMethod::PRINTF;
-	};
-
-helper GMFMAP::FeatureLabelMapping::isEnumLabelMapping(): Boolean =
-	if self.features->size() <> 1 then false else
-		if self.editableFeatures->isEmpty() or self.editableFeatures->size() > self.features->size() then false else
-			let firstFeature = self.features->first() in
-			let firstEditFeature = self.editableFeatures->first() in
-				if firstFeature <> firstEditFeature then false else firstFeature.eType.oclIsKindOf(EEnum) endif
-		endif
-	endif;
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/PreferencePages.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/PreferencePages.qvto
deleted file mode 100644
index 95d0619021f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/PreferencePages.qvto
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-
-transformation PreferencePages(in mapModel : GMFMAP, inout gmfgenModel : GMFGEN);
-
-main() {
-	var canvasMapping := mapModel.rootObjects()![GMFMAP::Mapping].diagram;
-	var gd := gmfgenModel.rootObjects()![GMFGEN::GenEditorGenerator].diagram;
-	gd.preferencePages += canvasMapping.map preferencePages(gd);
-	--gd.preferences := canvasMapping.map preferences(gd);
-}
-
-mapping GMFMAP::CanvasMapping::preferencePages(in genDiagram : GMFGEN::GenDiagram) : List(GMFGEN::GenPreferencePage) {
-	var general := StandardPreferencePages::General.createPage('general', genDiagram.editorGen.modelID + ' Diagram', genDiagram.editorGen);
-	general.children += StandardPreferencePages::Appearance.createPage('appearance', 'Appearance', genDiagram.editorGen);
-	general.children += StandardPreferencePages::Connections.createPage('connections', 'Connections', genDiagram.editorGen);
-	general.children += StandardPreferencePages::Printing.createPage('printing', 'Printing', genDiagram.editorGen);
-	general.children += StandardPreferencePages::RulersAndGrid.createPage('rulersAndGrid', 'Rulers And Grid', genDiagram.editorGen);
-	result->add(general);
-}
-
-helper GMFGEN::StandardPreferencePages::createPage(in id : String, in n: String, in editorGen : GMFGEN::GenEditorGenerator) : GMFGEN::GenPreferencePage {
-	return object GMFGEN::GenStandardPreferencePage {
-		name := n;
-		iD := editorGen.plugin.iD + '.' + id;
-		kind := self;
-	};
-} 
-
-mapping GMFMAP::CanvasMapping::preferences(in genDiagram : GMFGEN::GenDiagram) : GMFGEN::GenDiagramPreferences {
-	
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/PropertySheet.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/PropertySheet.qvto
deleted file mode 100644
index 266d18226c9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/PropertySheet.qvto
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-
-transformation PropertySheet(in mapModel : GMFMAP, inout gmfgenModel : GMFGEN);
-
-main() {
-	var mapRoot := mapModel.rootObjects()![GMFMAP::Mapping];
-	var genEditor := gmfgenModel.rootObjects()![GMFGEN::GenEditorGenerator];
-	genEditor.propertySheet := mapRoot.diagram.map propertySheet(genEditor);
-}
-
-mapping GMFMAP::CanvasMapping::propertySheet(editorGen : GMFGEN::GenEditorGenerator) : GMFGEN::GenPropertySheet {
-	result.tabs += object GMFGEN::GenStandardPropertyTab { iD := 'appearance' };
-	result.tabs += object GMFGEN::GenStandardPropertyTab { iD := 'diagram' };
-	if not self.domainModel.oclIsUndefined() then 
-		result.tabs += object GMFGEN::GenCustomPropertyTab {
-			iD := 'domain';
-			label := 'Core';
-			filter := object GMFGEN::TypeTabFilter {
-				types += Sequence { 'org.eclipse.gmf.runtime.notation.View', 'org.eclipse.gef.EditPart' };
-				if not editorGen.navigator.oclIsUndefined() then generatedTypes += GMFGEN::GeneratedType::abstractNavigatorItem endif; 
-			}
-		}
-	endif;
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/RichClientPlatformApp.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/RichClientPlatformApp.qvto
deleted file mode 100644
index c105532c81c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/RichClientPlatformApp.qvto
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-
-transformation RichClientPlatformApp(in mapModel : GMFMAP, inout gmfgenModel : GMFGEN);
-
-main() {
-	var canvasMapping := mapModel.rootObjects()![GMFMAP::Mapping].diagram;
-	var genEditor := gmfgenModel.rootObjects()![GMFGEN::GenEditorGenerator];
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Utils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Utils.qvto
deleted file mode 100644
index c959eb30397..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Utils.qvto
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library Utils;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-modeltype GENMODEL uses genmodel('http://www.eclipse.org/emf/2002/GenModel');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-
---
---	Properties
---
-
-property useModeledViewmaps: Boolean = false;
-property allChildReferences: Sequence(ChildReference) = Sequence{};
-property childReferences: Sequence(ChildReference) = Sequence{};
-property equivalentChild: Dict(ChildReference, Sequence(ChildReference)) = Dict{};
-property genModel: GENMODEL::GenModel = null;
-property processedNodeMappings: Sequence(NodeMapping) = Sequence{};
-
---
--- Helpers
---
-
-helper GMFMAP::ChildReference::matchChildReferenceFeatures(node: GMFMAP::ChildReference) : Boolean {
-	var containmentFeatureMatch : Boolean;
-	var childrenFeatureMatch : Boolean;
-	var childMatch: Boolean;
-	
-	if node.containmentFeature.oclIsUndefined() then 
-		containmentFeatureMatch := self.containmentFeature.oclIsUndefined()
-	else {
-		containmentFeatureMatch := self.containmentFeature = node.containmentFeature
-	} endif;
-	
-	if node.childrenFeature.oclIsUndefined() then
-		childrenFeatureMatch := self.childrenFeature.oclIsUndefined()
-	else
-		if self.childrenFeature.oclIsUndefined() then 
-			childrenFeatureMatch := node.childrenFeature = node.containmentFeature
-		else
-			childrenFeatureMatch := node.childrenFeature = self.childrenFeature
-		endif
-	endif;
-		
-	childMatch := node.referencedChild = self.child or node.child = self.child;
-	
-	return containmentFeatureMatch and childrenFeatureMatch and childMatch;
-}
-
---
---	Queries
---
-
-query GMFMAP::Mapping::getChildReferences(): Sequence(ChildReference) {
-	var rs : Sequence(ChildReference) := Sequence{};
-
-	allChildReferences := self.nodes->collect(e | e.child.getChildReferences());
-	allChildReferences->forEach(c) {
-		var equi: ChildReference = equivalentChild->keys()->selectOne(e | e.matchChildReferenceFeatures(c));
-		if equi.oclIsUndefined() then {
-			rs += c;
-			equivalentChild->put(c, Sequence{});
-		} else {
-			var seq := equivalentChild->get(equi);
-			seq += c;
-			equivalentChild->put(equi, seq);
-		} endif
-	};
-	
-	return rs
-}
-
-query GMFMAP::ChildReference::findProcessableChildReference(): ChildReference =
-	if childReferences->includes(self) then
-		self
-	else
-		equivalentChild->keys()->selectOne(e | equivalentChild->get(e)->includes(self))
-	endif;
-
-query NodeMapping::getChildReferences(): Sequence(ChildReference) {
-	processedNodeMappings += self;
-	return self.children->collect(e |  
-			Sequence{e}->union(if processedNodeMappings->includes(e.child) then Sequence {}
-			else
-				e.child.getChildReferences()
-			endif))
-}
-
-query ECORE::EClass::findGenClass() : GENMODEL::GenClass =
-	self.ePackage.findGenPackage().genClassifiers[GenClass]->select(gc | gc.ecoreClass.name = self.name)->first();
-
-query ECORE::EPackage::findGenPackage() : GENMODEL::GenPackage =
-	-- XXX GenModel.findGenPackage does more than this (staticGenPackage and nestedGenPackages). FIXME
-	-- ->union(genModel.staticGenPackages)
-	this.genModel.genPackages->union(
-		this.genModel.usedGenPackages)->select(gp | 
-			gp.ecorePackage.nsURI = self.nsURI)->asSequence()->first();
-
-query ECORE::EStructuralFeature::findGenFeature() : GENMODEL::GenFeature =
-	self.eContainingClass.findGenClass().genFeatures->select(f | f.ecoreFeature = self)->first();
-	
-query GMFMAP::NodeMapping::isPureLabelNode() : Boolean =
-	self.labelMappings->size() = 1 and self.children->isEmpty() and self.labelMappings->first().diagramLabel = self.diagramNode;
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ValueExpressions.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ValueExpressions.qvto
deleted file mode 100644
index 5e36d91e8ec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/ValueExpressions.qvto
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-library ValueExpressions;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-
---	
---	ValueExpression
---
-
-mapping GMFMAP::ValueExpression::createValueExpression(): GMFGEN::ValueExpression 
-	disjuncts 
-		GMFMAP::ValueExpression::createGenValueExpression, GMFMAP::Constraint::createConstraint
-	{}
-
-mapping GMFMAP::ValueExpression::createGenValueExpression(): GMFGEN::ValueExpression
-when {
-	self.oclIsTypeOf(ValueExpression)
-}
-{
-		body := self.body;
-}
-
-mapping GMFMAP::Constraint::createConstraint(): GMFGEN::GenConstraint {
-	body := self.body;
-}
-
-mapping GMFMAP::ValueExpression::createExpressionProvider(): GenExpressionProviderBase {
-	init {
-		switch {
-			case (self.language = Language::java) { result := object GenJavaExpressionProvider {} };
-			case (self.language = Language::ocl) { result := object GenExpressionInterpreter { language := self.language() } };
-			case (self.language = Language::regexp) { result := object GenExpressionInterpreter { language := self.language() } };
-			case (self.language = Language::nregexp) { result := object GenExpressionInterpreter { language := self.language() } };
-			case (self.language = Language::_literal) { result := object GenLiteralExpressionProvider {} };
-			else { result := object GenExpressionInterpreter {}; }
-		};
-	}
-	
-	expressions += ValueExpression.allInstances()->select(e | e.language = self.language)->map createValueExpression();
-}
-
--- 
--- Constraints and initializers
--- 
-
-mapping GMFMAP::LinkConstraints::structure() : GMFGEN::GenLinkConstraints {
-	sourceEnd := self.sourceEnd.map createConstraint();
-	targetEnd := self.targetEnd.map createConstraint();
-}
-
---	
---	Helpers
---
-
-helper GMFMAP::ValueExpression::language(): GenLanguage =
-	switch {
-		case (self.language = Language::java) GenLanguage::java;
-		case (self.language = Language::ocl)  GenLanguage::ocl;
-		case (self.language = Language::regexp) GenLanguage::regexp;
-		case (self.language = Language::nregexp) GenLanguage::nregexp;
-		case (self.language = Language::_literal) return GenLanguage::_literal;
-		else GenLanguage::ocl;
-	};
-	
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Viewmaps.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Viewmaps.qvto
deleted file mode 100644
index fda3f6c5b38..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge/transforms/Viewmaps.qvto
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal & others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Guillaume Hillairet (Montages A.G.)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- */
-import xpt.XpandFacade;
-import Utils;
-
-modeltype GMFMAP uses mappings('http://www.eclipse.org/papyrus/gmf/2020/mappings');
-modeltype GMFGEN uses gmfgen('http://www.eclipse.org/papyrus/gmf/2020/GenModel');
-modeltype GMFGRAPH uses gmfgraph('http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition');
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-
-library Viewmaps;
-
---
---	Canvas
---
-
-mapping GMFGRAPH::Canvas::viewmap() : GMFGEN::Viewmap {
-	init {
-		result := object GMFGEN::FigureViewmap {
-			figureQualifiedClassName := 'org.eclipse.draw2d.FreeformLayer';
-		};
-	}
-}
-
---
---	ChildReference
---
-
-helper GMFMAP::ChildReference::viewmap(node: GMFMAP::NodeMapping) : GMFGEN::Viewmap =
-	if node.isPureLabelNode() then
-		node.labelMappings->first().diagramLabel.map viewmap()
-	else
-		node.diagramNode.map viewmap()
-	endif;
-
---
---	Node
---
-
-helper GMFGRAPH::Node::viewmap(): GMFGEN::Viewmap {
-	var rs := self.figure.viewmap();
-	
-	rs.layoutType := self.getLayoutType();
-	rs.attributes += if self.hasResizeConstraints() then self.map resizeConstraints() endif;
-	rs.attributes += if self.hasDefaultSize() then self.map defaultSize() endif;
-	
-	return rs;
-}
-
-query GMFGRAPH::Node::hasResizeConstraints(): Boolean =
-	not (self.resizeConstraint.oclIsUndefined() or (self.resizeConstraint = Direction::NSEW));
-
-query GMFGRAPH::Node::hasDefaultSize(): Boolean {
-	var facet : DefaultSizeFacet := self.facets[DefaultSizeFacet]->first();
-	var defaultSize := if facet.oclIsUndefined() then self.figure.actualFigure.preferredSize else facet.defaultSize endif;
-	
-	return not defaultSize.oclIsUndefined()
-}
-
-mapping GMFGRAPH::Node::resizeConstraints(): GMFGEN::ResizeConstraints {
-	resizeHandles := self.resizeConstraint.repr().toInteger();
-}
-
-mapping GMFGRAPH::Node::defaultSize(): GMFGEN::DefaultSizeAttributes {
-	var facet : DefaultSizeFacet := self.facets[DefaultSizeFacet]->first();
-	var defaultSize := if facet.oclIsUndefined() then self.figure.actualFigure.preferredSize else facet.defaultSize endif;
-	
-	if not defaultSize.oclIsUndefined() then {
-		height := defaultSize.dy;
-		width := defaultSize.dx;
-	} endif;
-}
-
-query GMFGRAPH::Node::getLayoutType(): GMFGEN::ViewmapLayoutType {
-	var layout = ViewmapLayoutType::UNKNOWN;
-	if (self.figure.actualFigure.layout.oclIsUndefined()) then {
-		layout := GMFGEN::ViewmapLayoutType::UNKNOWN;
-	} else {
-		if self.figure.actualFigure.layout.oclIsKindOf(GMFGRAPH::FlowLayout) then {
-			var fl := self.figure.actualFigure.layout.oclAsType(GMFGRAPH::FlowLayout);
-			if fl.forceSingleLine then 
-				layout := GMFGEN::ViewmapLayoutType::TOOLBAR_LAYOUT 
-			else
-				layout := GMFGEN::ViewmapLayoutType::FLOW_LAYOUT 
-			endif;
-		} else 
-			if self.figure.actualFigure.layout.oclIsKindOf(GMFGRAPH::XYLayout) then 
-				layout := GMFGEN::ViewmapLayoutType::XY_LAYOUT 
-			endif
-		endif;
-	} endif;
-	return layout;
-}
-
---	
---	Compartment
---	
-
-helper GMFGRAPH::Compartment::viewmap() : GMFGEN::Viewmap {
-	if self.figure.oclIsUndefined() then
-		return object GMFGEN::FigureViewmap {}
-	endif;
-	-- FIXME check self.accessor, see InnerClassViewapProducer
-	if self.accessor.oclIsUndefined() then 
-		return self.figure.viewmap() 
-	endif;
-	return self.figure.viewmap(self.accessor);
-}
-
---	
---	Connection
---	
-
-helper GMFGRAPH::Connection::viewmap() : GMFGEN::Viewmap {
-	var rs : GMFGEN::Viewmap := null;
-	
-	if self.figure.oclIsUndefined() then
-		rs := object GMFGEN::FigureViewmap {
-			figureQualifiedClassName := "org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx";		
-		}
-	else
-		rs := self.figure.viewmap()
-	endif;
-	
-	return rs;
-}
-
---	
---	DiagramLabel
---	
-
-helper GMFGRAPH::DiagramLabel::viewmap(): GMFGEN::Viewmap {
-	var rs : GMFGEN::Viewmap := null;
-	
-	if self.figure.oclIsUndefined() then 
-		rs := object GMFGEN::FigureViewmap {
-			figureQualifiedClassName := "org.eclipse.draw2d.Label"
-		}
-	else
-		if self.accessor.oclIsUndefined() then 
-			rs := self.figure.viewmap()
-		else
-			-- for GenLinkLabel, need to specify alignment based on AlignmentFacet
-			-- besides, need to create LabelOffsetAttributes and optionally populate it from LabelOffsetFacet
-			rs := self.figure.viewmap(self.accessor)
-		endif
-	endif;
-	
-	return rs;
-}
-
-helper DiagramLabel::labelOffSetAttributes(position: Integer): LabelOffsetAttributes =
-	object LabelOffsetAttributes {
-		var offsetFacet := self.findOffsetFacet();
-		if not offsetFacet.oclIsUndefined()	then {
-			x := offsetFacet.x;
-			y := offsetFacet.y;
-		} else {
-			y := (position + 1) * 20;
-		} endif;
-	};
-
---	
---	Figure
---	
-
-helper GMFGRAPH::FigureDescriptor::viewmap() : GMFGEN::Viewmap {
-	var rs: GMFGEN::Viewmap := null;
-	
-	if self.actualFigure.isBareInstance() then { 
-		rs := object GMFGEN::FigureViewmap {
-			figureQualifiedClassName := self.actualFigure.xpand('Runtime::fqn', templates());
-		}
-	} else {
-		rs := object GMFGEN::InnerClassViewmap { 
-			classBody := self.xpand('top::Descriptor::Inner', templates());
-			className := self.name.firstToUpper(); -- FIXME InnerClassViewmapProducer has validJavaIdentifier(capName())
-		};
-	} endif;
-	
-	rs.attributes := self.actualFigure.createStyleAttributes();
-	
-	return rs;
-}
-
-helper GMFGRAPH::Figure::createStyleAttributes() : GMFGEN::StyleAttributes {
-	var attributes: GMFGEN::StyleAttributes;
-	if not (self.font.oclIsUndefined() and self.foregroundColor.oclIsUndefined() and 
-		self.backgroundColor.oclIsUndefined()) then {
-			attributes := object GMFGEN::StyleAttributes {
-				fixedFont := if (self.font.oclIsUndefined()) then false else true endif;
-				fixedForeground := if (self.foregroundColor.oclIsUndefined()) then false else true endif;
-				fixedBackground := if (self.backgroundColor.oclIsUndefined()) then false else true endif;
-			};
-	} endif;
-	return attributes;
-}
-
-helper GMFGRAPH::FigureDescriptor::viewmap(childAccess : GMFGRAPH::ChildAccess) : GMFGEN::Viewmap =
-	object GMFGEN::ParentAssignedViewmap {
-		getterName := childAccess.accessor;
-		figureQualifiedClassName := childAccess.figure.xpand('Runtime::fqn', templates());
-		attributes := childAccess.figure.createStyleAttributes();
-	};
-
-query GMFGRAPH::Figure::isBareInstance() : Boolean = false;
-
-query GMFGRAPH::RealFigure::isBareInstance() : Boolean {
-	if self.children->notEmpty() then return false endif;
-	if self.oclIsKindOf(GMFGRAPH::Label) then {
-		if self.oclAsType(GMFGRAPH::Label).text <> null then return false endif;
-	} endif;
-	if self.oclIsKindOf(GMFGRAPH::Shape) then {
-		var sh : Shape := self.oclAsType(GMFGRAPH::Shape);
-		if sh.lineWidth <> 1 then return false endif;
-		if sh.lineKind <> LineKind::LINE_SOLID then return false endif;
-		if not sh.outline or not sh.fill or sh.xorFill or sh.xorOutline then return false endif;
-	} endif;
-	
-	if self.border <> null then return false endif;
-	if self.font <> null then return false endif;
-	if self.foregroundColor <> null then return false endif;
-	if self.backgroundColor <> null then return false endif;
-	if self.maximumSize <> null then return false endif;
-	if self.minimumSize <> null then return false endif;
-	if self.preferredSize <> null then return false endif;
-	if self.insets <> null then return false endif;
-	if self.location <> null then return false endif;
-	if self.size <> null then return false endif;
-	
-	if self.oclIsKindOf(GMFGRAPH::PolylineConnection) then {
-		if self.oclAsType(GMFGRAPH::PolylineConnection).sourceDecoration <> null then return false endif;
-		if self.oclAsType(GMFGRAPH::PolylineConnection).targetDecoration <> null then return false endif;
-	} endif;
-	
-	if self.oclIsKindOf(GMFGRAPH::SVGFigure) then {
-		if self.oclAsType(GMFGRAPH::SVGFigure).documentURI <> null then return false endif;
-	} endif;
-	return true;
-}
-
-query DiagramElement::findOffsetFacet(): LabelOffsetFacet =
-	self.facets->selectOne(e | e.oclIsKindOf(LabelOffsetFacet)).oclAsType(LabelOffsetFacet);
-
-query DiagramElement::findIndex(): Integer {
-	var container := self.oclAsType(EObject).eContainer();
-	if container.oclIsKindOf(LabelMapping) then {
-		var linkMapping := container.eContainer();
-		
-		if linkMapping.oclIsKindOf(GMFMAP::LinkMapping) then {
-			return linkMapping.oclAsType(LinkMapping).labelMappings->indexOf(container.oclAsType(LabelMapping))	
-		} endif;
-		
-	} endif;
-	
-	return 0;
-}
-
---	
---	Templates
---	
-
-property templateRoots : Sequence(String) = Sequence {'platform:/plugin/org.eclipse.papyrus.gmf.graphdef.codegen/templates/'};
-property mapModeTemplateRoots : String = 'platform:/plugin/org.eclipse.papyrus.gmf.graphdef.codegen/templates/rt_mm/';
-property useMapMode : Boolean = false;
-
-helper setMapMode(mapMode: Boolean) {
-	this.useMapMode := mapMode;
-	return;
-}
-
-query templates(): Sequence(String) =
-	if useMapMode then this.templateRoots->prepend(this.mapModeTemplateRoots) else this.templateRoots endif;
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/META-INF/MANIFEST.MF
index 6528ea7fd39..a03d0ea571d 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.edit/META-INF/MANIFEST.MF
@@ -13,15 +13,15 @@ Export-Package: org.eclipse.papyrus.gmf.codegen.genextension.presentation,
  org.eclipse.papyrus.gmf.codegen.gmfgen.presentation,
  org.eclipse.papyrus.gmf.codegen.gmfgen.provider
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.codegen;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.edit;visibility:=reexport,
- org.eclipse.emf.codegen.ecore;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.3.0,3.0.0)";visibility:=reexport
+ org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.papyrus.gmf.codegen;bundle-version="[2.9.0,4.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.3.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/META-INF/MANIFEST.MF
index 553c1638355..fdf41a03a74 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/META-INF/MANIFEST.MF
@@ -6,17 +6,18 @@ Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.gmf.internal.codegen.CodeGenUIPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.gmf.bridge;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.gmf.bridge.ui.dashboard;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.papyrus.gmf.codegen.edit,
- org.eclipse.papyrus.gmf.graphdef.codegen.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.gmf.bridge.trace;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
+ org.eclipse.papyrus.gmf.common;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.gmf.codegen.edit;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.emf.importer;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.papyrus.gmf.bridge.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.gmf.xpand;bundle-version="[2.1.0,3.0.0)"
+ org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.jface;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.papyrus.gmf.codegen;bundle-version="[2.11.0,3.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.papyrus.gmf.internal.codegen;x-friends:="org.eclipse.gmf.tests",
- org.eclipse.papyrus.gmf.internal.codegen.popup.actions;x-friends:="org.eclipse.papyrus.gmf.bridge.ui.dashboard,org.eclipse.papyrus.gmf.codegen.lite.ui,org.eclipse.papyrus.gmf.codegen.xtend.ui"
+Export-Package: org.eclipse.papyrus.gmf.internal.codegen,
+ org.eclipse.papyrus.gmf.internal.codegen.popup.actions;x-friends:="org.eclipse.papyrus.gmf.codegen.xtend.ui,org.eclipse.papyrus.codegen"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/plugin.xml
index d224e1ff7f2..ab677d1cd6e 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/plugin.xml
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/plugin.xml
@@ -2,63 +2,6 @@
 <?eclipse version="3.0"?>
 <plugin>
 
-   <extension
-         point="org.eclipse.ui.popupMenus">
-      <!-- objectContribution
-            adaptable="true"
-            id="gmf.codegen.ui.transformToGenModelFile"
-            nameFilter="*.gmfmap"
-            objectClass="org.eclipse.core.resources.IFile">
-         <action
-               class="org.eclipse.papyrus.gmf.internal.codegen.popup.actions.CreateSpecificDiagramRunTimeModelAction"
-               enablesFor="1"
-               id="gmf.codegen.ui.newAction5"
-               label="GMF: Step 0(opt) - Create specific DiagramRT model"
-               menubarPath="additions"/>
-      </objectContribution -->
-      <objectContribution
-            adaptable="true"
-            id="gmf.codegen.ui.executeTemplates"
-            nameFilter="*.gmfgen"
-            objectClass="org.eclipse.core.resources.IFile">
-         <action
-               label="%generatecode.action"
-               class="org.eclipse.papyrus.gmf.internal.codegen.popup.actions.ExecuteTemplatesAction"
-               menubarPath="additions"
-               enablesFor="1"
-               id="gmf.codegen.ui.executeTemplatesAction">
-         </action>
-         <action
-               label="%addextensionmodel.action"
-               class="org.eclipse.papyrus.gmf.internal.codegen.popup.actions.AddExtensionModelAction"
-               menubarPath="additions"
-               enablesFor="+"
-               id="gmf.codegen.ui.addExtensionModelAction">
-         </action>
-      </objectContribution>
-	<objectContribution
-    		adaptable="true"
-	        id="gmf.codegen.ui.migrate"
-    	    objectClass="org.eclipse.core.resources.IFile">
-		<action
-				label="%migrate.model.action"
-				class="org.eclipse.papyrus.gmf.internal.codegen.popup.actions.MigrateModelAction"
-				menubarPath="additions"
-				enablesFor="1"
-				id="gmf.codegen.ui.migrateAction">
-		</action>
-		<visibility>
-		  <or>
-			<objectState name="contentTypeId" value="org.eclipse.gmf.gen_1_0"/>
-			<objectState name="contentTypeId" value="org.eclipse.gmf.gen_2_0"/>
-			<objectState name="contentTypeId" value="org.eclipse.gmf.gen_2_1"/>
-  			<objectState name="extension" value="gmfmap"/>
-			<objectState name="contentTypeId" value="org.eclipse.gmf.graph_1_0"/>
-		  </or>
-		</visibility>
-	</objectContribution>
-   </extension>
-
    <extension point="org.eclipse.jdt.ui.javaElementFilters">
       <filter
             id="org.eclipse.papyrus.gmf.codegen.ui.hide_generated"
@@ -70,12 +13,4 @@
       </filter>
    </extension>
 
-   <extension point="org.eclipse.papyrus.gmf.bridge.ui.dashboard.actions">
-      <action
-         label="%dashboard.gende"
-         class="org.eclipse.papyrus.gmf.internal.codegen.dashboard.GenerateDEAction"
-         location="genmodel">
-      </action>
-   </extension>
-
 </plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/CodeGenUIPlugin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/CodeGenUIPlugin.java
index 492659941c6..1a4176fc3bf 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/CodeGenUIPlugin.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/CodeGenUIPlugin.java
@@ -11,11 +11,13 @@
  * Contributors: 
  *    Artem Tikhomirov (Borland) - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Obsolete plugins (graphdef /bridge, etc.) /external 'x-friends' removed
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.internal.codegen;
 
 import java.text.MessageFormat;
 
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
@@ -80,15 +82,21 @@ public class CodeGenUIPlugin extends AbstractUIPlugin {
 		return getDefault().getBundle().getSymbolicName();
 	}
 
-	public CodegenEmitters getEmitters(GenEditorGenerator genModel) {
-		if (emitterSource == null) {
-			emitterSource = new EmitterSource<GenEditorGenerator, CodegenEmitters>() {
-				@Override
-				protected CodegenEmitters newEmitters(GenEditorGenerator genModel) {
-					return new CodegenEmitters(!genModel.isDynamicTemplates(), genModel.getTemplateDirectory(), genModel.getModelAccess() != null);
-				}
-			};
+	
+	public static void log(CoreException ex) {
+		log(ex.getStatus());
+	}
+
+	public static void log(Exception ex) {
+		if (ex instanceof CoreException) {
+			log((CoreException) ex);
+		} else {
+			log(createError(ex.getMessage(), ex));
 		}
-		return emitterSource.getEmitters(genModel, genModel.isDynamicTemplates());
 	}
+
+	public static void log(IStatus s) {
+		getDefault().getLog().log(s);
+	}
+	
 }
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/WizardUtil.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/WizardUtil.java
index e10bb814845..c73075d2f9c 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/wizards/WizardUtil.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/WizardUtil.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
+ * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -9,10 +9,9 @@
  * SPDX-License-Identifier: EPL-2.0
  *
  * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Obsolete plugins (graphdef /bridge, etc.) /external 'x-friends' removed
  *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.wizards;
+package org.eclipse.papyrus.gmf.internal.codegen;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -25,13 +24,10 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchPart;
@@ -100,17 +96,16 @@ public class WizardUtil {
 		return getCapped(containingClass.getName()) + getCapped(feature.getName());
 	}
 
-	@SuppressWarnings("unchecked")
 	public static void saveModel(IWizardContainer container, final Resource resource) throws Exception {
 		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
 
 			protected void execute(IProgressMonitor progressMonitor) {
 				try {
-					Map options = new HashMap();
+					Map<Object, Object> options = new HashMap<>();
 					options.put(XMLResource.OPTION_ENCODING, "UTF-8"); //$NON-NLS-1$
 					resource.save(options);
 				} catch (Exception exception) {
-					Plugin.log(exception);
+					CodeGenUIPlugin.log(exception);
 				} finally {
 					progressMonitor.done();
 				}
@@ -142,7 +137,7 @@ public class WizardUtil {
 		try {
 			page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
 		} catch (PartInitException exception) {
-			MessageDialog.openError(workbenchWindow.getShell(), NLS.bind(Messages.WizardUtilUnableToOpenEditor, modelFile), exception.getMessage());
+			CodeGenUIPlugin.log(exception);
 			return false;
 		}
 
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/dashboard/GenerateDEAction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/dashboard/GenerateDEAction.java
deleted file mode 100644
index a80dbbc6b92..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/dashboard/GenerateDEAction.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.codegen.dashboard;
-
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardAction;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardFacade;
-import org.eclipse.papyrus.gmf.bridge.ui.dashboard.DashboardState;
-import org.eclipse.papyrus.gmf.internal.codegen.popup.actions.ExecuteTemplatesOperation;
-
-/**
- * @author dstadnik
- */
-public class GenerateDEAction implements DashboardAction {
-
-	private DashboardFacade context;
-
-	public void init(DashboardFacade context) {
-		this.context = context;
-	}
-
-	public boolean isEnabled() {
-		DashboardState state = context.getState();
-		if (context.isStrict()) {
-			if (state.getDM() == null || state.getDGM() == null) {
-				return false;
-			}
-		}
-		return state.getGM() != null;
-	}
-
-	public void run() {
-		ExecuteTemplatesOperation op = new ExecuteTemplatesOperation();
-		op.setGenModelURI(context.getState().getGM());
-		op.run();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/CreateSpecificDiagramRunTimeModelAction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/CreateSpecificDiagramRunTimeModelAction.java
deleted file mode 100644
index 09e3574c068..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/CreateSpecificDiagramRunTimeModelAction.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Borland Software Corporation - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.codegen.popup.actions;
-
-import java.io.IOException;
-import java.util.Collections;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.DiagramRunTimeModelTransformer;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.DummyGenModel;
-import org.eclipse.papyrus.gmf.internal.bridge.genmodel.RuntimeGenModelAccess;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-
-public class CreateSpecificDiagramRunTimeModelAction implements IObjectActionDelegate {
-
-	private IFile myMapFile;
-
-	private IWorkbenchPart myPart;
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		myPart = targetPart;
-	}
-
-	public void run(IAction action) {
-		final ResourceSetImpl resSet = new ResourceSetImpl();
-		final Mapping m = (Mapping) resSet.getResource(getMapModelURI(), true).getContents().get(0);
-		final String packName = myMapFile.getLocation().removeFileExtension().lastSegment();
-		DiagramRunTimeModelTransformer t = new DiagramRunTimeModelTransformer(packName, getMapModelURI().appendSegment("diagramrt").toString());
-		t.transform(m);
-		EPackage drtModel = t.getResult();
-		Resource drtEcoreModelRes = resSet.createResource(getDestEcoreURI(), ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-		URI genModelURI = getDestGenModelURI();
-		Resource drtGenModelRes = Resource.Factory.Registry.INSTANCE.getFactory(genModelURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE).createResource(genModelURI);
-		resSet.getResources().add(drtGenModelRes);
-		// Resource drtGenModelRes =
-		// resSet.createResource(getDestGenModelURI());
-		drtEcoreModelRes.getContents().add(drtModel);
-		drtGenModelRes.getContents().add(createGenModel(drtModel));
-		try {
-			drtEcoreModelRes.save(Collections.EMPTY_MAP);
-			drtGenModelRes.save(Collections.EMPTY_MAP);
-		} catch (IOException ex) {
-			ex.printStackTrace();
-		}
-
-	}
-
-	private URI getDestEcoreURI() {
-		IPath p = myMapFile.getFullPath();
-		return URI.createPlatformResourceURI(p.removeLastSegments(1).append(p.removeFileExtension().lastSegment() + "-drt").addFileExtension("ecore").toString(), true);
-	}
-
-	private URI getDestGenModelURI() {
-		IPath p = myMapFile.getFullPath();
-		return URI.createPlatformResourceURI(p.removeLastSegments(1).append(p.removeFileExtension().lastSegment() + "-drt").addFileExtension("genmodel").toString(), true);
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		myMapFile = (IFile) ((IStructuredSelection) selection).getFirstElement();
-	}
-
-	private URI getMapModelURI() {
-		return URI.createPlatformResourceURI(myMapFile.getFullPath().toString(), true);
-	}
-
-	protected Shell getShell() {
-		return myPart.getSite().getShell();
-	}
-
-	private GenModel createGenModel(EPackage model) {
-		GenModel genModel = new DummyGenModel(model, null).create();
-		genModel.getForeignModel().add(model.eResource().getURI().toString());
-		genModel.getUsedGenPackages().add(getDiagramRunTimeGenPackage());
-
-		GenPackage genPackage = genModel.getGenPackages().get(0);
-		genPackage.setPrefix(model.getName() + "DRT");
-		return genModel;
-	}
-
-	private GenPackage getDiagramRunTimeGenPackage() {
-		RuntimeGenModelAccess runtimeAccess = new RuntimeGenModelAccess();
-		runtimeAccess.ensure();
-		return runtimeAccess.genPackage();
-	}
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/DiagnosticsDialog.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/DiagnosticsDialog.java
index 994f3c4bdc9..3ac48cf3b3c 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/DiagnosticsDialog.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/DiagnosticsDialog.java
@@ -11,6 +11,7 @@
  * Contributors:
  *    dvorak - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Obsolete plugins (graphdef /bridge, etc.) /external 'x-friends' removed
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.internal.codegen.popup.actions;
 
@@ -39,9 +40,9 @@ import org.eclipse.jface.viewers.SelectionChangedEvent;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.gmf.internal.bridge.transform.ValidationHelper;
-import org.eclipse.papyrus.gmf.internal.bridge.transform.ValidationHelper.DiagnosticMarkerMap;
 import org.eclipse.papyrus.gmf.internal.codegen.CodeGenUIPlugin;
+import org.eclipse.papyrus.gmf.internal.common.ui.ValidationHelper;
+import org.eclipse.papyrus.gmf.internal.common.ui.ValidationHelper.DiagnosticMarkerMap;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.dnd.Clipboard;
 import org.eclipse.swt.dnd.TextTransfer;
@@ -80,7 +81,6 @@ import org.eclipse.ui.part.FileEditorInput;
  * 
  * @see org.eclipse.emf.common.util.Diagnostic
  */
-@SuppressWarnings("synthetic-access")
 public class DiagnosticsDialog extends IconAndMessageDialog {
 
     private static class DiagnosticLabelProvider extends LabelProvider {
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/ExecuteTemplatesAction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/ExecuteTemplatesAction.java
index c9205843b22..34eb2f5a1d8 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/ExecuteTemplatesAction.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/ExecuteTemplatesAction.java
@@ -11,6 +11,7 @@
  * Contributors: 
  *    Artem Tikhomirov (Borland) - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Obsolete plugins (graphdef /bridge, etc.) /external 'x-friends' removed
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.internal.codegen.popup.actions;
 
@@ -28,7 +29,7 @@ import org.eclipse.ui.IWorkbenchPart;
  * 
  * @author artem
  */
-public class ExecuteTemplatesAction implements IObjectActionDelegate {
+public abstract class ExecuteTemplatesAction implements IObjectActionDelegate {
 
 	private IFile gmFile;
 
@@ -50,9 +51,7 @@ public class ExecuteTemplatesAction implements IObjectActionDelegate {
 		op.run();
 	}
 
-	protected ExecuteTemplatesOperation createOperation() {
-		return new ExecuteTemplatesOperation();
-	}
+	protected abstract ExecuteTemplatesOperation createOperation();
 
 	private Shell getShell() {
 		return myPart.getSite().getShell();
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/ExecuteTemplatesOperation.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/ExecuteTemplatesOperation.java
index 5c86b284855..7c7583fe4b5 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/ExecuteTemplatesOperation.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/ExecuteTemplatesOperation.java
@@ -12,6 +12,7 @@
  *    Dmitry Stadnik (Borland) - initial API and implementation
  *    Artem Tikhomirov (independent) - [304421] allow code generation to run in background 
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Obsolete plugins (graphdef /bridge, etc.) /external 'x-friends' removed
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.internal.codegen.popup.actions;
 
@@ -33,12 +34,10 @@ import org.eclipse.jface.dialogs.MessageDialogWithToggle;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram;
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.codegen.util.Generator;
-import org.eclipse.papyrus.gmf.internal.bridge.transform.ValidationHelper;
 import org.eclipse.papyrus.gmf.internal.codegen.CodeGenUIPlugin;
 import org.eclipse.papyrus.gmf.internal.common.codegen.GeneratorBase;
 import org.eclipse.papyrus.gmf.internal.common.migrate.ModelLoadHelper;
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
+import org.eclipse.papyrus.gmf.internal.common.ui.ValidationHelper;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.ui.PlatformUI;
@@ -53,7 +52,7 @@ import org.eclipse.ui.progress.IProgressConstants;
  * 
  * @author dstadnik
  */
-public class ExecuteTemplatesOperation {
+public abstract class ExecuteTemplatesOperation {
 
 	private static final String ASK_OK = "ask_ok"; //$NON-NLS-1$
 
@@ -230,18 +229,15 @@ public class ExecuteTemplatesOperation {
 		return g.getRunStatus();
 	}
 
-	protected GeneratorBase createGenerator() {
-		return new Generator(getGenModel(), CodeGenUIPlugin.getDefault().getEmitters(getGenModel()));
-	}
-
+	protected abstract GeneratorBase createGenerator();
+	
 	protected final GenEditorGenerator getGenModel() {
 		return myGenModel;
 	}
 
 	private Diagnostic loadGenModel() {
 		ResourceSet srcResSet = new ResourceSetImpl();
-		srcResSet.getURIConverter().getURIMap().putAll(EcorePlugin.computePlatformURIMap());
-		Activator.fillWorkspaceMetaModelsMap(srcResSet.getPackageRegistry());
+		srcResSet.getURIConverter().getURIMap().putAll(EcorePlugin.computePlatformURIMap(false));
 		ModelLoadHelper loadHelper = new ModelLoadHelper(srcResSet, getGenModelURI());
 		Object root = loadHelper.getContentsRoot();
 		if (root instanceof GenDiagram) {
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/GMFGenExtensionModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/GMFGenExtensionModelWizard.java
index b0ee1a70ccd..0a677c36524 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/GMFGenExtensionModelWizard.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.ui/src/org/eclipse/papyrus/gmf/internal/codegen/popup/actions/GMFGenExtensionModelWizard.java
@@ -10,6 +10,7 @@
  * Contributors: 
  *     Borland Software Corporation - initial API and implementation
  *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *     Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand and bridge
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.internal.codegen.popup.actions;
 
@@ -30,8 +31,8 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
-import org.eclipse.papyrus.gmf.internal.bridge.wizards.WizardUtil;
+import org.eclipse.papyrus.gmf.internal.codegen.CodeGenUIPlugin;
+import org.eclipse.papyrus.gmf.internal.codegen.WizardUtil;
 import org.eclipse.papyrus.gmf.internal.common.ui.ElementSelectorExtension;
 import org.eclipse.papyrus.gmf.internal.common.ui.ExtensibleModelSelectionPage;
 import org.eclipse.papyrus.gmf.internal.common.ui.ListElementSelectorExtension;
@@ -143,7 +144,7 @@ public class GMFGenExtensionModelWizard extends Wizard implements IWorkbenchWiza
 						addExtensionMetamodelRootToGmfgen(nextGmfgenURI, instantiated);
 					}
 				} catch (Exception ex) {
-					Plugin.log(ex);
+					CodeGenUIPlugin.log(ex);
 				} finally {
 					progressMonitor.done();
 				}
@@ -162,7 +163,7 @@ public class GMFGenExtensionModelWizard extends Wizard implements IWorkbenchWiza
 		} catch (InterruptedException ex) {
 			return false;
 		} catch (PartInitException ex) {
-			Plugin.log(ex);
+			CodeGenUIPlugin.log(ex);
 		}
 		return true;
 	}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/META-INF/MANIFEST.MF
index a067ee6ed03..48de79e106a 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/META-INF/MANIFEST.MF
@@ -10,17 +10,12 @@ Require-Bundle: org.eclipse.ui;bundle-version="[3.118.0,4.0.0)",
  org.eclipse.xtext.ui;bundle-version="[2.3.1,3.0.0)",
  org.eclipse.papyrus.gmf.codegen;bundle-version="[2.11.0,3.0.0)",
  org.eclipse.papyrus.gmf.codegen.ui;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.papyrus.gmf.bridge;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.papyrus.gmf.common;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.papyrus.gmf.codegen.edit;bundle-version="[2.9.0,4.0.0)",
- org.eclipse.papyrus.gmf.graphdef.codegen.ui;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.gmf.bridge.trace;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
  org.eclipse.emf.importer;bundle-version="[2.3.0,3.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.jdt.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.papyrus.gmf.codegen.xtend;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.papyrus.gmf.bridge.ui;bundle-version="1.5.1"
+ org.eclipse.papyrus.gmf.codegen.xtend;bundle-version="[1.0.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %providerName
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/plugin.xml
index 6a316abcc1d..c9b4b0d4c62 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/plugin.xml
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/plugin.xml
@@ -16,45 +16,6 @@
       </command>
   </extension>
   
-  <extension
-        point="org.eclipse.ui.handlers">
-     <handler
-           commandId="org.eclipse.papyrus.gmf.codegen.xtend.ui.generation"
-           class="org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers.ExecuteTemplatesWithXtend2Handler">
-     </handler>
-  </extension>
-  
-  <extension
-         point="org.eclipse.ui.menus">
-    <menuContribution
-            locationURI="popup:org.eclipse.ui.popup.any?after=additions">
-         <command
-               commandId="org.eclipse.papyrus.gmf.codegen.xtend.ui.generation"
-               label="%generateDiagramCodeLabel">
-          <visibleWhen
-                  checkEnabled="false">
-               <with
-                     variable="selection">
-                  <iterate
-                        ifEmpty="false"
-                        operator="or">
-                     <or>   
-                     <instanceof
-                           value="org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator">
-                     </instanceof>
-                     <adapt
-           					type="org.eclipse.core.resources.IResource">
-        				 <test property="org.eclipse.core.resources.name" 
-                				value="*.gmfgen"/>
-     				 </adapt>
-     				 </or>
-                  </iterate>
-               </with>
-            </visibleWhen>
-         </command>
-      </menuContribution>
-  </extension>
-  
   <!--  TMP migration tool for dev -->
   <extension
          point="org.eclipse.ui.commands">
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/CodegenEmittersWithXtend2.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/CodegenEmittersWithXtend2.java
deleted file mode 100644
index 28094578bed..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/CodegenEmittersWithXtend2.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013, 2020 Montages A.G., CEA LIST, Artal
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License 2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/legal/epl-2.0/
-*
-* Contributors:
-*  	Guillaume Hillairet (Montages A.G.) : initial implementation
-*    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-*****************************************************************************/
-package org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-
-/**
- * Use {@link org.eclipse.papyrus.gmf.codegen.util.CodegenEmittersWithXtend2}
- */
-@Deprecated
-public class CodegenEmittersWithXtend2 extends org.eclipse.papyrus.gmf.codegen.util.CodegenEmittersWithXtend2 {
-
-	public CodegenEmittersWithXtend2(GenEditorGenerator genModel) {
-		this(!genModel.isDynamicTemplates(), genModel.getTemplateDirectory(), genModel.getModelAccess() != null);
-	}
-
-	public CodegenEmittersWithXtend2(boolean useBaseTemplatesOnly, String templateDirectory, boolean includeDynamicModelTemplates) {
-		super(useBaseTemplatesOnly, templateDirectory, includeDynamicModelTemplates);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/ExecuteTemplatesOperationWithXtend2.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/ExecuteTemplatesOperationWithXtend2.java
deleted file mode 100644
index 7b16ba7e56e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/ExecuteTemplatesOperationWithXtend2.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013, 2020 Montages A.G., CEA LIST, Artal
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License 2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/legal/epl-2.0/
-*
-* Contributors:
-*  	Guillaume Hillairet (Montages A.G.) : initial implementation
-*    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-*****************************************************************************/
-package org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers;
-
-import org.eclipse.papyrus.gmf.internal.common.codegen.GeneratorBase;
-import org.eclipse.papyrus.gmf.codegen.util.GeneratorWithXtend2;
-import org.eclipse.papyrus.gmf.internal.codegen.popup.actions.ExecuteTemplatesOperation;
-
-public class ExecuteTemplatesOperationWithXtend2 extends ExecuteTemplatesOperation {
-
-	@Override
-	protected GeneratorBase createGenerator() {
-		return new GeneratorWithXtend2(getGenModel());
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/ExecuteTemplatesWithXtend2Handler.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/ExecuteTemplatesWithXtend2Handler.java
deleted file mode 100644
index df5b16ccb1d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/ExecuteTemplatesWithXtend2Handler.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013, 2020 Montages A.G., CEA LIST, Artal
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License 2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/legal/epl-2.0/
-*
-* Contributors:
-*  	Guillaume Hillairet (Montages A.G.) : initial implementation
-*    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-*****************************************************************************/
-package org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.xmi.XMIResource;
-import org.eclipse.jface.viewers.TreeSelection;
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-
-public class ExecuteTemplatesWithXtend2Handler extends AbstractHandler {
-
-	@Override
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		ExecuteTemplatesOperationWithXtend2 op = createOperation(event);
-		op.run();
-		return null;
-	}
-
-	@Override
-	public boolean isEnabled() {
-		return true;
-	}
-	
-	private ExecuteTemplatesOperationWithXtend2 createOperation(ExecutionEvent event) throws ExecutionException {
-		ExecuteTemplatesOperationWithXtend2 op = new ExecuteTemplatesOperationWithXtend2();
-		try{
-			op.setName(event.getCommand().getName());
-		} catch(NotDefinedException e) {
-			throw new RuntimeException("Undefined command",e);
-		}
-		Shell shell = HandlerUtil.getActiveShell(event);
-		op.setShell(shell);
-		if (HandlerUtil.getCurrentSelectionChecked(event) instanceof TreeSelection) {
-			TreeSelection selection = (TreeSelection)HandlerUtil.getCurrentSelectionChecked(event);
-			if (selection.size() == 1) {
-				if (selection.getFirstElement() instanceof GenEditorGenerator) {
-					op.setGenModelURI(((XMIResource)selection.getPaths()[0].getFirstSegment()).getURI());
-				} else {
-					op.setGenModelURI(URI.createPlatformPluginURI(((IFile)selection.getFirstElement()).getFullPath().toString(), true));
-				}
-			} else {
-				throw new ExecutionException("Size of selection more than one.");
-			}
-		}
-		return op;
-	}
-}
-	
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/GeneratorTextEmitter.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/GeneratorTextEmitter.java
deleted file mode 100644
index 0edd722303d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/GeneratorTextEmitter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013, 2020 Montages A.G., CEA LIST, Artal
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License 2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/legal/epl-2.0/
-*
-* Contributors:
-*  	Guillaume Hillairet (Montages A.G.) : initial implementation
-*    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-*****************************************************************************/
-package org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers;
-
-/**
- * Use {@link org.eclipse.papyrus.gmf.codegen.util.GeneratorTextEmitter}
- */
-@Deprecated
-public interface GeneratorTextEmitter extends org.eclipse.papyrus.gmf.codegen.util.GeneratorTextEmitter {
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/GeneratorWithXtend2.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/GeneratorWithXtend2.java
deleted file mode 100644
index 07c7f92cf3d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend.ui/src/org/eclipse/papyrus/gmf/codegen/xtend/ui/handlers/GeneratorWithXtend2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
-* Copyright (c) 2013, 2020 Montages A.G., CEA LIST, Artal
-* All rights reserved. This program and the accompanying materials
-* are made available under the terms of the Eclipse Public License 2.0
-* which accompanies this distribution, and is available at
-* https://www.eclipse.org/legal/epl-2.0/
-*
-* Contributors:
-*  	Guillaume Hillairet (Montages A.G.) : initial implementation
-*    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-*****************************************************************************/
-package org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers;
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.internal.common.codegen.CodeFormatterFactory;
-
-/**
- * Use {@link org.eclipse.papyrus.gmf.codegen.util.GeneratorWithXtend2}
- */
-@Deprecated
-public class GeneratorWithXtend2 extends org.eclipse.papyrus.gmf.codegen.util.GeneratorWithXtend2 {
-
-	public GeneratorWithXtend2(GenEditorGenerator genModel) {
-		super(genModel, new CodegenEmittersWithXtend2(genModel));
-	}
-
-	public GeneratorWithXtend2(GenEditorGenerator genModel, CodegenEmittersWithXtend2 codegenEmitters) {
-		super(genModel, codegenEmitters, CodeFormatterFactory.DEFAULT);
-	}
-
-	public GeneratorWithXtend2(GenEditorGenerator genModel, CodegenEmittersWithXtend2 codegenEmitters, CodeFormatterFactory codeFormatterFactory) {
-		super(genModel, codegenEmitters, codeFormatterFactory);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF
index dfdc647d3f3..b219d7962d9 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/META-INF/MANIFEST.MF
@@ -4,22 +4,21 @@ Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.papyrus.gmf.codegen.xtend;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.eclipse.papyrus.gmf.codegen.util.CodegenXtendPlugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.papyrus.gmf.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.draw2d;bundle-version="[3.3.0,4.0.0)",
+ org.eclipse.papyrus.gmf.common;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.papyrus.gmf.validate;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.papyrus.gmf.codegen;bundle-version="[2.0.0,3.1.0)",
- org.eclipse.papyrus.gmf.graphdef;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.xtext;bundle-version="2.9.0",
- org.eclipse.xtext.builder;bundle-version="2.9.0",
- org.eclipse.xtend.lib,
- org.eclipse.ocl.ecore,
- com.google.guava,
- org.eclipse.xtext.xbase.lib,
- org.eclipse.gmf.runtime.notation,
+ org.eclipse.xtext;bundle-version="[2.24.0,3.0.0)",
+ org.eclipse.xtext.builder;bundle-version="[2.24.0,3.0.0)",
+ org.eclipse.xtend.lib;bundle-version="[2.24.0,3.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.15.0,4.0.0)",
+ com.google.guava;bundle-version="[30.0.0,31.0.0)",
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.24.0,3.0.0)",
+ org.eclipse.gmf.runtime.notation;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.gmf.runtime.emf.type.core;bundle-version="[1.9.0,2.0.0)",
  org.eclipse.papyrus.infra.types;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.infra.types.core;bundle-version="[5.0.0,6.0.0)"
@@ -28,13 +27,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %providerName
 Export-Package: diagram.editparts,
  diagram.editpolicies,
- gmfgraph,
- gmfgraph.attr,
- gmfgraph.top,
  impl.actions,
  impl.diagram.commands,
  impl.diagram.editparts,
- impl.diagram.editparts.viewmaps,
  impl.diagram.update,
  impl.parsers,
  impl.preferences,
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/src/org/eclipse/papyrus/gmf/codegen/util/CodegenEmittersWithXtend2.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/src/org/eclipse/papyrus/gmf/codegen/util/CodegenEmittersWithXtend2.java
index 47314d367a1..1b90e7acc3c 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/src/org/eclipse/papyrus/gmf/codegen/util/CodegenEmittersWithXtend2.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/src/org/eclipse/papyrus/gmf/codegen/util/CodegenEmittersWithXtend2.java
@@ -11,41 +11,32 @@
  * Contributors: 
  *    Svyatoslav Kovalsky (Montages) - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand/qvto
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.codegen.util;
 
 import java.util.List;
 
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.codegen.util.CodegenEmitters;
-import org.eclipse.papyrus.gmf.codegen.util.ExtensionTemplatesProviderImpl;
-import org.eclipse.papyrus.gmf.codegen.util.GMFGeneratorModule;
-import org.eclipse.papyrus.gmf.codegen.util.IExtensionTemplatesProvider;
 import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
 import org.eclipse.papyrus.gmf.internal.common.codegen.JavaClassEmitter;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
-public class CodegenEmittersWithXtend2 extends CodegenEmitters {
+public abstract class CodegenEmittersWithXtend2 extends CodegenEmitters {
 
 	private final Injector myInjector;
 
 	private IExtensionTemplatesProvider myExtensionTemplateProvider = null;
 
-	public CodegenEmittersWithXtend2(GenEditorGenerator genModel) {
-		this(!genModel.isDynamicTemplates(), genModel.getTemplateDirectory(), genModel.getModelAccess() != null);
-	}
-
-	public CodegenEmittersWithXtend2(boolean useBaseTemplatesOnly, String templateDirectory, boolean includeDynamicModelTemplates) {
-		super(useBaseTemplatesOnly, templateDirectory, includeDynamicModelTemplates);
+	public CodegenEmittersWithXtend2(boolean useBaseTemplatesOnly, String templateDirectory) {
 		if (templateDirectory != null && !templateDirectory.isEmpty()) {
-			myExtensionTemplateProvider = new ExtensionTemplatesProviderImpl(templateDirectory,!useBaseTemplatesOnly);
+			myExtensionTemplateProvider = new ExtensionTemplatesProviderImpl(templateDirectory, !useBaseTemplatesOnly);
 		}
 		myInjector = Guice.createInjector(new GMFGeneratorModule(myExtensionTemplateProvider));
 	}
 
-	//-----------------------------------------------------------------------------------------
+	// -----------------------------------------------------------------------------------------
 
 	/**
 	 * FIXME: [MG] make separate xtend templates calling shared code, not vise versa
@@ -67,17 +58,17 @@ public class CodegenEmittersWithXtend2 extends CodegenEmitters {
 	public JavaClassEmitter getPropertySheetLabelProviderEmitter() throws UnexpectedBehaviourException {
 		return getXtendEmitter("xpt::propsheet::LabelProvider", "LabelProvider"); //$NON-NLS-1$
 	}
-	
+
 	@Override
 	public JavaClassEmitter getPropertySectionEmitter() throws UnexpectedBehaviourException {
-		return  getXtendEmitter("xpt::propsheet::PropertySection", "PropertySection"); //$NON-NLS-1$
+		return getXtendEmitter("xpt::propsheet::PropertySection", "PropertySection"); //$NON-NLS-1$
 	}
-	
+
 	@Override
 	public JavaClassEmitter getModelAccessFacilityEmitter() {
 		return getXtendEmitter("metamodel::Facility", "Main");
 	}
-	
+
 	private JavaClassEmitter getXtendEmitter(String templateFqn, String mainMethod) {
 		String classFqn = templateFqn.replace("::", ".");
 		Class<?> clazz = null;
@@ -106,7 +97,7 @@ public class CodegenEmittersWithXtend2 extends CodegenEmitters {
 			myExtensionTemplateProvider.dispose();
 		}
 	}
-	
+
 	@Override
 	protected JavaClassEmitter createJavaClassEmitter(String templateName, String mainMethod) {
 		return getXtendEmitter(templateName, mainMethod);
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/src/org/eclipse/papyrus/gmf/codegen/util/GeneratorWithXtend2.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/src/org/eclipse/papyrus/gmf/codegen/util/GeneratorWithXtend2.java
index 1d515be5012..a59e6c87d8f 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/src/org/eclipse/papyrus/gmf/codegen/util/GeneratorWithXtend2.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/src/org/eclipse/papyrus/gmf/codegen/util/GeneratorWithXtend2.java
@@ -11,29 +11,19 @@
  * Contributors: 
  *    Svyatoslav Kovalsky (Montages) - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand/qvto
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.codegen.util;
 
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.codegen.util.CodegenEmittersWithXtend2;
 import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
 import org.eclipse.papyrus.gmf.internal.common.codegen.CodeFormatterFactory;
 
-public class GeneratorWithXtend2 extends Generator {
+public abstract class GeneratorWithXtend2 extends Generator {
 
-	private CodegenEmittersWithXtend2 myEmitters;
 
-	public GeneratorWithXtend2(GenEditorGenerator genModel) {
-		this(genModel, new CodegenEmittersWithXtend2(genModel));
-	}
-
-	public GeneratorWithXtend2(GenEditorGenerator genModel, CodegenEmittersWithXtend2 codegenEmitters) {
-		this(genModel, codegenEmitters, CodeFormatterFactory.DEFAULT);
-	}
-
-	public GeneratorWithXtend2(GenEditorGenerator genModel, CodegenEmittersWithXtend2 codegenEmitters, CodeFormatterFactory codeFormatterFactory) {
-		super(genModel, codegenEmitters, codeFormatterFactory);
-		myEmitters = codegenEmitters;
+	public GeneratorWithXtend2(GenEditorGenerator genModel, CodegenEmitters emitters) {
+		super(genModel, emitters,  new BinaryEmitters(), CodeFormatterFactory.DEFAULT);
 	}
 
 	protected void customRun() throws InterruptedException, UnexpectedBehaviourException {
@@ -45,11 +35,11 @@ public class GeneratorWithXtend2 extends Generator {
 	}
 
 	protected CodegenEmittersWithXtend2 getEmitters() {
-		return myEmitters;
+		return (CodegenEmittersWithXtend2) myEmitters;
 	}
 
 	protected void hookGenerationCompleted() {
-		myEmitters.disposeEmitters();
+		getEmitters().disposeEmitters();
 	}
 
 }
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Attrs.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Attrs.xtend
deleted file mode 100644
index d4fd95454bd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Attrs.xtend
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package gmfgraph
-
-import com.google.inject.Inject
-import org.eclipse.papyrus.gmf.gmfgraph.Figure
-import org.eclipse.papyrus.gmf.gmfgraph.Shape
-import org.eclipse.papyrus.gmf.gmfgraph.Label
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle
-import org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D
-import xpt.Common
-
-/**
- * Defines attributes for Figures (for DecorationFigure subclasses see Decoration.xpt)
- */
-@com.google.inject.Singleton class Attrs {
-	@Inject gmfgraph.attr.Shape xptShape;
-	@Inject gmfgraph.attr.Figure xptFigure;
-	@Inject MapMode xptMapMode;
-	@Inject extension Common;
-	/**
-	 * Polymorphic entry point for any Figure's subclass attributes 
-	 */
-	def dispatch Init(Figure it, String figureVarName) '''
-		«xptFigure.figureAttrs(it, figureVarName)»
-		«extraLineBreak»
-	'''
-
-	def dispatch Init(Shape it, String figureVarName) '''
-		«xptShape.shapeAttrs(it, figureVarName)»
-		«xptFigure.figureAttrs(it, figureVarName)»
-	'''
-
-	def dispatch Init(Label it, String figureVarName) '''
-		«extraLineBreak»
-		«figureVarName».setText("«text»");
-		«xptFigure.figureAttrs(it, figureVarName)»
-	'''
-
-	def dispatch Init(VerticalLabel it, String figureVarName) '''
-		«extraLineBreak»
-		«figureVarName».setText("«text»");
-		«xptFigure.figureAttrs(it, figureVarName)»
-	'''
-
-	def dispatch Init(RoundedRectangle it, String figureVarName) '''
-		«figureVarName».setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(«xptMapMode.mapMode(cornerWidth)», «xptMapMode.
-			mapMode(cornerHeight)»));
-		«xptShape.shapeAttrs(it, figureVarName)»
-		«xptFigure.figureAttrs(it, figureVarName)»
-	'''
-
-	def dispatch Init(InvisibleRectangle it, String figureVarName) '''
-		«figureVarName».setOutline(false);
-		«figureVarName».setFill(false);
-		«figureVarName».setOpaque(false);
-		«xptFigure.figureAttrs(it, figureVarName)»
-	'''
-
-	def dispatch Init(CustomFigure it, String figureVarName) '''
-		«xptFigure.figureAttrs(it, figureVarName)»
-	'''
-
-	def dispatch Init(Polyline it, String figureVarName) '''
-		«FOR pt : it.template»
-			«figureVarName».addPoint(new org.eclipse.draw2d.geometry.Point(«xptMapMode.mapMode(pt)»));
-		«ENDFOR»
-		«xptShape.shapeAttrs(it, figureVarName)»
-		«xptFigure.figureAttrs(it, figureVarName)»
-	'''
-
-	def dispatch Init(SVGFigure it, String figureVarName) '''
-		«figureVarName».setURI("«documentURI»");
-		«IF noCanvasWidth»
-			«figureVarName».setSpecifyCanvasWidth(false);
-		«ENDIF»
-		«IF noCanvasHeight»
-			«figureVarName».setSpecifyCanvasHeight(false);
-		«ENDIF»
-		«IF areaOfInterest != null»
-			«figureVarName».setAreaOfInterest(«Instance(areaOfInterest)»);
-		«ENDIF»
-		«xptFigure.figureAttrs(it, figureVarName)»
-	'''
-
-	def Instance(Rectangle2D it) '''
-		new java.awt.geom.Rectangle2D.Float(«x»f, «y»f, «width»f, «height»f)
-	'''
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Border.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Border.xtend
deleted file mode 100644
index 5d793444024..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Border.xtend
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import com.google.inject.Inject
-import gmfgraph.attr.CustomAttributeOwner
-import org.eclipse.papyrus.gmf.gmfgraph.BorderRef
-import org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder
-import org.eclipse.papyrus.gmf.gmfgraph.Figure
-import org.eclipse.papyrus.gmf.gmfgraph.LineBorder
-import org.eclipse.papyrus.gmf.gmfgraph.MarginBorder
-import xpt.Common
-import xpt.Common_qvto
-
-@com.google.inject.Singleton class Border {
-	@Inject extension Common
-	@Inject extension Common_qvto
-	@Inject extension Utils_Statefull_qvto
-
-	@Inject MapMode xptMapMode;
-	@Inject gmfgraph.attr.Figure xptFigure;
-	@Inject CustomAttributeOwner xptCustomAttributeOwner;
-	@Inject Runtime xptRuntime;
-
-	def Init(org.eclipse.papyrus.gmf.gmfgraph.Border border, String figureVarName) '''
-		«IF border != null»
-		«figureVarName».setBorder(«border(border, figureVarName)»);
-		«ENDIF»
-	'''
-
-	def InitMethods(Figure it) '''
-		«FOR b : getBordersInUse()»
-			«initMethod(b, getBordersInUse().toList.indexOf(b))»
-		«ENDFOR»
-	'''
-
-	def initMethod(CustomBorder it, Integer c) '''
-		«generatedMemberComment()»
-		private org.eclipse.draw2d.Border createBorder«c»() {
-			«xptRuntime.newInstance(it, 'result')»
-			«extraLineBreak»
-			«xptCustomAttributeOwner.Init(it, 'result')»
-			«extraLineBreak»
-			return result;
-		}
-	'''
-
-	def dispatch CharSequence border(Border it, String figureVarName) '''«ERROR(
-		'This is an abstract definition border(String, Border) invoked for ' + it)»'''
-
-	def dispatch CharSequence border(LineBorder it, String figureVarName) '''
-		new org.eclipse.draw2d.LineBorder(«IF null == color»null«ELSE»«xptFigure.color(it.color,
-			figureVarName.toUpperCase + '_BORDER')»«ENDIF», «xptMapMode.mapMode(width)»)
-	'''
-
-	def dispatch CharSequence border(MarginBorder it, String figureVarName) '''new org.eclipse.draw2d.MarginBorder(«xptMapMode.
-		mapMode(insets)»)'''
-
-	def dispatch CharSequence border(CompoundBorder it, String figureVarName) '''
-		new org.eclipse.draw2d.CompoundBorder(«IF outer == null»null«ELSE»«border(outer, figureVarName)»«ENDIF», «IF inner ==
-			null»null«ELSE»«border(inner, figureVarName)»«ENDIF»)
-	'''
-
-	def dispatch CharSequence border(CustomBorder it, String figureVarName) //
-		'''createBorder«getBordersInUse().size»()«addBorder(it)»'''
-
-	def dispatch CharSequence border(BorderRef it, String figureVarName) '''«border(actual, figureVarName)»'''
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Children.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Children.xtend
deleted file mode 100644
index d93f8c43ff6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Children.xtend
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import com.google.inject.Inject
-import org.eclipse.papyrus.gmf.gmfgraph.Figure
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure
-import xpt.Common
-import xpt.Common_qvto
-
-@com.google.inject.Singleton class Children {
-	@Inject extension Common
-	@Inject extension Common_qvto
-	@Inject extension Utils_qvto
-
-	@Inject Attrs xptAttrs;
-	@Inject LayoutData xptLayoutData;
-	@Inject Layout xptLayout;
-	@Inject Runtime xptRuntime;
-
-	def CreateChildren(RealFigure it) '''
-		«generatedMemberComment»
-		private void createContents(){
-			«FOR child : it.children»
-				«instantiate(child, 0, it, 'this')»
-			«ENDFOR»
-			«extraLineBreak»
-		}
-	'''
-
-	def dispatch CharSequence instantiate(Figure it, int count, RealFigure parentFigure, String parentFigureVariable) '''
-		«ERROR('Abstract instantiate(int, RealFigure, String)')»
-	'''
-
-	def dispatch CharSequence instantiate(FigureRef it, int count, RealFigure parentFigure, String parentFigureVariable) '''
-		«extraLineBreak»
-		«instantiate(it.figure, count, parentFigure, parentFigureVariable)»
-		// Process FigureRef details
-		«populate(it, count, parentFigure, parentFigureVariable, figureVariableName(figure, count))»
-		«extraLineBreak»
-	'''
-
-	def dispatch CharSequence instantiate(RealFigure it, int count, RealFigure parentFigure, String parentFigureVariable) '''
-		«extraLineBreak»
-		«newFigureInstance(it, figureVariableName(it, count))»
-		«extraLineBreak»
-		«populate(it, count, parentFigure, parentFigureVariable, figureVariableName(it, count))»
-		«FOR c : it.children»
-			«instantiate(c, count + 1, it, figureVariableName(it, count))» 
-		«ENDFOR»
-		«extraLineBreak»
-	'''
-
-	def populate(Figure it, int count, RealFigure parentFigure, String parentFigureVariable, String figureVarName) '''
-		«extraLineBreak»
-		«xptAttrs.Init(it, figureVarName)»
-		«IF null == layoutData || null == parentFigure.layout /*Check for (parentLayout != null) to avoid generating data that won't be used*/»
-			«extraLineBreak»
-			«parentFigureVariable».add(«figureVarName»);
-		«ELSE»
-			«xptLayoutData.Init(layoutData, parentFigureVariable, figureVarName)»
-		«ENDIF»
-		«xptLayout.Init(layout, figureVarName)»
-	'''
-
-	def newFigureInstance(RealFigure it, String figureVarName) '''
-		«IF needsField(it)»«figureVarName» = «xptRuntime.newInstance(it)»;«ELSE»«xptRuntime.newInstance(it, figureVarName)»«ENDIF»
-	'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Decoration.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Decoration.xtend
deleted file mode 100644
index 376fdcbfa01..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Decoration.xtend
+++ /dev/null
@@ -1,52 +0,0 @@
-
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import com.google.inject.Inject
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration
-
-/**
- * Instantiate and define attributes for DecorationFigures
- */
-@com.google.inject.Singleton class Decoration {
-
-	@Inject Runtime xptRuntime;
-	@Inject Attrs xptAttrs;
-	@Inject gmfgraph.attr.Decoration xptDecorationAttrs;
-
-	def dispatch Instantiate(DecorationFigure it, String figureVarName) '''
-		«xptRuntime.newInstance(it, figureVarName)»
-		«xptAttrs.Init(it, figureVarName)»
-	'''
-
-	def dispatch Instantiate(PolylineDecoration it, String figureVarName) '''
-		«xptRuntime.newInstance(it, figureVarName)»
-		«xptDecorationAttrs.polylineAttrs(it, figureVarName)»
-	'''
-
-	/**
-	 * Copy of above template for PolylineDecoration, 
-	 * just because PolygonDecoration doesn't extend PolylineDecoration in draw2d and gmfgraph
-	 */
-	def dispatch Instantiate(PolygonDecoration it, String figureVarName) '''
-		«xptRuntime.newInstance(it, figureVarName)»
-		«xptDecorationAttrs.polylineAttrs(it, figureVarName)»
-	'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Extras.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Extras.xtend
deleted file mode 100644
index bc5f6a5fba9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Extras.xtend
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import com.google.inject.Inject
-import org.eclipse.papyrus.gmf.gmfgraph.Figure
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty
-import org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType
-import xpt.Common
-
-@com.google.inject.Singleton class Extras {
-	@Inject extension Utils_qvto
-	@Inject extension Common
-
-	def dispatch extraMethods(Figure it) ''''''
-
-	def dispatch extraMethods(SVGFigure it) '''
-		«FOR p : properties»
-			«svgProperty(p)»
-		«ENDFOR»
-	'''
-
-	def svgProperty(SVGProperty it) '''
-		«IF getter != null»
-			«svgPropertyGetter(it)»
-		«ENDIF»
-		«IF setter != null»
-			«svgPropertySetter(it)»
-		«ENDIF»
-	'''
-
-	def svgPropertyGetter(SVGProperty it) '''
-		«generatedMemberComment»
-		public «svgPropertyType(it)» «getter»() {
-			org.w3c.dom.NodeList nodes = getNodes("«it.query»"); //$NON-NLS-1$
-			if (nodes.getLength() > 0) {
-				org.w3c.dom.Element element = (org.w3c.dom.Element) nodes.item(0);
-				«IF type == SVGPropertyType::COLOR»
-					return getColor(element, "«attribute»"); «nonNLS(1)»
-				«ELSEIF type == SVGPropertyType::FLOAT»
-					String value = element.getAttributeNS(null, "«attribute»"); «nonNLS(1)»
-					return Float.parseFloat(value);
-				«ELSE»
-					return element.getAttributeNS(null, "«attribute»"); «nonNLS(1)»
-				«ENDIF»
-			}
-			«IF type == SVGPropertyType::FLOAT»
-				return 0;
-			«ELSE»
-				return null;
-			«ENDIF»
-		}
-	'''
-
-	def svgPropertySetter(SVGProperty it) '''
-		«generatedMemberComment»
-		public void «setter»(«svgPropertyType(it)» value) {
-			«IF type == SVGPropertyType::COLOR»
-				String svalue = org.eclipse.gmf.runtime.lite.svg.SVGUtils.toSVGColor(getDocument(), value);
-			«ELSEIF type == SVGPropertyType::FLOAT»
-				String svalue = Float.toString(value);
-			«ENDIF»
-			org.w3c.dom.NodeList nodes = getNodes("«it.query»"); «nonNLS(1)»
-			for (int i = 0; i < nodes.getLength(); i++) {
-				((org.w3c.dom.Element) nodes.item(i)).setAttributeNS(null, "«attribute»", «nonNLS(1)»
-					«IF type == SVGPropertyType::STRING»value«ELSE»svalue«ENDIF»);
-			}
-			«IF callSuper»
-				super.«setter»(value);
-			«ENDIF»
-		}
-	'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Layout.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Layout.xtend
deleted file mode 100644
index 3db4d7338ee..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Layout.xtend
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import com.google.inject.Inject
-import gmfgraph.attr.CustomAttributeOwner
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayout
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayout
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutRef
-import xpt.Common
-
-@com.google.inject.Singleton class Layout {
-	@Inject extension Common;
-	
-	@Inject Runtime xptRuntime;
-	@Inject CustomAttributeOwner xptCustomAttributeOwner;
-
-	def Init(org.eclipse.papyrus.gmf.gmfgraph.Layout layout, String owningFigureVariable) '''
-		«IF layout != null»
-			«dispatch_Init(layout, owningFigureVariable)»
-		«ENDIF»
-	'''
-
-	def dispatch CharSequence dispatch_Init(org.eclipse.papyrus.gmf.gmfgraph.Layout it, String owningFigureVariable) '''
-		«owningFigureVariable».setLayoutManager(«xptRuntime.newInstance(it)»);
-	'''
-
-	def dispatch CharSequence dispatch_Init(LayoutRef it, String owningFigureVariable) '''
-		«IF it.actual != null»
-			«dispatch_Init(it.actual, owningFigureVariable)»
-		«ENDIF»
-	'''
-
-	def dispatch CharSequence dispatch_Init(BorderLayout it, String owningFigureVariable) '''
-		«extraLineBreak»
-		«var layoutVarName = layoutVarName(owningFigureVariable)»
-		«xptRuntime.newInstance(it, layoutVarName)»
-		«IF null != it.spacing»
-			«layoutVarName».setHorizontalSpacing(«spacing.dx»);// TODO mapMode?
-			«layoutVarName».setVerticalSpacing(«spacing.dy»);
-		«ENDIF»
-		«owningFigureVariable».setLayoutManager(«layoutVarName»);
-		«extraLineBreak»
-	'''
-
-	def dispatch CharSequence dispatch_Init(GridLayout it, String owningFigureVariable) '''
-		«extraLineBreak»
-		«var layoutVarName = layoutVarName(owningFigureVariable)»
-		«xptRuntime.newInstance(it, layoutVarName)»
-		«layoutVarName».numColumns = «it.numColumns»;
-		«layoutVarName».makeColumnsEqualWidth = «it.equalWidth»;
-		«IF null != spacing»
-			«layoutVarName».horizontalSpacing = «it.spacing.dx»;
-			«layoutVarName».verticalSpacing = «it.spacing.dy»;
-		«ENDIF»
-		«IF null != it.margins»
-			«layoutVarName».marginWidth = «margins.dx»;
-			«layoutVarName».marginHeight = «margins.dy»;
-		«ENDIF»
-		«owningFigureVariable».setLayoutManager(«layoutVarName»);
-		«extraLineBreak»
-	'''
-
-	def dispatch CharSequence dispatch_Init(FlowLayout it, String owningFigureVariable) '''
-		«var layoutVarName = layoutVarName(owningFigureVariable)»
-		«extraLineBreak»
-		«xptRuntime.newInstance(it, layoutVarName)»
-		«layoutVarName».setStretchMinorAxis(«matchMinorSize»);
-		«layoutVarName».setMinorAlignment(«xptRuntime.fqn(it)».«alignment(minorAlignment, forceSingleLine)»);
-		«IF forceSingleLine»
-			«extraLineBreak»
-			«layoutVarName».setSpacing(«majorSpacing»);
-			«layoutVarName».setVertical(«vertical»);
-		«ELSE»
-			«extraLineBreak»
-			«layoutVarName».setMajorAlignment(«xptRuntime.fqn(it)».«alignment(majorAlignment, forceSingleLine)»);
-			«layoutVarName».setMajorSpacing(«majorSpacing»);
-			«layoutVarName».setMinorSpacing(«minorSpacing»);
-			«layoutVarName».setHorizontal(«!vertical»);
-		«ENDIF»
-		«extraLineBreak»
-		«owningFigureVariable».setLayoutManager(«layoutVarName»);
-		«extraLineBreak»
-	'''
-
-	def dispatch CharSequence dispatch_Init(CustomLayout it, String owningFigureVariable) '''
-		«extraLineBreak»
-		«var String layoutVarName = layoutVarName(owningFigureVariable)»
-		«xptRuntime.newInstance(it, layoutVarName)»
-		«xptCustomAttributeOwner.Init(it, layoutVarName)»
-		«owningFigureVariable».setLayoutManager(«layoutVarName»);
-		«extraLineBreak»
-	'''
-
-	def String layoutVarName(String owningFigureVariable) {
-		return 'layout' + owningFigureVariable.toFirstUpper;
-	}
-
-	def String alignment(Alignment alignment, boolean forceSingleLine) {
-		switch (alignment) {
-			case Alignment::BEGINNING_LITERAL: return if(forceSingleLine) 'ALIGN_TOPLEFT' else 'ALIGN_LEFTTOP'
-			case Alignment::END_LITERAL: return if(forceSingleLine) 'ALIGN_BOTTOMRIGHT' else 'ALIGN_RIGHTBOTTOM'
-			default: 'ALIGN_CENTER'
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/LayoutData.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/LayoutData.xtend
deleted file mode 100644
index 7df897ffb63..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/LayoutData.xtend
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import com.google.inject.Inject
-import gmfgraph.attr.CustomAttributeOwner
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData
-import xpt.Common_qvto
-import xpt.Common
-
-@com.google.inject.Singleton class LayoutData {
-	@Inject extension Common;
-	@Inject extension Common_qvto;
-	@Inject extension Utils_qvto;
-
-	@Inject Runtime xptRuntime;
-	@Inject CustomAttributeOwner xptCustomAttributeOwner;
-	@Inject MapMode xptMapMode;
-
-	def dispatch Init(LayoutData it, String parentFigureVariable, String owningFigureVariable) '''
-		«ERROR('Abstract definition, there should be specific template for ' + it)»
-	'''
-
-	def dispatch Init(BorderLayoutData it, String parentFigureVariable, String owningFigureVariable) '''
-		«extraLineBreak»
-		«parentFigureVariable».add(«owningFigureVariable», org.eclipse.draw2d.BorderLayout.«borderLayoutConstant(it)»);
-	'''
-
-	def dispatch Init(XYLayoutData it, String parentFigureVariable, String owningFigureVariable) '''
-		«extraLineBreak»
-		«parentFigureVariable».add(«owningFigureVariable», «newRectangle(it)»);
-	'''
-
-	def dispatch Init(CustomLayoutData it, String parentFigureVariable, String owningFigureVariable) '''
-		«extraLineBreak»
-		«var constraintVarName = 'constraint' + owningFigureVariable.toFirstUpper»
-		«qualifiedClassName» «constraintVarName» = new «qualifiedClassName»();
-		«xptCustomAttributeOwner.Init(it, constraintVarName)»
-		«parentFigureVariable».add(«owningFigureVariable», «constraintVarName»);
-	'''
-
-	def dispatch Init(GridLayoutData it, String parentFigureVariable, String owningFigureVariable) '''
-		«extraLineBreak»
-		«var constraintVarName = 'constraint' + owningFigureVariable.toFirstUpper»
-		«xptRuntime.newInstance(it, constraintVarName)»
-		«constraintVarName».verticalAlignment = «xptRuntime.fqn(it)».«verticalAlignment.literal»;
-		«constraintVarName».horizontalAlignment = «xptRuntime.fqn(it)».«horizontalAlignment.literal»;
-		«constraintVarName».horizontalIndent = «horizontalIndent»;
-		«constraintVarName».horizontalSpan = «horizontalSpan»;
-		«constraintVarName».verticalSpan = «verticalSpan»;
-		«constraintVarName».grabExcessHorizontalSpace = «grabExcessHorizontalSpace»;
-		«constraintVarName».grabExcessVerticalSpace = «grabExcessVerticalSpace»;
-		«IF null != sizeHint»
-			«constraintVarName».widthHint = «sizeHint.dx»;
-			«constraintVarName».heightHint = «sizeHint.dy»;
-		«ENDIF»
-		«parentFigureVariable».add(«owningFigureVariable», «constraintVarName»);
-	'''
-
-	def newRectangle(XYLayoutData it) '''
-		new org.eclipse.draw2d.geometry.Rectangle(«IF 
-			null != topLeft»«xptMapMode.mapMode(topLeft)», «ELSE»0, 0, «ENDIF»«IF  
-			null != size»«xptMapMode.mapMode(size)»«ELSE»0, 0«ENDIF»)
-	'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/MapMode.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/MapMode.xtend
deleted file mode 100644
index 449e4e9a627..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/MapMode.xtend
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension
-import org.eclipse.papyrus.gmf.gmfgraph.Insets
-import org.eclipse.papyrus.gmf.gmfgraph.Point
-
-/**
- * No mapMode at all, provided only as hook for extenders
- */
-@com.google.inject.Singleton class MapMode {
-	def dispatch mapMode(Dimension it) '''«dx», «dy»'''
-
-	def dispatch mapMode(Point it) '''«x», «y»'''
-
-	def dispatch mapMode(Integer it) '''«it»'''
-
-	def dispatch mapMode(Insets it) '''«top», «left», «bottom», «right»'''
-
-	def Activator() ''''''
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Runtime.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Runtime.xtend
deleted file mode 100644
index 37b978fcbee..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Runtime.xtend
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import com.google.inject.Inject
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayout
-import org.eclipse.papyrus.gmf.gmfgraph.CenterLayout
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout
-import org.eclipse.papyrus.gmf.gmfgraph.Ellipse
-import org.eclipse.papyrus.gmf.gmfgraph.Figure
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayout
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData
-import org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle
-import org.eclipse.papyrus.gmf.gmfgraph.Label
-import org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer
-import org.eclipse.papyrus.gmf.gmfgraph.Layout
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutData
-import org.eclipse.papyrus.gmf.gmfgraph.Polygon
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure
-import org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon
-import org.eclipse.papyrus.gmf.gmfgraph.StackLayout
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayout
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData
-import xpt.Common_qvto
-
-@com.google.inject.Singleton class Runtime {
-	@Inject extension Utils_qvto
-	@Inject extension Common_qvto
-
-	def dispatch newInstance(Figure it, String figureVarName) '''«fqn(it)» «figureVarName» = «newInstance(it)»;'''
-
-	def dispatch newInstance(Figure it) '''new «fqn(it)»()'''
-
-	def dispatch newInstance(Layout it, String layoutVarName) '''«fqn(it)» «layoutVarName» = «newInstance(it)»;'''
-
-	def dispatch newInstance(Layout it) '''new «fqn(it)»()'''
-
-	def dispatch newInstance(LayoutData it, String constraintVarName) '''«fqn(it)» «constraintVarName» = «newInstance(it)»;'''
-
-	def dispatch newInstance(LayoutData it) '''new «fqn(it)»()'''
-
-	def dispatch newInstance(org.eclipse.papyrus.gmf.gmfgraph.Border it, String borderVarName) '''«fqn(it)» «borderVarName» = «newInstance(
-		it)»;'''
-
-	def dispatch newInstance(org.eclipse.papyrus.gmf.gmfgraph.Border it) '''new «fqn(it)»()'''
-
-	def dispatch CharSequence fqn(Figure it) '''«ERROR('Abstract definition fqn(Figure)')»'''
-
-	def dispatch CharSequence fqn(Layout it) '''«ERROR('Abstract definition fqn(Layout)')»'''
-
-	def dispatch CharSequence fqn(LayoutData it) '''«ERROR('Abstract definition fqn(LayoutData)')»'''
-
-	def dispatch CharSequence fqn(org.eclipse.papyrus.gmf.gmfgraph.Border it) '''«ERROR('Abstract definition fqn(Border)')»'''
-
-	////////////////////////
-	def dispatch CharSequence fqn(CustomLayout it) '''«qualifiedClassName»'''
-
-	def dispatch CharSequence fqn(CustomBorder it) '''«qualifiedClassName»'''
-
-	def dispatch CharSequence fqn(CustomFigure it) '''«qualifiedClassName»'''
-
-	////////////////////////
-	def dispatch CharSequence fqn(FlowLayout it) '''«IF forceSingleLine»org.eclipse.draw2d.ToolbarLayout«ELSE»org.eclipse.draw2d.FlowLayout«ENDIF»'''
-
-	def dispatch CharSequence fqn(XYLayout it) '''org.eclipse.draw2d.XYLayout'''
-
-	def dispatch CharSequence fqn(XYLayoutData it) '''org.eclipse.draw2d.geometry.Rectangle'''
-
-	def dispatch CharSequence fqn(GridLayout it) '''org.eclipse.draw2d.GridLayout'''
-
-	def dispatch CharSequence fqn(GridLayoutData it) '''org.eclipse.draw2d.GridData'''
-
-	def dispatch CharSequence fqn(StackLayout it) '''org.eclipse.draw2d.StackLayout'''
-
-	def dispatch CharSequence fqn(BorderLayout it) '''org.eclipse.draw2d.BorderLayout'''
-
-	/**
-	 * CenterLayout requires dependency to tooling runtime if the stabdalone plugin is generated
-	 */
-	def dispatch CharSequence fqn(CenterLayout it) '''org.eclipse.gmf.tooling.runtime.draw2d.CenterLayout'''
-
-	////////////////////////
-	def dispatch CharSequence fqn(FigureRef it) '''«fqn(it.figure)»'''
-
-	def dispatch CharSequence fqn(Label it) '''«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»org.eclipse.draw2d.Label«ENDIF»'''
-
-	def dispatch CharSequence fqn(VerticalLabel it) '''org.eclipse.gmf.tooling.runtime.draw2d.labels.VerticalLabel'''
-
-	def dispatch CharSequence fqn(LabeledContainer it) '''org.eclipse.draw2d.LabeledContainer'''
-
-	def dispatch CharSequence fqn(Rectangle it) '''org.eclipse.draw2d.RectangleFigure'''
-
-	def dispatch CharSequence fqn(RoundedRectangle it) '''org.eclipse.draw2d.RoundedRectangle'''
-
-	def dispatch CharSequence fqn(InvisibleRectangle it) '''org.eclipse.draw2d.RectangleFigure'''
-
-	def dispatch CharSequence fqn(Ellipse it) '''org.eclipse.draw2d.Ellipse'''
-
-	def dispatch CharSequence fqn(Polygon it) '''org.eclipse.draw2d.PolygonShape'''
-
-	def dispatch CharSequence fqn(ScalablePolygon it) '''org.eclipse.draw2d.ScalablePolygonShape'''
-
-	def dispatch CharSequence fqn(PolygonDecoration it) '''org.eclipse.draw2d.PolygonDecoration'''
-
-	def dispatch CharSequence fqn(Polyline it) '''org.eclipse.draw2d.PolylineShape'''
-
-	def dispatch CharSequence fqn(PolylineDecoration it) '''org.eclipse.draw2d.PolylineDecoration'''
-
-	def dispatch CharSequence fqn(PolylineConnection it) '''«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx«ELSE»org.eclipse.draw2d.PolylineConnection«ENDIF»'''
-
-	def dispatch CharSequence fqn(SVGFigure it) '''org.eclipse.gmf.runtime.lite.svg.SVGFigure'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Utils_Statefull_qvto.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Utils_Statefull_qvto.xtend
deleted file mode 100644
index 4965e05be13..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Utils_Statefull_qvto.xtend
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2013, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Montages) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import java.util.List
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder
-
-/**
- * FIXME: @Singleton is ugly way to workaround the absence of FILE directive and QVTO properties.
- * Fortunately, it is the only place across all GMFT templates where those 2 features had been used
- */
-@com.google.inject.Singleton class Utils_Statefull_qvto {
-	
-	private List<CustomBorder> myBordersInUse;
-
-	private List<CharSequence> myStaticFieldsStream;
-
-	def void addBorder(CustomBorder border) {
-		myBordersInUse.add(border);
-	}
-
-	def void clearState() {
-		myBordersInUse = <CustomBorder>newLinkedList();
-		myStaticFieldsStream = <CharSequence>newLinkedList();
-	}
-
-	def Iterable<CustomBorder> getBordersInUse() {
-		return myBordersInUse;
-	}
-
-	/**
-	 * XXX [MG]: workaround for «FILE» directive is not supported in Xtend2
-	 */
-	def void addToStaticStream(CharSequence code) {
-		if (code != null && code.length > 0) {
-			myStaticFieldsStream.add(code);
-		}
-	}
-
-	def Iterable<CharSequence> staticStream() {
-		return myStaticFieldsStream;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Utils_qvto.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Utils_qvto.xtend
deleted file mode 100644
index 05d580a2303..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/Utils_qvto.xtend
+++ /dev/null
@@ -1,238 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph
-
-import java.util.List
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment
-import org.eclipse.papyrus.gmf.gmfgraph.BasicFont
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess
-import org.eclipse.papyrus.gmf.gmfgraph.Color
-import org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure
-import org.eclipse.papyrus.gmf.gmfgraph.Ellipse
-import org.eclipse.papyrus.gmf.gmfgraph.Figure
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef
-import org.eclipse.papyrus.gmf.gmfgraph.Label
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty
-import org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType
-import org.eclipse.papyrus.gmf.gmfgraph.Shape
-import org.eclipse.papyrus.gmf.codegen.xtend.annotations.MetaDef
-import xpt.Common_qvto
-import com.google.inject.Inject
import java.util.LinkedList
-
-@com.google.inject.Singleton class Utils_qvto {
-	@Inject extension Common_qvto;
-
-	def String compilationUnitName(FigureDescriptor figure) {
-		return figure.name.toFirstUpper
-	}
-
-	def boolean hasSourceDecoration(PolylineConnection figure) {
-		return null != figure.sourceDecoration
-	}
-
-	def Iterable<String> requiredBundles(Iterable<String> referencedBundles) {
-		var List<String> result = newLinkedList('org.eclipse.core.runtime', 'org.eclipse.draw2d');
-		if (isFullRuntime()) {
-			result.add('org.eclipse.gmf.runtime.draw2d.ui');
-		}
-		result.addAll(referencedBundles)
-		return result.sort
-	}
-
-	//	def String additionalStaticFields() {
-	//		return if(xpandGetStreamNames().contains('staticFields')) xpandGetStreamContents('staticFields') else ''
-	//	}
-	//
-	//	def boolean isFullRuntime() {
-	//		return internalCheckRuntimeToken() == null || !internalCheckRuntimeToken().toLower == 'full';
-	//	}
-	//
-	//	def String internalCheckRuntimeToken() {
-	//		return xpandGetStringGlobalVar('runtimeToken')
-	//	}
-	/**
-	 * XXX: [MG] As of 2013 only full runtime is supported 
-	 */
-	def boolean isFullRuntime() {
-		true
-	}
-
-	def boolean hasTargetDecoration(PolylineConnection figure) {
-		return null != figure.targetDecoration
-	}
-
-	def dispatch boolean needsField(RealFigure figure) {
-		return realFigureNeedsField(figure);
-	}
-
-	def dispatch boolean needsField(CustomFigure figure) {
-		return customFigureNeedsField(figure) || realFigureNeedsField(figure);
-	}
-
-	def boolean customFigureNeedsField(CustomFigure figure) {
-		hasDescriptor(figure) && !figure.customChildren.empty
-	}
-
-	def boolean realFigureNeedsField(RealFigure figure) {
-		hasDescriptor(figure) && figure.descriptor.accessors.exists[a|a.figure == figure]
-	}
-
-	def boolean hasDescriptor(RealFigure figure) {
-		figure.descriptor != null 
-	}
-
-	def String figureVariableName(RealFigure figure, int count) {
-		if(needsField(figure)) return figure.figureFieldName();
-		var base = if(figure.name.nullOrSpaces) figure.variableNameStem() else figure.name.toFirstLower
-		return base + count;
-	}
-
-	def dispatch nameStem(FigureRef xptSelf) {
-		return xptSelf.figure.variableNameStem()
-	}
-
-	def dispatch nameStem(Figure xptSelf) {
-		return xptSelf.variableNameStem()
-	}
-
-	def dispatch variableNameStem(Figure xptSelf) {
-		return 'fig'
-	}
-
-	def dispatch variableNameStem(RealFigure xptSelf) {
-		return 'fig'
-	}
-
-	def dispatch variableNameStem(Shape xptSelf) {
-		return 'shape'
-	}
-
-	def dispatch variableNameStem(Rectangle xptSelf) {
-		return 'rect'
-	}
-
-	def dispatch variableNameStem(RoundedRectangle xptSelf) {
-		return 'rrect'
-	}
-
-	def dispatch variableNameStem(Ellipse xptSelf) {
-		return 'elli'
-	}
-
-	def dispatch variableNameStem(Polyline xptSelf) {
-		return 'polyline'
-	}
-
-	def dispatch variableNameStem(Label xptSelf) {
-		return 'l'
-	}
-
-	def dispatch variableNameStem(DecorationFigure xptSelf) {
-		return 'dec'
-	}
-
-	def dispatch variableNameStem(ConnectionFigure xptSelf) {
-		return 'conn'
-	}
-
-	def dispatch String figureFieldName(RealFigure xptSelf) {
-		return figureFieldName(xptSelf.descriptor.accessors.filter[a|xptSelf == a.figure])
-	}
-
-	def dispatch String figureFieldName(ChildAccess xptSelf) {
-		return 'f' + xptSelf.accessor.trimPrefixIfAny('get')
-	}
-
-	def dispatch String figureFieldName(CustomFigure xptSelf) {
-			return 'my' + xptSelf.name.toFirstUpper;
-	}
-
-	def dispatch String figureFieldName(Iterable<ChildAccess> accesses) {
-		return accesses.map[x|x.figureFieldName()].head
-	}
-
-	def String borderLayoutConstant(BorderLayoutData layoutData) {
-		return switch (layoutData.alignment) {
-			case Alignment::BEGINNING_LITERAL: if(layoutData.vertical) 'TOP' else 'LEFT'
-			case Alignment::END_LITERAL: if(layoutData.vertical) 'BOTTOM' else 'RIGHT'
-			default: 'CENTER'
-		}
-	}
-
-	def Iterable<FigureAccessor> allCustomAccessors(FigureDescriptor fd) {
-		return filterCustom(newLinkedList(fd.actualFigure)).map[cf|cf.customChildren].flatten
-	}
-
-	def Iterable<CustomFigure> filterCustom(Iterable<Figure> figures) {
-		val result = <CustomFigure>newLinkedList();
-		deepCollectCustom(figures, result);
-		return result;
-	}
-
-	protected def void deepCollectCustom(Iterable<Figure> figures, List<CustomFigure> acc) {
-		if(figures.empty) return;
-		acc.addAll(figures.filter(typeof(CustomFigure)));
-		deepCollectCustom(figures.filter(typeof(RealFigure)).map[rf|rf.children].flatten, acc)
-		deepCollectCustom(figures.filter(typeof(CustomFigure)).map[rf|rf.customChildren].flatten.map[cc | cc.typedFigure].filter(typeof(Figure)), acc)
-	}
-	
-	def LinkedList<FigureAccessor> getCustomFigureChainFigureAccess(ChildAccess it) {
-		val result = <FigureAccessor>newLinkedList();
-		if (oclIsKindOf(it.figure, CustomFigure)) {
-			var cf = it.figure as CustomFigure;
-			while (oclIsKindOf(cf.eContainer, FigureAccessor)) {
-				result.push(cf.eContainer as FigureAccessor)
-				cf = cf.eContainer.eContainer as CustomFigure;
-			}
-		}
-		return result;
-	}
-
-	def String svgPropertyType(SVGProperty p) {
-		return switch (p.type) {
-			case SVGPropertyType::COLOR: 'org.eclipse.swt.graphics.Color'
-			case SVGPropertyType::FLOAT: 'float'
-			default: 'String'
-		}
-	}
-
-	@MetaDef def String fontVariableName(BasicFont it, String figureVarName) {
-		figureVarName.toUpperCase + '_FONT'
-	}
-
-	@MetaDef def String backgroundColorVariableName(Color it, String figureVarName) {
-		figureVarName.toUpperCase + '_BACK'
-	}
-
-	@MetaDef def String foregroundColorVariableName(Color it, String figureVarName) {
-		figureVarName.toUpperCase + '_FORE'
-	}
-	
-	protected def trimPrefixIfAny(String text, String prefix) {
-		return if(text.startsWith(prefix) && text.length > prefix.length) text.substring(prefix.length) else text
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/CustomAttributeOwner.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/CustomAttributeOwner.xtend
deleted file mode 100644
index 4e677625cde..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/CustomAttributeOwner.xtend
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph.attr
-
-import java.text.MessageFormat
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute
-import org.eclipse.papyrus.gmf.gmfgraph.CustomClass
-
-/**
- * During Xpand->Xtend2 conversion this class had been merged with CustomClass.xpt
- */
-@com.google.inject.Singleton class CustomAttributeOwner {
-
-	def customAttributes(org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner it, String instanceVarName) '''
-		«FOR attr : it.attributes»
-			«customAttribute(attr, instanceVarName)»
-		«ENDFOR»
-	'''
-
-	def Init(CustomClass it, String instanceVarName) '''«customAttributes(it, instanceVarName)»'''
-
-	def customAttribute(CustomAttribute it, String instanceVarName) '''
-		«customAttrValueImpl(it)»
-		«IF directAccess»
-			«instanceVarName».«name» = «customAttrValue(it)»;
-		«ELSE»
-			«instanceVarName».set«name.toFirstUpper»(«customAttrValue(it)»);
-		«ENDIF»
-	'''
-
-	def customAttrValueImpl(CustomAttribute it) '''
-		«IF multiStatementValue»
-			«MessageFormat::format(it.value, 'attr' + name.toFirstUpper)»
-		«ENDIF»
-	'''
-
-	def customAttrValue(CustomAttribute it) '''
-		«IF multiStatementValue»attr«name.toFirstUpper»«ELSE»«value»«ENDIF»
-	'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Decoration.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Decoration.xtend
deleted file mode 100644
index 95dfb164481..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Decoration.xtend
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph.attr
-
-import com.google.inject.Inject
-import gmfgraph.MapMode
-import org.eclipse.papyrus.gmf.gmfgraph.Point
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration
-
-@com.google.inject.Singleton class Decoration {
-	@Inject Figure xptFigure;
-	@Inject MapMode xptMapMode;
-	@Inject Shape xptShape;
-
-	def dispatch polylineAttrs(PolylineDecoration it, String figureVarName) '''
-		«xptShape.shapeAttrs(it, figureVarName)»
-		«xptFigure.figureAttrs(it, figureVarName)»
-		«templatePoints(it, figureVarName)»
-		«scale(it, figureVarName)»
-	'''
-
-	def dispatch polylineAttrs(PolygonDecoration it, String figureVarName) '''
-		«xptShape.shapeAttrs(it, figureVarName)»
-		«xptFigure.figureAttrs(it, figureVarName)»
-		«templatePoints(it, figureVarName)»
-		«scale(it, figureVarName)»
-	'''
-
-	def templatePoints(Polyline it, String figureVarName) '''
-		«IF !template.empty»
-			org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
-			«FOR p : it.template»
-				«templatePoint(p, 'pl')»
-			«ENDFOR»
-			«figureVarName».setTemplate(pl);
-		«ENDIF»
-	'''
-
-	def templatePoint(Point it, String pointListVarName) '''
-		«pointListVarName».addPoint(«xptMapMode.mapMode(it)»);
-	'''
-
-	def dispatch scale(PolylineDecoration it, String figureVarName) '''
-		«IF !template.empty»
-			«figureVarName».setScale(«xptMapMode.mapMode(7)», «xptMapMode.mapMode(3)»);
-		«ENDIF»
-	'''
-
-	def dispatch scale(PolygonDecoration it, String figureVarName) '''
-		«IF !template.empty»
-			«figureVarName».setScale(«xptMapMode.mapMode(7)», «xptMapMode.mapMode(3)»);
-		«ENDIF»
-	'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Figure.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Figure.xtend
deleted file mode 100644
index 0409e6af290..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Figure.xtend
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph.attr
-
-import com.google.inject.Inject
-import xpt.Common
-import org.eclipse.papyrus.gmf.gmfgraph.Color
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension
-import gmfgraph.MapMode
-import gmfgraph.Border
-import org.eclipse.papyrus.gmf.gmfgraph.Insets
-import org.eclipse.papyrus.gmf.gmfgraph.Point
-import org.eclipse.papyrus.gmf.gmfgraph.Font
-import org.eclipse.papyrus.gmf.gmfgraph.RGBColor
-import xpt.Common_qvto
-import org.eclipse.papyrus.gmf.gmfgraph.ConstantColor
-import gmfgraph.Utils_qvto
-import org.eclipse.papyrus.gmf.gmfgraph.BasicFont
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure
-import gmfgraph.Utils_Statefull_qvto
-
-@com.google.inject.Singleton class Figure {
-	@Inject extension Common_qvto
-	@Inject extension Common
-	@Inject extension Utils_qvto
-	@Inject extension Utils_Statefull_qvto
-	
-	@Inject MapMode xptMapMode;
-	@Inject Border xptBorder;
-	@Inject CustomAttributeOwner xptCustomAttributeOwner;
-	
-	def figureAttrs(org.eclipse.papyrus.gmf.gmfgraph.Figure it, String figureVarName) '''
-		«foregroundColor(it.foregroundColor, figureVarName)»
-		«backgroundColor(it.backgroundColor, figureVarName)»
-		«IF font != null»«font(font, figureVarName)»«ENDIF»
-		«preferredSize(preferredSize, figureVarName)»
-		«maximumSize(maximumSize, figureVarName)»
-		«minimumSize(minimumSize, figureVarName)»
-		«position(location, figureVarName)»
-		«size(size, figureVarName)»
-		«insets(insets, figureVarName)»
-		«xptBorder.Init(it.border, figureVarName)»
-		«dispatch_customAttributes(it, figureVarName)»
-	'''
-
-	def foregroundColor(Color color, String figureVarName) '''
-		«IF color != null»
-		«figureVarName».setForegroundColor(«color(color, foregroundColorVariableName(color, figureVarName))»);
-		«ENDIF»
-	'''
-	
-	def backgroundColor(Color color, String figureVarName) '''
-		«IF color != null»
-		«figureVarName».setBackgroundColor(«color(color, backgroundColorVariableName(color, figureVarName))»);
-		«ENDIF»
-	'''
-	
-	def preferredSize(Dimension dim, String figureVarName) '''
-		«IF dim != null»
-		«figureVarName».setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(«xptMapMode.mapMode(dim)»));
-		«ENDIF»
-	'''
-	
-	def maximumSize(Dimension dim, String figureVarName) '''
-		«IF dim != null»
-		«figureVarName».setMaximumSize(new org.eclipse.draw2d.geometry.Dimension(«xptMapMode.mapMode(dim)»));
-		«ENDIF»
-	'''
-	
-	def minimumSize(Dimension dim, String figureVarName) '''
-		«IF dim != null»
-		«figureVarName».setMinimumSize(new org.eclipse.draw2d.geometry.Dimension(«xptMapMode.mapMode(dim)»));
-		«ENDIF»
-	'''
-	
-	def position(Point point, String figureVarName) '''
-		«IF point != null»
-		«figureVarName».setLocation(new org.eclipse.draw2d.geometry.Point(«xptMapMode.mapMode(point)»));
-		«ENDIF»
-	'''
-	
-	def size(Point point, String figureVarName) '''
-		«IF point != null»
-		«figureVarName».setSize(«xptMapMode.mapMode(point)»);
-		«ENDIF»
-	'''
-
-	/**
-	 * using MarginBorder for insets is not good idea (?)
-	 */
-	def insets(Insets insets, String figureVarName) '''
-		«IF insets != null»
-		«extraLineBreak»
-		«figureVarName».setBorder(new org.eclipse.draw2d.MarginBorder(«xptMapMode.mapMode(insets)»));
-		«ENDIF»
-	'''
-	
-	def dispatch color(Color it, String variableName) '''
-		«ERROR("This is abstract definition, missing concrete def for: " + it)»
-	'''
-	
-	def dispatch color(RGBColor it, String variableName) '''
-		«variableName»
-		«addToStaticStream('''«color_staticFields(it, variableName)»''')»
-	'''
-	
-	def dispatch color(ConstantColor it, String variableName) '''
-		org.eclipse.draw2d.ColorConstants.«value»
-	'''
-	
-	def dispatch color_staticFields(Color it, String variableName) ''''''
-	
-	def dispatch color_staticFields(RGBColor it, String variableName) '''
-		«generatedMemberComment»
-		static final org.eclipse.swt.graphics.Color «variableName» = new org.eclipse.swt.graphics.Color(null, «red», «green», «blue»);
-		«extraLineBreak»
-	'''
-	
-	def dispatch font(Font it, String figureVarName) '''
-		«ERROR("This is abstract definition, missing concrete def for: " + it)»
-	'''
-	
-	def dispatch font(BasicFont it, String figureVarName) '''
-		«extraLineBreak»
-		«figureVarName».setFont(«fontVariableName(it, figureVarName)»);
-		«addToStaticStream('''«font_staticFields(it, figureVarName)»''')»
-		«extraLineBreak»
-	'''
-	
-	def dispatch font_staticFields(Font it, String figureVarName) ''''''
-	
-	def dispatch font_staticFields(BasicFont it, String figureVarName) '''
-		«generatedMemberComment()»
-		static final org.eclipse.swt.graphics.Font «fontVariableName(it, figureVarName)» = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), «
-			IF it.faceName.nullOrSpaces()»org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName()«ELSE»"«faceName»"«ENDIF», «height», org.eclipse.swt.SWT.«style»);
-	'''
-	
-	def dispatch dispatch_customAttributes(Figure it, String figureVarName) ''''''
-	
-	def dispatch dispatch_customAttributes(RealFigure it, String figureVarName) '''
-		«xptCustomAttributeOwner.customAttributes(it, figureVarName)»
-	'''
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Shape.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Shape.xtend
deleted file mode 100644
index 92f14a74eec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/attr/Shape.xtend
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph.attr
-
-import org.eclipse.papyrus.gmf.gmfgraph.LineKind
-import org.eclipse.papyrus.gmf.gmfgraph.Polygon
-
-/**
- *	org.eclipse.draw2d.Shape
- *	private boolean fill = true, outline = true, xorFill, xorOutline;
- *	lineAttributes.width = 1.0
- *	lineAttributes.style = LINE_SOLID
- */
-@com.google.inject.Singleton class Shape {
-
-	def shapeAttrs(org.eclipse.papyrus.gmf.gmfgraph.Shape it, String figureVarName) '''
-	«fill(it, figureVarName)»
-	«IF it.xorFill»«xorFill(it, figureVarName)»«ENDIF»
-	«IF !it.outline»«outline(it, figureVarName)»«ENDIF»
-	«IF it.xorOutline»«xorOutline(it, figureVarName)»«ENDIF»
-	«IF it.lineWidth != 1»«lineWidth(it, figureVarName)»«ENDIF»
-	«IF it.lineKind != LineKind::LINE_SOLID_LITERAL»«lineKind(it, figureVarName)»«ENDIF»
-	'''
-
-	def dispatch fill(org.eclipse.papyrus.gmf.gmfgraph.Shape it, String figureVarName) '''
-	«IF !fill»«figureVarName».setFill(«fill»);
-	«ENDIF»
-	'''
-
-	def dispatch fill(Polygon it, String figureVarName) '''
-	«IF it.fill»«figureVarName».setFill(«it.fill»);
-	«ENDIF»
-	'''
-
-	def xorFill(org.eclipse.papyrus.gmf.gmfgraph.Shape it, String figureVarName) '''
-	«figureVarName».setFillXOR(«xorFill»);
-	'''
-
-	def outline(org.eclipse.papyrus.gmf.gmfgraph.Shape it, String figureVarName) '''
-	«figureVarName».setOutline(«outline»);
-	'''
-
-	def xorOutline(org.eclipse.papyrus.gmf.gmfgraph.Shape it, String figureVarName) '''
-	«figureVarName».setOutlineXOR(«xorOutline»);
-	'''
-
-	def lineWidth(org.eclipse.papyrus.gmf.gmfgraph.Shape it, String figureVarName) '''
-	«figureVarName».setLineWidth(«lineWidth»);
-	'''
-
-	def lineKind(org.eclipse.papyrus.gmf.gmfgraph.Shape it, String figureVarName) '''
-	«figureVarName».setLineStyle(org.eclipse.draw2d.Graphics.«lineKind»);
-	'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/top/Descriptor.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/top/Descriptor.xtend
deleted file mode 100644
index 202754fb5b6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/top/Descriptor.xtend
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph.top
-
-import com.google.inject.Inject
-import gmfgraph.Runtime
-import gmfgraph.Utils_Statefull_qvto
-import gmfgraph.Utils_qvto
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor
-import xpt.Common
import xpt.Common_qvto
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure
-
-@com.google.inject.Singleton class Descriptor {
-	@Inject extension Common;
-	@Inject extension Common_qvto;
-	@Inject extension Utils_qvto;
-	@Inject extension Utils_Statefull_qvto;
-
-	@Inject Runtime xptRuntime;
-	@Inject Figure xptFigure;
-
-	def Top(FigureDescriptor it, String packageStmt) '''
-		«IF !packageStmt.nullOrEmpty»package «packageStmt»;«ENDIF»
-		«generatedClassComment()»
-		public class «compilationUnitName(it)» extends «xptRuntime.fqn(actualFigure)» {
-		«body(it)»
-		«additionalStaticFields()»
-		}
-	'''
-
-	def Inner(FigureDescriptor it) '''
-		«generatedClassComment»
-		public class «compilationUnitName(it)» extends «xptRuntime.fqn(actualFigure)» {
-			«body(it)»
-		}
-		«additionalStaticFields()»
-	'''
-
-	def body(FigureDescriptor it) '''
-		
-		«FOR acc : accessors.filter[a|!allCustomAccessors(it).map[typedFigure].exists[f|f == a.figure]]»
-			«accessorField(acc)»
-		«ENDFOR»
-		
-		«FOR custom : filterCustom(newLinkedList(it.actualFigure))»
-			«IF needsField(custom)»«accessorCustomField(custom)»«ENDIF»
-		«ENDFOR»
-		
-		«xptFigure.ClassBody(it.actualFigure, compilationUnitName(it))»
-		
-		«FOR acc : accessors.filter[a|!allCustomAccessors(it).map[typedFigure].exists[f|f == a.figure]]»
-			«accessorToField(acc)»
-			«extraLineBreak»
-		«ENDFOR»
-		«FOR acc : accessors.filter[a|/*no ! here*/allCustomAccessors(it).map[typedFigure].exists[f|f == a.figure]]»
-			«accessorToCustom(acc, allCustomAccessors(it).filter[fa|fa.typedFigure == acc.figure])»
-		«ENDFOR»
-	'''
-
-	def accessorField(ChildAccess it) '''
-		«generatedMemberComment»
-		private «xptRuntime.fqn(it.figure)» «it.figureFieldName()»; 
-	'''
-
-	def accessorCustomField(CustomFigure it) '''
-		«generatedMemberComment»
-		private «xptRuntime.fqn(it)» «figureFieldName(it)»;
-	'''
-
-	/**
-	 * ChildAccess points to figure we've generated, here's a field for it
-	 */
-	def accessorToField(ChildAccess it) '''
-		«generatedMemberComment»
-		public «xptRuntime.fqn(figure)» «accessor»() {
-			return «it.figureFieldName()»;
-		}
-	'''
-
-	/**
-	 * ChildAccess points to some child of a CustomFigure, need to delegate to it's accessor.
-	 * Perhaps, should add support for ChildAccess not being generated (in case they are have same name as 
-	 * FigureAccessor.accessor
-	*/
-	def accessorToCustom(ChildAccess it, Iterable<FigureAccessor> fa) '''
-		«generatedMemberComment»
-		public «xptRuntime.fqn(it.figure)» «it.accessor»() {
-			«val chain = it.customFigureChainFigureAccess»
-			return «(chain.first.eContainer as CustomFigure).figureFieldName»
-				«FOR figureAccess : chain»
-					«IF figureAccess.accessor !=null && !figureAccess.accessor.empty».«figureAccess.accessor»()«ELSE»«ERROR('Invalide figure accessor ' + figureAccess.toString)»«ENDIF»
-				«ENDFOR»;
-		}
-	'''
-
-	def additionalStaticFields() '''
-		«IF !staticStream.empty»
-			«FOR str : staticStream»
-				«str»
-			«ENDFOR»
-		«ELSE»
-			«extraLineBreak»
-		«ENDIF»
-	'''
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/top/Figure.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/top/Figure.xtend
deleted file mode 100644
index 908435a14e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/gmfgraph/top/Figure.xtend
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package gmfgraph.top
-
-import com.google.inject.Inject
-import com.google.inject.Singleton
-import gmfgraph.Attrs
-import gmfgraph.Border
-import gmfgraph.Children
-import gmfgraph.Decoration
-import gmfgraph.Extras
-import gmfgraph.Layout
-import gmfgraph.Utils_Statefull_qvto
-import java.util.ArrayList
-import java.util.List
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure
-import xpt.Common
-import xpt.Common_qvto
import java.lang.reflect.Array
-import java.util.Arrays
-
-@Singleton class Figure {
-	@Inject extension Common_qvto;
-	@Inject extension Common;
-	@Inject extension Utils_Statefull_qvto;
-	
-	@Inject Layout xptLayout;
-	@Inject Attrs xptAttrs;
-	@Inject Children xptChildren;
-	@Inject Border xptBorder;
-	@Inject Extras xptExtras;
-	@Inject Decoration xptDecoration; 
-	
-	def dispatch ClassBody(org.eclipse.papyrus.gmf.gmfgraph.Figure it, String cuName) '''«ERROR('abstract ClassBody(Figure)')»'''
-
-	def dispatch ClassBody(FigureRef it, String cuName) '''«ClassBody(figure, cuName, it)»'''
-
-	def dispatch ClassBody(RealFigure it, String cuName) '''«ClassBody(it, cuName, null)»'''
-
-	def dispatch ClassBody(RealFigure it, String cuName, FigureRef figureRef) '''
-		«generatedMemberComment»
-		public «cuName»() {
-			«clearState()»
-			«xptLayout.Init(it.layout, 'this')»
-			«xptAttrs.Init(it, 'this')»
-		«IF figureRef != null»
-			// «figureRef.figure.name» 
-			// Process FigureRef details
-			«xptLayout.Init(figureRef.layout, 'this')»
-			«xptAttrs.Init(figureRef, 'this')»
-		«ENDIF»		
-		«IF !it.children.filter(typeof(org.eclipse.papyrus.gmf.gmfgraph.Figure)).empty»
-			createContents();
-		}
-		«xptChildren.CreateChildren(it)»
-		«ELSE»
-		}
-		«ENDIF»
-		«xptBorder.InitMethods(it)»
-		«extraLineBreak»
-		«xptExtras.extraMethods(it)»
-		«additions(it)»
-	'''
-	
-	def Iterable<org.eclipse.papyrus.gmf.gmfgraph.Figure> safeExcluding(List<org.eclipse.papyrus.gmf.gmfgraph.Figure> children, DecorationFigure... d)  {
-		return safeExcluding(children, Arrays.asList(d));
-	}	
-
-	def Iterable<org.eclipse.papyrus.gmf.gmfgraph.Figure> safeExcluding(List<org.eclipse.papyrus.gmf.gmfgraph.Figure> children, List<DecorationFigure> d)  {
-		children.filter[f| !d.contains(f)];
-	}
-
-	def dispatch ClassBody(PolylineConnection it, String cuName, FigureRef figureRef) '''
-		«val childrenWithoutDecorators = safeExcluding(it.children, sourceDecoration, targetDecoration)»
-		«generatedMemberComment»
-		public «cuName»() {
-			«clearState()»
-			«xptAttrs.Init(it, 'this')»
-			«extraLineBreak»
-			«IF !childrenWithoutDecorators.isEmpty()»
-					createContents();
-			«ENDIF»
-			«IF it.sourceDecoration != null»
-				setSourceDecoration(createSourceDecoration());
-			«ENDIF»
-			«IF it.targetDecoration != null»
-				setTargetDecoration(createTargetDecoration());
-			«ENDIF»
-		}
-	
-		«/*
-		  *	Copy of Children::CreateChildren with temp workaround to generate child figures for labels only.
-		  * 	Though this is workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=193180, I'm not sure
-	      * what's the right approach with e.g. decoration as child of a link.
-		  */
-		IF !childrenWithoutDecorators.isEmpty()»
-		«generatedMemberComment»
-		private void createContents(){
-			«FOR l : childrenWithoutDecorators»
-				«xptChildren.instantiate(l, 0, it, 'this')»
-			«ENDFOR»
-			«extraLineBreak»
-		}
-		«ENDIF»
-		«IF it.sourceDecoration != null»
-		«generatedMemberComment»
-		private org.eclipse.draw2d.RotatableDecoration createSourceDecoration() {
-			«xptDecoration.Instantiate(it.sourceDecoration, 'df')»
-			return df;
-		}
-		«ENDIF»
-		«IF it.targetDecoration != null»
-		«generatedMemberComment»
-		private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {
-			«xptDecoration.Instantiate(it.targetDecoration, 'df')»
-			return df;
-		}
-		«ENDIF»
-		«additions(it)»
-	'''
-
-	def additions(org.eclipse.papyrus.gmf.gmfgraph.Figure it) ''''''
-	
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
index 27b8ce26626..94ef82ec79c 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/LinkEditPart.xtend
@@ -14,11 +14,12 @@
  * Michael Golubev (Montages) - #386838 - migrate to Xtend2
  * Remi Schnekenburger (CEA LIST) - modification for Papyrus MDT
  * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : 1.4 Merge papyrus extension templates into codegen.xtend
+ * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to gmfgraph and ModelViewMap
  *****************************************************************************/
 package impl.diagram.editparts
 
 import com.google.inject.Inject
-import impl.diagram.editparts.viewmaps.modeledViewmapProducer
+import com.google.inject.Singleton
 import org.eclipse.papyrus.gmf.codegen.gmfgen.FigureViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkLabel
@@ -29,19 +30,16 @@ import org.eclipse.papyrus.gmf.codegen.gmfgen.SnippetViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap
 import xpt.Common
 import xpt.Common_qvto
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel
 
 /**
  * Revisit: [MG]: @Inject extension same-named-api-class -> template extends api-class?
  */
-@com.google.inject.Singleton class LinkEditPart {
+@Singleton class LinkEditPart {
 	@Inject extension Common;
 	@Inject extension Common_qvto;
 	
 	@Inject xpt.diagram.editparts.Common xptEditpartsCommon;
 	@Inject TextAware xptTextAware;
-	@Inject modeledViewmapProducer xptModeledViewmapProducer;
-	@Inject diagram.editparts.LinkLabelEditPart linkLabelEditPart;
 
 	def className(GenLink it) '''«editPartClassName»'''
 
@@ -91,13 +89,6 @@ import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel
 		«it.commonAddLabel(getterName,label)»
 	'''
 
-	def dispatch addLabel(ModeledViewmap it, GenLinkLabel label) '''
-		«var labelAccessor = (figureModel as DiagramLabel).accessor»
-		«IF labelAccessor != null && labelAccessor.accessor != null»
-			«it.commonAddLabel(labelAccessor.accessor,label)»
-		«ENDIF»
-	'''
-
 	def commonAddLabel(Viewmap it, String getterName, GenLinkLabel label) '''
 		if (childEditPart instanceof «label.getEditPartQualifiedClassName()») {
 			((«label.getEditPartQualifiedClassName()») childEditPart).«xptTextAware.labelSetterName(it)»(
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend
index f8164434a3c..56e720d271f 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/NodeEditPart.xtend
@@ -17,12 +17,12 @@
  * Vincent Lorenzo (CEA-LIST) - Bug 335987 [General][Enhancement] Show/Hide Connectors Labels and External Nodes Labels
  * Christian W. Damus - bug 451230
  * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : 1.4 Merge papyrus extension templates into codegen.xtend
+ * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to gmfgraph and ModelViewMap
  *****************************************************************************/
 package impl.diagram.editparts
 
 import com.google.inject.Inject
 import com.google.inject.Singleton
-import impl.diagram.editparts.viewmaps.modeledViewmapProducer
 import org.eclipse.papyrus.gmf.codegen.gmfgen.FigureViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildSideAffixedNode
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase
@@ -31,14 +31,12 @@ import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNavigatorChildReference
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenTopLevelNode
 import org.eclipse.papyrus.gmf.codegen.gmfgen.InnerClassViewmap
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ModeledViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.ParentAssignedViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.RefreshHook
 import org.eclipse.papyrus.gmf.codegen.gmfgen.SnippetViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.ToolEntry
 import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.ViewmapLayoutType
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment
 import utils.EditPartsUtils_qvto
 import xpt.CodeStyle
 import xpt.Common
@@ -60,7 +58,6 @@ import xpt.providers.ElementTypes
 	@Inject extension VisualIDRegistry
 	@Inject extension EditPartsUtils_qvto;
 	@Inject xpt.diagram.editparts.Common xptEditpartsCommon;
-	@Inject modeledViewmapProducer xptModeledViewmapProducer;
 	@Inject TextAware xptTextAware;
 	@Inject VisualIDRegistry xptVisualIDRegistry;
 	@Inject ElementTypes xptElementTypes;
@@ -292,20 +289,6 @@ import xpt.providers.ElementTypes
 		«ERROR('Unknown viewmap: ' + it + " for node: " + node)»
 	'''
 
-	def dispatch createNodeShape(ModeledViewmap it, GenNode node) '''
-		«generatedMemberComment»
-		protected org.eclipse.draw2d.IFigure createNodeShape() {
-			return primaryShape = new «modeledViewmapFigureFQN(it)»()«forceUseLocalCoordinatesAnonymousClassBody(node)»;
-		}
-		
-		«generatedMemberComment»
-		public «modeledViewmapFigureFQN(it)» getPrimaryShape() {
-			return («modeledViewmapFigureFQN(it)») primaryShape;
-		}
-'''
-
-	def modeledViewmapFigureFQN(ModeledViewmap it) '''«xptModeledViewmapProducer.viewmapFigureFQN(it)»'''
-
 	def dispatch createNodeShape(FigureViewmap it, GenNode node) {
 		var fqn = if (it.figureQualifiedClassName == null) 'org.eclipse.draw2d.RectangleFigure' else figureQualifiedClassName;
 		'''
@@ -401,11 +384,6 @@ import xpt.providers.ElementTypes
 			return true;
 		}
 	«ENDFOR»
-	«FOR label : getInnerFixedLabelsWithModeledViewmaps(it)»
-		if (childEditPart instanceof «xptEditPartFactory.getEditPartQualifiedClassName(label)») {
-			return true;
-		}
-	«ENDFOR»
 	«FOR compartment : getPinnedCompartments(it)»
 	«var childViewmap = compartment.viewmap as ParentAssignedViewmap»
 		if (childEditPart instanceof «xptEditPartFactory.getEditPartQualifiedClassName(compartment)») {
@@ -414,15 +392,6 @@ import xpt.providers.ElementTypes
 			return true;
 		}	
 	«ENDFOR»
-	«FOR compartment : getPinnedCompartmentsWithModeledViewmaps(it)»
-	«var childViewmap = compartment.viewmap as ModeledViewmap»
-	«var getterName = (childViewmap.figureModel as Compartment).accessor.accessor»
-		if (childEditPart instanceof «xptEditPartFactory.getEditPartQualifiedClassName(compartment)») {
-			org.eclipse.draw2d.IFigure pane = getPrimaryShape().«getterName»();
-			pane.remove(((«xptEditPartFactory.getEditPartQualifiedClassName(compartment)») childEditPart).getFigure());
-			return true;
-		}	
-	«ENDFOR»
 	«FOR child : getSideAffixedChildren(it)»
 		if (childEditPart instanceof «xptEditPartFactory.getEditPartQualifiedClassName(child)») {
 			getBorderedFigure().getBorderItemContainer().remove(((«xptEditPartFactory.getEditPartQualifiedClassName(child)») childEditPart).getFigure());
@@ -463,13 +432,6 @@ import xpt.providers.ElementTypes
 				return getPrimaryShape().«childViewmap.getterName»();
 			}	
 			«ENDFOR»
-			«FOR compartment : getPinnedCompartmentsWithModeledViewmaps(it)»
-			«var childViewmap = compartment.viewmap as ModeledViewmap»
-			«var getterName = (childViewmap.figureModel as Compartment).accessor.accessor»
-			if (editPart instanceof «xptEditPartFactory.getEditPartQualifiedClassName(compartment)») {
-				return getPrimaryShape().«getterName»();
-			}	
-		«ENDFOR»
 		«IF hasBorderItems(it)»
 			if (editPart instanceof org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart) {
 				return getBorderedFigure().getBorderItemContainer();
@@ -682,9 +644,6 @@ def setupNodePlate (GenNode it) ''''''
 
 	def dispatch innerClassDeclaration(InnerClassViewmap it) '''«classBody»'''
 
-	def dispatch innerClassDeclaration(ModeledViewmap it) '''
-		«xptModeledViewmapProducer.viewmapClassBody(it)»
-	'''
 
 	def getTargetEditPartMethod(GenNode it) '''
     «generatedMemberComment»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/RuntimeLabelsSupport_qvto.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/RuntimeLabelsSupport_qvto.xtend
deleted file mode 100644
index f1a72422c10..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/RuntimeLabelsSupport_qvto.xtend
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 - 2013 Montages AG
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Svyatoslav Kovalsky (Montages) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package impl.diagram.editparts
-
-import com.google.inject.Inject
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ModeledViewmap
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ParentAssignedViewmap
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel
-import xpt.Common_qvto
-import org.eclipse.papyrus.gmf.codegen.xtend.annotations.MetaDef
-
-@com.google.inject.Singleton class RuntimeLabelsSupport_qvto {
-	@Inject extension Common_qvto
-
-	def boolean isVerticalLabel(GenCommonBase commonBase) {
-		var Viewmap vm = commonBase.viewmap
-		switch (vm) {
-			ParentAssignedViewmap:
-				vm.figureQualifiedClassName == getVerticalLabelFQN()
-			ModeledViewmap:
-				vm.figureModel.oclIsKindOf(typeof(DiagramLabel)) &&
-					isVerticalDiagramLabel(vm.figureModel as DiagramLabel)
-			default:
-				false
-		}
-	}
-
-	def boolean isVerticalDiagramLabel(DiagramLabel figureModel) {
-		return figureModel.accessor != null && figureModel.accessor.figure.oclIsKindOf(typeof(VerticalLabel))
-	}
-
-	@MetaDef def String getSimpleLabelDelegateFQN() {
-		return getRuntimeLabelPackage() + "." + "SimpleLabelDelegate";
-	}
-
-	@MetaDef def String getVerticalLabelFQN() {
-		return getRuntimeLabelPackage() + "." + "VerticalLabel";
-	}
-
-	@MetaDef def String getVerticalLabelDelegateFQN() {
-		return getRuntimeLabelPackage() + "." + "VerticalLabelDelegate";
-	}
-
-	@MetaDef def String getVerticalLabelCellEditorLocatorFQN() {
-		return getRuntimeLabelPackage() + "." + "VerticalLabelCellEditorLocator";
-	}
-
-	@MetaDef def String getRuntimeLabelPackage() {
-		return "org.eclipse.gmf.tooling.runtime.draw2d.labels";
-	}
-
-	def boolean supportsVerticalLabels(GenDiagram diagram) {
-		return diagram.allNodes.exists[n|hasVerticalLabels(n)]
-	}
-
-	def boolean hasVerticalLabels(GenNode node) {
-		return isVerticalLabel(node) || node.labels.exists[label|isVerticalLabel(label)]
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend
index 8ca67601502..0ce625b1363 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/TextAware.xtend
@@ -13,6 +13,7 @@
  *  Alexander Shatalin (Borland) - initial API and implementation
  *  Michael Golubev (Montages) - #386838 - migrate to Xtend2
  *  Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : 1.4 Merge papyrus extension templates into codegen.xtend
+ *  Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to gmfgraph and ModelViewMap
  *****************************************************************************/
 package impl.diagram.editparts
 
@@ -34,8 +35,6 @@ import xpt.providers.ElementTypes
 	@Inject extension CodeStyle
 	@Inject extension ViewmapAttributesUtils_qvto
 	@Inject extension ChoiceUtils_qvto
-	@Inject extension RuntimeLabelsSupport_qvto
-
 	@Inject EditPartFactory xptEditPartFactory
 	@Inject ElementTypes xptElementTypes;
 
@@ -208,22 +207,6 @@ def labelSetterName(Viewmap it)'''setLabel'''
 	}
 '''
 
-	def getLabelDelegate(GenCommonBase it) '''
-		«generatedMemberComment()»
-		private org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate getLabelDelegate(){
-			if (labelDelegate == null){
-				org.eclipse.draw2d.IFigure label = getFigure();
-				if (label instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel){
-					labelDelegate = new org.eclipse.gmf.runtime.diagram.ui.label.WrappingLabelDelegate((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel)label);
-				} «IF isVerticalLabel(it)» else if (label instanceof «getVerticalLabelFQN()») {
-						labelDelegate = new «getVerticalLabelDelegateFQN()»((«getVerticalLabelFQN()»)label); 
-				} «ENDIF» else {
-					labelDelegate = new «getSimpleLabelDelegateFQN()»((org.eclipse.draw2d.Label)label);
-				}
-			}
-			return labelDelegate;
-		}
-	'''
 
 	def getAdapter(GenCommonBase it) '''
 		«generatedMemberComment()»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/viewmaps/BareFigure_qvto.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/viewmaps/BareFigure_qvto.xtend
deleted file mode 100644
index 8fc4194e550..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/viewmaps/BareFigure_qvto.xtend
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2011 Montages AG
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - #386838 - migrate to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package impl.diagram.editparts.viewmaps
-
-import com.google.inject.Inject
-import org.eclipse.emf.ecore.EStructuralFeature
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure
-import xpt.Common_qvto
-
-@com.google.inject.Singleton class BareFigure_qvto {
-	@Inject extension Common_qvto
-
-	def boolean isBareFigureDescriptor(FigureDescriptor descriptor) {
-		return descriptor.actualFigure.oclIsKindOf(typeof(RealFigure)) &&
-			isBareFigure(descriptor.actualFigure as RealFigure)
-	}
-
-	private def isDerivedOrAlwaysSet(EStructuralFeature f) {
-		f.derived || (f.EContainingClass.name == 'RealFigure' && f.name == 'name') ||
-			(f.EContainingClass.name == 'RealFigure' && f.name == 'children') ||
-			(f.EContainingClass.name == 'CustomClass' && f.name == 'qualifiedClassName') ||
-			(f.EContainingClass.name == 'CustomFigure' && f.name == 'customChildren')
-	}
-
-	def boolean isBareFigure(RealFigure figure) {
-		var featuresToCheck = figure.eClass.EAllStructuralFeatures.filter[f|!isDerivedOrAlwaysSet(f)];
-		figure.children.empty && featuresToCheck.forall[f|!figure.eIsSet(f)];
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/viewmaps/modeledViewmapProducer.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/viewmaps/modeledViewmapProducer.xtend
deleted file mode 100644
index ab2cb95a450..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/impl/diagram/editparts/viewmaps/modeledViewmapProducer.xtend
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2013 Montages AG
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Montages) - initial API and implementation, migration to Xtend2
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package impl.diagram.editparts.viewmaps
-
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ModeledViewmap
-import com.google.inject.Inject
-import xpt.Common_qvto
-import org.eclipse.emf.ecore.EObject
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel
-import org.eclipse.papyrus.gmf.gmfgraph.Node
-import org.eclipse.papyrus.gmf.gmfgraph.Connection
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement
-
-@com.google.inject.Singleton class modeledViewmapProducer {
-	@Inject extension Common_qvto
-	@Inject extension BareFigure_qvto
-	
-	@Inject gmfgraph.Runtime xptRuntime;
-	@Inject gmfgraph.top.Descriptor xptDescriptor;
-	
-	def viewmapFigureFQN(ModeledViewmap it) ''' 
-		«figureFQN(it.figureModel)»
-	'''
-
-	def dispatch figureFQN(EObject it) '''
-		«ERROR('Unknown figureModel: ' + it)»
-	'''
-
-	def dispatch figureFQN(DiagramLabel it)'''
-		«IF figure == null || figure.actualFigure == null»org.eclipse.draw2d.Label«
-		ELSEIF it.accessor == null»«/** FIXME: bare instances */»«xptRuntime.fqn(it.figure.actualFigure)»«
-		ELSE»«xptRuntime.fqn(it.accessor.figure)»«ENDIF»
-	'''
-
-	def dispatch figureFQN(Node it) '''«nodeOrLinkFQN(it)»'''
-
-	def dispatch figureFQN(Connection it) '''«nodeOrLinkFQN(it)»'''
-
-	def nodeOrLinkFQN (DiagramElement it) '''
-		«IF figure == null || figure.actualFigure == null»org.eclipse.draw2d.RoundedRectangle«
-		ELSEIF isBareFigureDescriptor(it.figure)»«xptRuntime.fqn(it.figure.actualFigure)»«
-		ELSE»«/** actual InnerClassViewmap case */»«it.figure.name.toFirstUpper»«ENDIF»
-	'''
-
-	def viewmapClassBody(ModeledViewmap it) '''«classBody(figureModel)»'''
-
-	def dispatch classBody(EObject it) '''«ERROR('Unknown figureModel: ' + it)»''' 
-
-	def dispatch classBody(DiagramElement it) '''
-	«IF figure == null || figure.actualFigure == null || isBareFigureDescriptor(figure)»«/* nothing to do */»«
-	ELSE»«/*actual InnerClassViewmap case*/»«xptDescriptor.Inner(it.figure)»«ENDIF»
-	'''
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/diagram/editparts/Common.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/diagram/editparts/Common.xtend
index c3d75b8d732..15b80d8699b 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/diagram/editparts/Common.xtend
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/diagram/editparts/Common.xtend
@@ -12,36 +12,31 @@
  * Michael Golubev (Montages) - #386838 - migrate to Xtend2
  * Patrick Tessier (CEA LIST)
  * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : 1.4 Merge papyrus extension templates into codegen.xtend
+ * Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand/qvto
  *****************************************************************************/
 package xpt.diagram.editparts
 
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase
 import com.google.inject.Inject
+import com.google.inject.Singleton
+import impl.diagram.editparts.TextAware
 import org.eclipse.papyrus.gmf.codegen.gmfgen.Behaviour
 import org.eclipse.papyrus.gmf.codegen.gmfgen.CustomBehaviour
-import xpt.Common_qvto
+import org.eclipse.papyrus.gmf.codegen.gmfgen.FigureViewmap
+import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase
+import org.eclipse.papyrus.gmf.codegen.gmfgen.GenContainerBase
+import org.eclipse.papyrus.gmf.codegen.gmfgen.InnerClassViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.OpenDiagramBehaviour
 import org.eclipse.papyrus.gmf.codegen.gmfgen.ParentAssignedViewmap
-import impl.diagram.editparts.TextAware
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ModeledViewmap
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel
-import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap
-import org.eclipse.papyrus.gmf.codegen.gmfgen.FigureViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.SnippetViewmap
-import org.eclipse.papyrus.gmf.codegen.gmfgen.InnerClassViewmap
-import impl.diagram.editparts.viewmaps.modeledViewmapProducer
-import org.eclipse.emf.ecore.EObject
-import org.eclipse.papyrus.gmf.gmfgraph.Label
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenContainerBase
+import org.eclipse.papyrus.gmf.codegen.gmfgen.Viewmap
+import xpt.Common_qvto
 import xpt.QualifiedClassNameProvider
 
-@com.google.inject.Singleton class Common {
+@Singleton class Common {
 	@Inject extension xpt.Common;
 	@Inject extension Common_qvto;
 	@Inject QualifiedClassNameProvider qualifiedClassNameProvider;
-	
 	@Inject TextAware xptTextAware;
-	@Inject modeledViewmapProducer xptModeledViewmapProducer;
 	
 	def visualIDConstant(GenCommonBase it) '''
 		«generatedMemberComment»
@@ -77,18 +72,6 @@ import xpt.QualifiedClassNameProvider
 		}
 	'''
 
-	def dispatch labelFigure(ModeledViewmap it) '''
-		«IF figureModel.oclIsKindOf(typeof(DiagramLabel)) && (figureModel as DiagramLabel).accessor != null»
-		«generatedMemberComment»
-		protected org.eclipse.draw2d.IFigure createFigure() {
-			// Parent should assign one using «xptTextAware.labelSetterName(it)»() method
-			return null;
-		}
-		«ELSE»
-			«labelFigureDelegateToPrim(it)»
-		«ENDIF»
-	'''
-
 	def dispatch labelFigure(Viewmap it) '''
 		«labelFigureDelegateToPrim(it)»
 	'''
@@ -127,23 +110,6 @@ import xpt.QualifiedClassNameProvider
 		«classBody»
 	'''
 
-	def dispatch labelFigurePrim(ModeledViewmap it) '''
-		return new «xptModeledViewmapProducer.viewmapFigureFQN(it)»(«labelTextDefaultValue(figureModel)»);
-		}
-	'''
-
-	def dispatch labelTextDefaultValue(EObject it) ''''''
-
-	def dispatch labelTextDefaultValue(DiagramLabel it) '''
-		«IF it.figure != null && it.figure.actualFigure.oclIsKindOf(typeof(Label)) && (it.figure.actualFigure as Label).text != null»
-			"«(it.figure.actualFigure as Label).text»"
-		«ENDIF»
-	'''
-
-	def dispatch labelFigurePrim(Viewmap it) '''
-		«ERROR('Unknown viewmap: ' + it)»
-	'''
-
 	def notationalListeners(GenCommonBase it) '''
 		«generatedMemberComment»
 		protected void addNotationalListeners() {
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/diagram/editparts/Utils_qvto.xtend b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/diagram/editparts/Utils_qvto.xtend
index 2e61c76970a..80273ea8267 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/diagram/editparts/Utils_qvto.xtend
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen.xtend/xtend/xpt/diagram/editparts/Utils_qvto.xtend
@@ -12,12 +12,16 @@
  *    Dmitry Stadnik (Borland) - initial API and implementation
  * 	  Michael Golubev (Montages) - #386838 - migrate to Xtend2
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to gmfgraph and ModelViewMap
  *****************************************************************************/
 package xpt.diagram.editparts;
 
 import com.google.inject.Inject
+import com.google.inject.Singleton
+import java.util.HashSet
+import java.util.List
+import java.util.Set
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenChildSideAffixedNode
-import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCommonBase
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenCompartment
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenDiagram
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenExternalNodeLabel
@@ -25,34 +29,13 @@ import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLabel
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLink
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenLinkEnd
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenNode
-import org.eclipse.papyrus.gmf.codegen.gmfgen.ModeledViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.ParentAssignedViewmap
 import org.eclipse.papyrus.gmf.codegen.gmfgen.ViewmapLayoutType
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel
-import xpt.Common_qvto
import java.util.List
-import java.util.Set
-import java.util.HashSet
 
-@com.google.inject.Singleton class Utils_qvto {
-	@Inject extension Common_qvto
+import xpt.Common_qvto
 
-	private def <T extends DiagramElement> modeledDiagramElement(GenCommonBase gc, Class<? extends T> clazz) {
-		val viewmap = gc.viewmap;
-		switch (viewmap) {
-			ModeledViewmap case viewmap.figureModel.oclIsKindOf(clazz): return viewmap.figureModel
-			default: return null
-		}
-	}
-
-	private def DiagramLabel modeledDiagramLabel(GenCommonBase gc) {
-		return modeledDiagramElement(gc, typeof(DiagramLabel)) as DiagramLabel
-	}
-
-	private def Compartment modeledCompartment(GenCommonBase gc) {
-		return modeledDiagramElement(gc, typeof(Compartment)) as Compartment
-	}
+@Singleton class Utils_qvto {
+	@Inject extension Common_qvto
 
 	def boolean isStoringChildPositions(GenNode node) {
 		node.getLayoutType() == ViewmapLayoutType::XY_LAYOUT
@@ -75,29 +58,14 @@ import java.util.HashSet
 		return innerLabels.filter[e|e.viewmap.oclIsKindOf(typeof(ParentAssignedViewmap))];
 	}
 
-	def Iterable<? extends GenLabel> getInnerFixedLabelsWithModeledViewmaps(GenNode node) {
-		val innerLabels = getInnerLabels(node);
-		return innerLabels.filter[e| //
-			modeledDiagramLabel(e) != null && //
-			modeledDiagramLabel(e).accessor != null];
-	}
-
 	def Iterable<GenCompartment> getPinnedCompartments(GenNode node) {
 		return node.compartments.filter[e|e.viewmap.oclIsKindOf(typeof(ParentAssignedViewmap))]
 	}
 
-	def Iterable<GenCompartment> getPinnedCompartmentsWithModeledViewmaps(GenNode node) {
-		return node.compartments.filter[c| //
-			modeledCompartment(c) != null && // 
-			modeledCompartment(c).accessor != null]
-	}
-
 	def boolean hasFixedChildren(GenNode node) {
 		return //
 		getInnerFixedLabels(node).size > 0 || // 
-		getPinnedCompartments(node).size > 0 || //
-		getInnerFixedLabelsWithModeledViewmaps(node).size > 0 || //
-			getPinnedCompartmentsWithModeledViewmaps(node).size > 0 //
+		getPinnedCompartments(node).size > 0
 		;
 	}
 
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.classpath
index 96d56d5faff..e801ebfb468 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.classpath
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.classpath
@@ -3,6 +3,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="templates.qvtlib"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f9fa809a1d5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Thu Mar 19 13:57:48 CET 2009
-eclipse.preferences.version=1
-encoding/templates=UTF-8
-encoding/templates-dynmodel=UTF-8
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.gmf.xpand.build.ignore-all-local-metamodels.txt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.gmf.xpand.build.ignore-all-local-metamodels.txt
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.gmf.xpand.build.ignore-all-local-metamodels.txt
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
deleted file mode 100644
index 9b9220f1678..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">
-  <mapping sourceURI="http://www.eclipse.org/papyrus/gmf/2020/GenModel" targetURI="platform:/plugin/org.eclipse.papyrus.gmf.codegen/models/gmfgen.ecore"/>
-  <mapping sourceURI="http://www.eclipse.org/gmf/runtime/1.0.2/notation" targetURI="platform:/resource/org.eclipse.gmf.runtime.notation/model/notation.ecore"/>
-  <mapping sourceURI="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition" targetURI="platform:/plugin/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore"/>
-</uriMap:MappingContainer>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.xpand-root b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.xpand-root
deleted file mode 100644
index 899557b94ae..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/.xpand-root
+++ /dev/null
@@ -1,3 +0,0 @@
-templates, templates.nativestubs, /org.eclipse.papyrus.gmf.graphdef.codegen/templates
-templates-dynmodel, templates, templates.nativestubs
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/META-INF/MANIFEST.MF
index 333fe2325e7..71a064386bc 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/META-INF/MANIFEST.MF
@@ -11,25 +11,20 @@ Export-Package: org.eclipse.papyrus.gmf.codegen.genextension,
  org.eclipse.papyrus.gmf.codegen.genextension.impl,
  org.eclipse.papyrus.gmf.codegen.genextension.util,
  org.eclipse.papyrus.gmf.codegen.gmfgen,
- org.eclipse.papyrus.gmf.codegen.gmfgen.impl;
-  x-friends:="org.eclipse.papyrus.gmf.codegen.lite",
+ org.eclipse.papyrus.gmf.codegen.gmfgen.impl,
  org.eclipse.papyrus.gmf.codegen.gmfgen.util,
  org.eclipse.papyrus.gmf.codegen.util,
- org.eclipse.papyrus.gmf.internal.codegen.util;
-  x-friends:="org.eclipse.papyrus.gmf.bridge.ui,
-   org.eclipse.papyrus.gmf.codegen.ui,
-   org.eclipse.gmf.tests,
-   org.eclipse.papyrus.gmf.bridge"
+ org.eclipse.papyrus.gmf.internal.codegen.util;x-friends:="org.eclipse.papyrus.gmf.codegen.ui"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.16.0,3.0.0)",
  org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.papyrus.gmf.common;bundle-version="[1.2.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.validate;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)"
+ org.eclipse.papyrus.gmf.common;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.papyrus.gmf.validate;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.ocl.ecore;bundle-version="[3.16.0,4.0.0)",
+ org.eclipse.ui.workbench;bundle-version="[3.0.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-BuddyPolicy: registered
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/build.properties
index 33a6a31ef42..73924f9a418 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/build.properties
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/build.properties
@@ -15,11 +15,9 @@ bin.includes = plugin.xml,\
                .,\
                models/,\
                about.html,\
-               templates-dynmodel/,\
                templates/
 jars.compile.order = .
 output.. = bin/
-source.. = src/,\
-           templates.qvtlib/
+source.. = src/
 bin.excludes = models/gmfgen.emf
 src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/plugin.xml
index f678203616c..2528ceab101 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/plugin.xml
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/plugin.xml
@@ -136,49 +136,4 @@
      </content-type>
   </extension>
 
-  <extension point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
-     <unit name="GenModelUtils" namespace="gmf">
-       <library class="org.eclipse.papyrus.gmf.internal.codegen.util.GenModelUtils">
-             <metamodel nsURI="http://www.eclipse.org/emf/2002/GenModel"/>
-             <metamodel nsURI="http://www.eclipse.org/emf/2002/Ecore"/>
-       </library>
-    </unit>
-    <unit name="EMFUtils" namespace="gmf">
-       <library class="org.eclipse.papyrus.gmf.internal.codegen.util.EMFUtils">
-             <metamodel nsURI="http://www.eclipse.org/emf/2002/Ecore"/>
-       </library>
-    </unit>
-    <unit name="CodeGenerationUtils" namespace="gmf">
-       <library class="org.eclipse.papyrus.gmf.internal.codegen.util.CodeGenerationUtils"/>
-    </unit>
-    <unit
-          description="GMF utulities to access EMF GenModels"
-          name="GenModelAccess"
-          namespace="gmf">
-       <library
-             class="org.eclipse.papyrus.gmf.internal.codegen.util.GenModelAccessHelpers">
-          <metamodel nsURI="http://www.eclipse.org/emf/2002/Ecore"/>
-          <metamodel nsURI="http://www.eclipse.org/emf/2002/GenModel"/>
-       </library>
-    </unit>
-    <unit
-          description="Access to GMF Xpand templates through QVTO"
-          name="XpandFacade"
-          namespace="xpt">
-       <library class="org.eclipse.papyrus.gmf.internal.codegen.util.XpandFacadeAccess"/>
-    </unit>
-    <unit
-          name="GenPackageUtils"
-          namespace="gmf">
-       <library
-             class="org.eclipse.papyrus.gmf.internal.codegen.util.GenPackageUtils">
-          <metamodel
-                nsURI="http://www.eclipse.org/emf/2002/GenModel">
-          </metamodel>
-          <metamodel
-                nsURI="http://www.eclipse.org/emf/2002/Ecore">
-          </metamodel>
-       </library>
-    </unit>
-  </extension>
 </plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/gmfgen/impl/GenVisualEffectImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/gmfgen/impl/GenVisualEffectImpl.java
index 5966faa90cf..2f5399c6d41 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/gmfgen/impl/GenVisualEffectImpl.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/gmfgen/impl/GenVisualEffectImpl.java
@@ -27,11 +27,9 @@ import org.eclipse.emf.ecore.EcorePackage;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.ocl.ecore.OCL;
 import org.eclipse.ocl.helper.OCLHelper;
-import org.eclipse.ocl.types.TypeType;
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GMFGenPackage;
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenVisualEffect;
 import org.eclipse.papyrus.gmf.internal.common.codegen.Conversions;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/util/CodegenEmitters.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/util/CodegenEmitters.java
index 6a52d008742..5e1b9644d55 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/util/CodegenEmitters.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/util/CodegenEmitters.java
@@ -12,80 +12,24 @@
  *    Artem Tikhomirov (Borland) - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
  *    Etienne ALLOGO (ARTAL) - etienne.allogo@artal.fr - Bug 569174 - Use project or worksapce preference as new line characters
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand/qvto
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.codegen.util;
 
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Map;
 
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.URI;
 import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
 import org.eclipse.papyrus.gmf.internal.common.codegen.JavaClassEmitter;
 import org.eclipse.papyrus.gmf.internal.common.codegen.TextEmitter;
-import org.eclipse.papyrus.gmf.internal.common.codegen.XpandClassEmitter;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-import org.eclipse.papyrus.gmf.internal.xpand.util.BundleResourceManager;
-import org.osgi.framework.Bundle;
 
 /**
  * @author artem
  */
-public class CodegenEmitters {
+public abstract class CodegenEmitters {
 
 	protected static final String PATH_SEPARATOR = "::"; //$NON-NLS-1$
-
-	private final ResourceManager myResourceManager;
-
-	private final URL[] myLocations;
-
-	private Map<String, Object> myGlobals;
-
-	public CodegenEmitters(boolean useBaseTemplatesOnly, String templateDirectory, boolean includeDynamicModelTemplates) {
-		ArrayList<URL> urls = new ArrayList<URL>(5);
-		if (!useBaseTemplatesOnly) {
-			urls.add(getDynamicTemplatesURL(templateDirectory));
-		}
-		if (includeDynamicModelTemplates) {
-			urls.add(getTemplatesBundle().getEntry("/templates-dynmodel/")); //$NON-NLS-1$
-		}
-		urls.add(getTemplatesBundle().getEntry("/templates/")); //$NON-NLS-1$
-
-		urls.add(Platform.getBundle("org.eclipse.papyrus.gmf.graphdef.codegen").getEntry("/templates/")); //$NON-NLS-1$ //$NON-NLS-2$
-
-		myLocations = urls.toArray(new URL[urls.size()]);
-		myResourceManager = new BundleResourceManager(myLocations);
-	}
-
-	/* package */void setGlobals(Map<String, Object> globals) {
-		myGlobals = globals;
-	}
-
-
-	private static Bundle getTemplatesBundle() {
-		return Platform.getBundle("org.eclipse.papyrus.gmf.codegen"); //$NON-NLS-1$
-	}
-
-	private static URL getDynamicTemplatesURL(String templateDirectory) {
-		if (templateDirectory != null) {
-			URI templatesURI = templateDirectory.indexOf(":") == -1 ? URI.createPlatformResourceURI(templateDirectory, true) : URI.createURI(templateDirectory); //$NON-NLS-1$
-			try {
-				return new URL(templatesURI.toString());
-			} catch (MalformedURLException e) {
-				Platform.getLog(getTemplatesBundle()).log(new Status(IStatus.ERROR, getTemplatesBundle().getSymbolicName(), 0, "Incorrecct dynamic templates location", e)); //$NON-NLS-1$
-			}
-		}
-		return null;
-	}
-
-	public URL getJMergeControlFile() {
-		return getTemplatesBundle().getEntry("/templates/emf-merge.xml"); //$NON-NLS-1$
-	}
-
+	
+	public abstract URL getJMergeControlFile();
 	// commands
 
 	public JavaClassEmitter getCreateNodeCommandEmitter() throws UnexpectedBehaviourException {
@@ -206,9 +150,7 @@ public class CodegenEmitters {
 		return createJavaClassEmitter("xpt::diagram::editpolicies::TextFeedback", "TextSelectionEditPolicy"); //$NON-NLS-1$
 	}
 
-	public JavaClassEmitter getTextNonResizableEditPolicyEmitter() throws UnexpectedBehaviourException {
-		return createJavaClassEmitter("xpt::diagram::editpolicies::TextFeedback", "TextNonResizableEditPolicy"); //$NON-NLS-1$
-	}
+	public abstract JavaClassEmitter getTextNonResizableEditPolicyEmitter() throws UnexpectedBehaviourException;
 
 	public JavaClassEmitter getVisualEffectEditPolicyEmitter() {
 		return createPrimaryJavaClassEmitter("xpt::diagram::editpolicies::VisualEffectEditPolicy"); //$NON-NLS-1$
@@ -542,9 +484,7 @@ public class CodegenEmitters {
 
 	// util
 
-	protected JavaClassEmitter createJavaClassEmitter(String templateName, String mainMethod) {
-		return new XpandClassEmitter(myResourceManager, templateName, mainMethod, myGlobals);
-	}
+	protected abstract JavaClassEmitter createJavaClassEmitter(String templateName, String mainMethod);
 
 	public TextEmitter getQualifiedClassNameEmitterForPrimaryTemplate(String templateFQN) {
 		return createJavaClassEmitter(getTemplateFQNWithoutLastSegment(templateFQN), "qualifiedClassName");
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/util/Generator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/util/Generator.java
index 0a07fbac3d3..1e36bd61375 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/util/Generator.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/src/org/eclipse/papyrus/gmf/codegen/util/Generator.java
@@ -12,6 +12,7 @@
  *    Artem Tikhomirov (Borland) - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
  *    Etienne ALLOGO (ARTAL) - etienne.allogo@artal.fr - Bug 569174 - Use project or worksapce preference as new line characters
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand/qvto
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.codegen.util;
 
@@ -107,27 +108,16 @@ import org.eclipse.papyrus.gmf.internal.common.codegen.TextMerger;
  * 
  * @author artem
  */
-public class Generator extends GeneratorBase implements Runnable {
+public abstract class Generator extends GeneratorBase implements Runnable {
 
 	private final GenEditorGenerator myEditorGen;
 
 	private final GenDiagram myDiagram;
 
-	private final CodegenEmitters myEmitters;
+	protected final CodegenEmitters myEmitters;
 
 	private final BinaryEmitters myBinaryEmmiters;
 
-	public Generator(GenEditorGenerator genModel, CodegenEmitters emitters) {
-		this(genModel, emitters, new BinaryEmitters());
-	}
-
-	public Generator(GenEditorGenerator genModel, CodegenEmitters emitters, CodeFormatterFactory codeFormatterFactory) {
-		this(genModel, emitters, new BinaryEmitters(), codeFormatterFactory);
-	}
-
-	public Generator(GenEditorGenerator genModel, CodegenEmitters emitters, BinaryEmitters binaryEmitters) {
-		this(genModel, emitters, binaryEmitters, CodeFormatterFactory.DEFAULT);
-	}
 
 	public Generator(GenEditorGenerator genModel, CodegenEmitters emitters, BinaryEmitters binaryEmitters, CodeFormatterFactory codeFormatterFactory) {
 		super(codeFormatterFactory);
@@ -158,11 +148,6 @@ public class Generator extends GeneratorBase implements Runnable {
 		final Path pluginDirectory = new Path(myEditorGen.getPluginDirectory());
 		initializeEditorProject(pluginDirectory, guessProjectLocation(pluginDirectory.segment(0)), Collections.<IProject> emptyList());
 
-		if (myEditorGen.getModelAccess() != null) {
-			myEmitters.setGlobals(Collections.<String, Object> singletonMap("DynamicModelAccess", myEditorGen.getModelAccess()));
-			generateModelAccessFacility();
-		}
-
 		// draft for messages
 		generateExternalizationSupport();
 
@@ -917,10 +902,6 @@ public class Generator extends GeneratorBase implements Runnable {
 		}
 	}
 
-	private void generateModelAccessFacility() throws UnexpectedBehaviourException, InterruptedException {
-		doGenerateJavaClass(myEmitters.getModelAccessFacilityEmitter(), myEditorGen.getModelAccess().getQualifiedClassName(), myEditorGen.getModelAccess());
-	}
-
 	private void generateShortcutIcon() throws UnexpectedBehaviourException, InterruptedException {
 		doGenerateBinaryFile(myBinaryEmmiters.getShortcutImageEmitter(), new Path("icons/shortcut.gif"), null); //$NON-NLS-1$
 	}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/Facility.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/Facility.qvto
deleted file mode 100644
index 39ad8ecdfc1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/Facility.qvto
+++ /dev/null
@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.GlobalVarOperations;
-
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library Facility;
-
-helper getNameToken(gp : genmodel::GenPackage) : String {
-	return gp.prefix
-}
-
-helper fieldName(gp : genmodel::GenPackage) : String {
-	return 'instance' + getNameToken(gp)
-}
-
-helper getDMA() : gmfgen::DynamicModelAccess {
-	return xpandGetObjectGlobalVar('DynamicModelAccess').oclAsType(gmfgen::DynamicModelAccess)
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/Facility.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/Facility.xpt
deleted file mode 100644
index 18952ba1491..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/Facility.xpt
+++ /dev/null
@@ -1,159 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION Facility»
-
-«DEFINE Main FOR gmfgen::DynamicModelAccess-»
-package «packageName»;
-
-public class «className» {
-
-	«EXPAND field(self) FOREACH editorGen.getAllDomainGenPackages(false)-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EPackage ePackage;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «className»(org.eclipse.emf.ecore.EPackage ePackage) {
-		this.ePackage = ePackage;
-	}
-
-	«EXPAND getMethod(self) FOREACH editorGen.getAllDomainGenPackages(false)-»
-
-	«EXPAND getRegistryMethod»
-
-	«EXPAND xpt::Common::generatedMemberComment»«REM»NOTE, when metaClassName is 'EObject', isSuperTypeOf is unlikely (see bug #255469) ever to return true (it lookes into metamodel, and unless obj's EClass has explicit EObject in its superclasses, the method simply returns false). But unless it's requested, I don't want to complicate this piece of code«ENDREM»
-	public boolean isInstance(Object obj, String metaClassName) {
-		org.eclipse.emf.ecore.EClass metaClass = getEClass(metaClassName);
-		return obj instanceof org.eclipse.emf.ecore.EObject && metaClass.isSuperTypeOf(((org.eclipse.emf.ecore.EObject) obj).eClass());
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EObject newInstance(String metaClassName) {
-		return this.ePackage.getEFactoryInstance().create(getEClass(metaClassName));
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EClass getEClass(String metaClassName) {
-		«EXPAND xpt::Common::_assert('metaClassName != null')-»
-		org.eclipse.emf.ecore.EClass metaClass = findMetaClass(metaClassName);
-		assertMetaClass(metaClass, metaClassName);
-		return metaClass;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EStructuralFeature getEFeature(String metaClassName, String metaFeatureName) {
-		«EXPAND xpt::Common::_assert('metaFeatureName != null')-»
-		org.eclipse.emf.ecore.EClass metaClass = getEClass(metaClassName);
-		org.eclipse.emf.ecore.EStructuralFeature f = metaClass.getEStructuralFeature(metaFeatureName);
-		assertMetaFeature(f, metaClass, metaFeatureName);
-		return f;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EAttribute getEAttribute(String metaClassName, String metaFeatureName) {
-		return (org.eclipse.emf.ecore.EAttribute) getEFeature(metaClassName, metaFeatureName);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EReference getEReference(String metaClassName, String metaFeatureName) {
-		return (org.eclipse.emf.ecore.EReference) getEFeature(metaClassName, metaFeatureName);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EDataType getEDataType(String metaClassName) {
-		«EXPAND xpt::Common::_assert('metaClassName != null')-»
-		org.eclipse.emf.ecore.EClassifier c = this.ePackage.getEClassifier(metaClassName);
-		if (false == c instanceof org.eclipse.emf.ecore.EDataType) {
-			return null;
-		}
-		return (org.eclipse.emf.ecore.EDataType) c;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EEnum getEEnum(String metaClassName) {
-		«EXPAND xpt::Common::_assert('metaClassName != null')-»
-		org.eclipse.emf.ecore.EClassifier c = this.ePackage.getEClassifier(metaClassName);
-		if (false == c instanceof org.eclipse.emf.ecore.EEnum) {
-			return null;
-		}
-		return (org.eclipse.emf.ecore.EEnum) c;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.emf.ecore.EClass findMetaClass(String name) {
-		org.eclipse.emf.ecore.EClassifier c = this.ePackage.getEClassifier(name);
-		if (false == c instanceof org.eclipse.emf.ecore.EClass) {
-			return null;
-		}
-		return (org.eclipse.emf.ecore.EClass) c;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment('Default implementation throws IllegalStateException if metaclass is null')»
-	private void assertMetaClass(org.eclipse.emf.ecore.EClass metaClass, String metaClassName) {
-		if (metaClass == null) {
-			throw new IllegalStateException(java.text.MessageFormat.format("Can't find class {0} in the package {1}", new Object[] {metaClassName, this.ePackage.getName()}));
-		}
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment('Default implementation throws IllegalStateException if meta-feature is null')»
-	private void assertMetaFeature(org.eclipse.emf.ecore.EStructuralFeature metaFeature, org.eclipse.emf.ecore.EClass metaClass, String featureName) {
-		if (metaFeature == null) {
-			throw new IllegalStateException(java.text.MessageFormat.format("Can't find feature {0} of class {1} in the package {2}", new Object[] {featureName, metaClass.getName(), this.ePackage.getName()}));
-		}
-	}
-
-	«EXPAND initMethod FOREACH editorGen.getAllDomainGenPackages(false)-»
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::DynamicModelAccess»«ENDDEFINE»
-
-«DEFINE field(dma : gmfgen::DynamicModelAccess) FOR genmodel::GenPackage-»
-«EXPAND xpt::Common::generatedMemberComment»
-private static «dma.className» «fieldName(self)»;
-«ENDDEFINE»
-
-«DEFINE getMethod(dma : gmfgen::DynamicModelAccess) FOR genmodel::GenPackage-»
-	«EXPAND xpt::Common::generatedMemberComment('@throws IllegalStateException if no EPackage with given URI is registered.')»
-	public static «dma.className» get«getNameToken(self)»() {
-		if («fieldName(self)» == null) {
-			org.eclipse.emf.ecore.EPackage pkg = getRegistry().getEPackage("«ecorePackage.nsURI»");
-			if (pkg == null) {
-				throw new IllegalStateException("Package «ecorePackage.name»(«ecorePackage.nsURI») not found");
-			}
-			«fieldName(self)» = new «dma.className»(pkg);
-			«fieldName(self)».init«getNameToken(self)»();
-		}
-		return «fieldName(self)»;
-	}
-«ENDDEFINE»
-
-«DEFINE initMethod FOR genmodel::GenPackage-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private void init«getNameToken(self)»() {
-	}
-«ENDDEFINE»
-
-«DEFINE getRegistryMethod FOR gmfgen::DynamicModelAccess»
-	«EXPAND xpt::Common::generatedMemberComment('Default implementation returns global registry, clients that need another may redefine.')»
-	private static org.eclipse.emf.ecore.EPackage.Registry getRegistry() {
-		return org.eclipse.emf.ecore.EPackage.Registry.INSTANCE;
-	}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/MetaModel.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/MetaModel.xpt
deleted file mode 100644
index e80778d6928..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates-dynmodel/MetaModel.xpt
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION Facility»
-«EXTENSION xpt::GenModelUtils»
-«EXTENSION gmf::GenModelUtils»
-
-// XXX is isExternalInterface use valid here, won't all objects be just EObject?
-
-«DEFINE IsInstance(accessor : String) FOR genmodel::GenClass-»
-«getDMA().getQualifiedClassName()».get«getNameToken(genPackage)»().isInstance(«accessor», "«ecoreClass.name»")«ENDDEFINE»
-
-«DEFINE NotInstance(accessor : String) FOR genmodel::GenClass»!«EXPAND IsInstance(accessor)»«ENDDEFINE»
-
-«DEFINE IsContainerInstance(_object : String, metaClass : genmodel::GenClass) FOR genmodel::GenClass-»
-«getDMA().getQualifiedClassName()».get«getNameToken(genPackage)»().isInstance(«IF isExternalInterface(self)»((org.eclipse.emf.ecore.EObject) «_object»)«ELSE»«_object»«ENDIF».eContainer(), "«ecoreClass.name»")«ENDDEFINE»
-
-«DEFINE getFeatureValue(containerVar : String, containerClass : genmodel::GenClass) FOR genmodel::GenFeature-»
-((«EXPAND featureTargetType») «IF isExternalInterface(containerClass)-»
-((org.eclipse.emf.ecore.EObject) «containerVar»)«ELSE-»
-«containerVar»«ENDIF-»
-.eGet(«EXPAND MetaFeature»))«ENDDEFINE»
-
-«DEFINE featureTargetType FOR genmodel::GenFeature-»
-«EXPAND _featureTargetType(self) FOR ecoreFeature-»
-«ENDDEFINE»
-
-«DEFINE _featureTargetType(gf : genmodel::GenFeature) FOR ecore::EStructuralFeature»NO-OP«ENDDEFINE»
-«DEFINE _featureTargetType(gf : genmodel::GenFeature) FOR ecore::EReference-»
-«IF isListType(gf)»java.util.List«ELSE»org.eclipse.emf.ecore.EObject«ENDIF-»
-«ENDDEFINE»
-«DEFINE _featureTargetType(gf : genmodel::GenFeature) FOR ecore::EAttribute-»
-«IF isListType(gf)»java.util.List«ELSE»«getObjectCompatibleClassName(eAttributeType)»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getFeatureValue(containerVar : String, container : genmodel::GenClass, needsCastToResultType : Boolean) FOR genmodel::GenFeature-»
-// ??? FIXME
-«ENDDEFINE»
-
-«DEFINE setFeatureValue(containerVar : String, containerClass : genmodel::GenClass, valueVar : String) FOR genmodel::GenFeature-»
-«IF isExternalInterface(containerClass)-»
-((org.eclipse.emf.ecore.EObject) «containerVar»)«ELSE-»
-«containerVar»«ENDIF-»
-.eSet(«EXPAND MetaFeature», «valueVar»)«ENDDEFINE»
-
-«DEFINE setFeatureValue(containerVar : String, containerClass : genmodel::GenClass, valueVar : String, isPlainObjectValue : Boolean) FOR genmodel::GenFeature-»
-«EXPAND setFeatureValue(containerVar, containerClass, valueVar)»«ENDDEFINE»
-
-«DEFINE MetaClass FOR genmodel::GenDataType»«getDMA().getQualifiedClassName()».get«getNameToken(genPackage)»().getEDataType("«ecoreDataType.name»")«ENDDEFINE»
-«DEFINE MetaClass FOR genmodel::GenEnum»«getDMA().getQualifiedClassName()».get«getNameToken(genPackage)»().getEEnum("«ecoreEnum.name»")«ENDDEFINE»
-«DEFINE MetaClass FOR genmodel::GenClass»«getDMA().getQualifiedClassName()».get«getNameToken(genPackage)»().getEClass("«ecoreClass.name»")«ENDDEFINE»
-
-«DEFINE MetaFeature FOR genmodel::GenFeature»«EXPAND _metaFeature(ecoreFeature)»«ENDDEFINE»
-
-«DEFINE _metaFeature(f : ecore::EStructuralFeature) FOR genmodel::GenFeature»no-op«ENDDEFINE»
-«DEFINE _metaFeature(eRef : ecore::EReference) FOR genmodel::GenFeature»«getDMA().getQualifiedClassName()».get«getNameToken(genClass.genPackage)»().getEReference("«genClass.ecoreClass.name»", "«ecoreFeature.name»")«ENDDEFINE»
-«DEFINE _metaFeature(eAttr : ecore::EAttribute) FOR genmodel::GenFeature»«getDMA().getQualifiedClassName()».get«getNameToken(genClass.genPackage)»().getEAttribute("«genClass.ecoreClass.name»", "«ecoreFeature.name»")«ENDDEFINE»
-
-«DEFINE NewInstance FOR genmodel::GenClass-»
-«getDMA().getQualifiedClassName()».get«getNameToken(genPackage)»().newInstance("«ecoreClass.name»")«ENDDEFINE»
-
-«DEFINE NewInstance(varName : String) FOR genmodel::GenClass-»
-org.eclipse.emf.ecore.EObject «varName» = «EXPAND NewInstance»;«ENDDEFINE»
-
-«DEFINE DowncastToEObject(value : String) FOR genmodel::GenClass»«IF isExternalInterface(self)»(org.eclipse.emf.ecore.EObject) «ENDIF»«value»«ENDDEFINE»
-
-«DEFINE DeclareAndAssign(assignee : String, value : String) FOR genmodel::GenClass-»
-org.eclipse.emf.ecore.EObject «assignee» = «value»;«ENDDEFINE»
-
-«DEFINE DeclareAndAssign(assignee : String, value : String, isPlainObjectValue : Boolean) FOR genmodel::GenClass-»
-org.eclipse.emf.ecore.EObject «assignee» = «IF isPlainObjectValue»(org.eclipse.emf.ecore.EObject)«ENDIF»«value»;«ENDDEFINE»
-
-«DEFINE DeclareAndAssign(assignee : String, value : String, isPlainObjectValue : Boolean) FOR genmodel::GenClassifier»NO-OP«ENDDEFINE»
-
-«DEFINE DeclareAndAssign(assignee : String, value : String, isPlainObjectValue : Boolean) FOR genmodel::GenDataType-»
-«EXPAND QualifiedClassName» «assignee» = («EXPAND QualifiedClassName») «value»;«ENDDEFINE»
-
-
-«DEFINE DeclareAndAssignContainer(assignee : String, _object : String, metaClass : genmodel::GenClass) FOR genmodel::GenClass-»
-org.eclipse.emf.ecore.EObject «assignee» = «IF isExternalInterface(metaClass)»((org.eclipse.emf.ecore.EObject) «_object»)«ELSE»«_object»«ENDIF».eContainer();«ENDDEFINE»
-
-// FIXME - feature value is not necessarily of EObject type
-«DEFINE DeclareAndAssign(assignee : String, src : String, srcMetaClass : genmodel::GenClass, srcFeature : genmodel::GenFeature) FOR genmodel::GenClass-»
-org.eclipse.emf.ecore.EObject «assignee» = «EXPAND getFeatureValue(src, srcMetaClass) FOR srcFeature»;«ENDDEFINE»
-
-«DEFINE DeclareAndAssign2(assignee : String, src : String, srcMetaClass : genmodel::GenClass, srcFeature : genmodel::GenFeature, srcExt : String, needCast : Boolean) FOR genmodel::GenClass-»
-org.eclipse.emf.ecore.EObject «assignee» = «EXPAND getFeatureValue(src, srcMetaClass) FOR srcFeature».«srcExt»;«ENDDEFINE»
-
-«DEFINE CastEObject(eObjectValue : String) FOR genmodel::GenClass»«eObjectValue»«ENDDEFINE»
-
-«DEFINE QualifiedClassName FOR genmodel::GenClassifier»NO-OP«ENDDEFINE»
-«DEFINE QualifiedClassName FOR genmodel::GenClass»org.eclipse.emf.ecore.EObject«ENDDEFINE»
-«DEFINE QualifiedClassName FOR genmodel::GenEnum»org.eclipse.emf.common.util.Enumerator«ENDDEFINE»
-«DEFINE QualifiedClassName FOR genmodel::GenDataType»«getObjectCompatibleClassName(ecoreDataType)»«ENDDEFINE»
-
-«DEFINE PopulateItemProviderFactories(factoryListVar : String) FOR gmfgen::GenEditorGenerator-»
-«REM»
-	NO-OP since ReflectiveItemProviderAdapterFactory should
-	get added anyway.
-«ENDREM»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/CodeGenerationUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/CodeGenerationUtils.qvto
deleted file mode 100644
index df1475b92f3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/CodeGenerationUtils.qvto
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-library CodeGenerationUtils;
-
-/*
- * This file contains a set of qvto queries duplicating corresponding queries 
- * from same native library and can be important to compile corresponding 
- * templates in a workspace. 
- *
- * This file should NOT be deployed to final .jar - original native library 
- * implementation (registered via plugin.xml) should be used on execution time.
- */
-
-helper toStringLiteral(stringValue : String) : String {
-	return null;
-}
-
-helper escapeXML(stringValue : String) : String {
-	return null;
-}
-
-helper safeName(stringValue : String) : String {
-	return null;
-}
-
-helper validJavaIdentifier(stringValue : String) : String {
-	return null;
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/EMFUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/EMFUtils.qvto
deleted file mode 100644
index a93627e03ae..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/EMFUtils.qvto
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-library EMFUtils;
-
-/*
- * This file contains a set of qvto queries duplicating corresponding queries 
- * from same native library and can be important to compile corresponding 
- * templates in a workspace. 
- *
- * This file should NOT be deployed to final .jar - original native library 
- * implementation (registered via plugin.xml) should be used on execution time.
- */
-
-helper getReferencingObjects(target : ecore::EObject) : Sequence(ecore::EObject) {
-	return null;
-}
-
-query EObject::uriFragment() : String {
-	return null;
-}
-
-query EObject::uri() : String {
-	return null;
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenModelAccess.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenModelAccess.qvto
deleted file mode 100644
index cd5fbe9a842..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenModelAccess.qvto
+++ /dev/null
@@ -1,30 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-
-library GenModelAccess;
-
--- similar to loadGenModel('http://www.eclipse.org/emf/2002/Ecore')
-helper loadEcoreGenModel() : GenModel { return null; }
-helper loadEcoreGenModel(EObject ctx) : GenModel { return null; }
-
--- similar to loadGenModel('http://www.eclipse.org/gmf/runtime/1.0.2/notation')
-helper loadNotationGenModel() : GenModel { return null; }
-helper loadNotationGenModel(EObject ctx) : GenModel { return null; }
-
--- nsURI - identifies ECore model you need GenModel for.
-helper loadGenModel(String nsURI) : GenModel { return null; }
-helper loadGenModel(String nsURI, EObject ctx) : GenModel { return null; }
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenModelUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenModelUtils.qvto
deleted file mode 100644
index 7b73852aa3f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenModelUtils.qvto
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-modeltype genModel uses "http://www.eclipse.org/emf/2002/GenModel";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-library GenModelUtils;
-
-/*
- * This file contains a set of qvto queries duplicating corresponding queries 
- * from same native library and can be important to compile corresponding 
- * templates in a workspace. 
- *
- * This file should NOT be deployed to final .jar - original native library 
- * implementation (registered via plugin.xml) should be used on execution time.
- */
-
-helper getDocumentRoot(genPackage : genmodel::GenPackage) : genmodel::GenClass {
-	return null;
-}
-
-helper findGenClassifier(genModel : genmodel::GenModel, eClassifier : ecore::EClassifier) : genmodel::GenClassifier {
-	return null;
-}
-
-helper isListType(genFeature : genmodel::GenFeature) : Boolean {
-	return null;
-}
-
-helper isDerived(genFeature : genmodel::GenFeature) : Boolean {
-	return null;
-}
-
-helper getTypeGenClassX(genFeature : genmodel::GenFeature) : genmodel::GenClass {
-	return null;
-}
-
-helper getGetAccessor(genFeature : genmodel::GenFeature) : String {
-	return null;
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenPackageUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenPackageUtils.qvto
deleted file mode 100644
index 2494496c488..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.nativestubs/gmf/GenPackageUtils.qvto
+++ /dev/null
@@ -1,31 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2012, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Andres Alvarez Mattos (Eclipse) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-modeltype genModel uses "http://www.eclipse.org/emf/2002/GenModel";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-library GenPackageUtils;
-
-helper getGenPackageQualifiedPackageInterfaceName(genPackage : genmodel::GenPackage) : String {
-	return null;
-}
-
-helper getGenPackageQualifiedFactoryInterfaceName(genPackage : genmodel::GenPackage) : String {
-	return null;
-}
-
-helper getGenPackageQualifiedInterfaceName(genClass : genmodel::GenClass) : String {
-	return null;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/CodeGenerationUtils.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/CodeGenerationUtils.java
deleted file mode 100644
index 4e5a01d65f9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/CodeGenerationUtils.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.codegen.util;
-
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-import org.eclipse.papyrus.gmf.internal.common.codegen.Conversions;
-
-public class CodeGenerationUtils {
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static String toStringLiteral(String stringValue) {
-		return Conversions.toStringLiteral(stringValue);
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static String escapeXML(String stringValue) {
-		return org.eclipse.papyrus.gmf.internal.common.codegen.Conversions.escapeXML(stringValue);
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static String safeName(String name) {
-		return org.eclipse.emf.codegen.util.CodeGenUtil.safeName(name);
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static String validJavaIdentifier(String identifier) {
-		return org.eclipse.emf.codegen.util.CodeGenUtil.validJavaIdentifier(identifier);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/EMFUtils.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/EMFUtils.java
deleted file mode 100644
index f51f4203ba7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/EMFUtils.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - added uri and uriFragment helpers
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.codegen.util;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EStructuralFeature.Setting;
-import org.eclipse.emf.ecore.util.EcoreUtil.CrossReferencer;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-import org.eclipse.ocl.util.CollectionUtil;
-
-public class EMFUtils {
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static List<EObject> getReferencingObjects(EObject target) {
-		Collection<EStructuralFeature.Setting> settings = CrossReferencer.find(target.eResource().getContents()).get(target);
-		if (settings == null) {
-			return CollectionUtil.<EObject> createNewSequence(Collections.<EObject> emptyList());
-		}
-		List<EObject> result = new ArrayList<EObject>();
-		for (Setting setting : settings) {
-			result.add(setting.getEObject());
-		}
-		return CollectionUtil.<EObject> createNewSequence(result);
-	}
-
-	@Operation(contextual = true, kind = Kind.QUERY)
-	public String uriFragment(EObject target) {
-		if (target.eResource() == null) {
-			return String.valueOf(System.identityHashCode(target)); // anything will do, identityHashCode just for personal amusement.
-		}
-		return target.eResource().getURIFragment(target);
-	}
-
-	@Operation(contextual = true, kind = Kind.QUERY)
-	public String uri(EObject target) {
-		String fragment = uriFragment(target);
-		if (target.eResource() == null) {
-			return fragment;
-		}
-		return target.eResource().getURI().appendFragment(fragment).toString();
-	}
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenModelAccessHelpers.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenModelAccessHelpers.java
deleted file mode 100644
index 6e17c40fedb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenModelAccessHelpers.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.codegen.util;
-
-import java.io.IOException;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-
-/**
- * Logic comes from org.eclipse.papyrus.gmf.internal.bridge.genmodel.BasicGenModelAccess, with few handy methods 
- * to access well-known genmodels
- * @author artem
- */
-public class GenModelAccessHelpers {
-
-	private ResourceSet myDefaultSet;
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public GenModel loadGenModel(String nsURI) {
-		return loadGenModel(nsURI, null);
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public GenModel loadGenModel(String nsURI, EObject context) {
-		ResourceSet rs = getResourceSet(context);
-		URI genModelFromExtPoint = EcorePlugin.getEPackageNsURIToGenModelLocationMap().get(nsURI);
-		if (genModelFromExtPoint != null) {
-			return (GenModel) rs.getEObject(genModelFromExtPoint.appendFragment("/"), true); //$NON-NLS-1$
-		}
-		// try to guess .genmodel file location based on .ecore file location (if any)
-		EPackage ecoreModel = rs.getPackageRegistry().getEPackage(nsURI);
-		if (ecoreModel != null && ecoreModel.eResource() != null && ecoreModel.eResource().getURI() != null) {
-			URI ecoreModelURI = ecoreModel.eResource().getURI();
-			if (!ecoreModelURI.equals(nsURI)) { // owning resource points to some real stream
-				// alternative: ecoreModelURI.isFile() || ecoreModelURI.isPlatform() || ecoreModelURI.isArchive()
-				// e.g. smth we can try to access as a file
-				URI genModelURI = ecoreModelURI.trimFileExtension().appendFileExtension("genmodel");
-				if (!genModelURI.equals(ecoreModelURI)) {
-					Resource genModelRes = rs.getResource(genModelURI, false);
-					try {
-						genModelRes.load(rs.getLoadOptions());
-						if (genModelRes.getContents().size() > 0) {
-							return (GenModel) genModelRes.getContents().get(0);
-						}
-					} catch (IOException ex) {
-						// IGNORE
-					}
-				}
-				// else FALLTHROUGH
-			}
-		}
-		// final attempt - try nsURI as if it was file URI (e.g. platform:/plugin/...)
-		URI genModelUri = URI.createURI(nsURI);
-		return (GenModel) rs.getEObject(genModelUri.appendFragment("/"), true); //$NON-NLS-1$
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public GenModel loadEcoreGenModel() {
-		return loadEcoreGenModel(null);
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public GenModel loadEcoreGenModel(EObject context) {
-		URI genModelUri = URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#/"); //$NON-NLS-1$
-		return (GenModel) getResourceSet(context).getEObject(genModelUri, true);
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public GenModel loadNotationGenModel() {
-		return loadNotationGenModel(null);
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public GenModel loadNotationGenModel(EObject context) {
-		URI genModelUri = URI.createURI("platform:/plugin/org.eclipse.gmf.runtime.notation/model/notation.genmodel#/"); //$NON-NLS-1$		
-		return (GenModel) getResourceSet(context).getEObject(genModelUri, true);
-	}
-
-	private ResourceSet getResourceSet(EObject context) {
-		if (context == null || context.eResource() == null || context.eResource().getResourceSet() == null) {
-			if (myDefaultSet == null) {
-				myDefaultSet = new ResourceSetImpl();
-			}
-			return myDefaultSet;
-		}
-		return context.eResource().getResourceSet();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenModelUtils.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenModelUtils.java
deleted file mode 100644
index ad00755dbb8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenModelUtils.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.codegen.util;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenClassifier;
-import org.eclipse.emf.codegen.ecore.genmodel.GenFeature;
-import org.eclipse.emf.codegen.ecore.genmodel.GenModel;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-
-public class GenModelUtils {
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static GenClass getDocumentRoot(GenPackage genPackage) {
-		return genPackage.hasDocumentRoot() ? genPackage.getDocumentRoot() : null;
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static GenClassifier findGenClassifier(GenModel genModel, EClassifier eClassifier) {
-		return genModel.findGenClassifier(eClassifier);
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static Boolean isListType(GenFeature genFeature) {
-		// can't implement in .qvto because
-		// XMLTypePackage.eNS_URI.equals(getExtendedMetaData().getNamespace((EStructuralFeature)eTypedElement));
-		// part of the check seems to be essential
-		return genFeature.isListType();
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static Boolean isDerived(GenFeature genFeature) {
-		return genFeature.isDerived();
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static GenClass getTypeGenClassX(GenFeature genFeature) {
-		return genFeature.getTypeGenClass();
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static String getGetAccessor(GenFeature genFeature) {
-		return genFeature.getGetAccessor();
-	}
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenPackageUtils.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenPackageUtils.java
deleted file mode 100644
index 024c7d2cf67..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/GenPackageUtils.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2012, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Andres Alvares Mattos - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.codegen.util;
-
-import org.eclipse.emf.codegen.ecore.genmodel.GenClass;
-import org.eclipse.emf.codegen.ecore.genmodel.GenPackage;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-
-public class GenPackageUtils {
-	
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static  String getGenPackageQualifiedPackageInterfaceName(GenPackage genPackage)
-	{
-	  return genPackage.getQualifiedPackageInterfaceName();
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public String getGenPackageQualifiedFactoryInterfaceName(GenPackage genPackage)
-	{
-	  return genPackage.getQualifiedFactoryInterfaceName();
-	}
-	
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public static  String getGenPackageQualifiedInterfaceName(GenClass genClass)
-	{
-	  return genClass.getQualifiedInterfaceName();
-	}
-	
-	
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/XpandFacadeAccess.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/XpandFacadeAccess.java
deleted file mode 100644
index c03fe7dd6e8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates.qvtlib/org/eclipse/papyrus/gmf/internal/codegen/util/XpandFacadeAccess.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.codegen.util;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.core.runtime.ILog;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-import org.eclipse.papyrus.gmf.internal.xpand.BufferOutput;
-import org.eclipse.papyrus.gmf.internal.xpand.XpandFacade;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Scope;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-import org.eclipse.papyrus.gmf.internal.xpand.util.BundleResourceManager;
-
-/**
- * @author artem
- */
-@SuppressWarnings("restriction")
-public class XpandFacadeAccess {
-
-	private static final String VAR_MM_ACCESS = "mapModeAccessor";
-	private static final String VAR_RT_TOKEN = "runtimeToken";
-	
-	@Operation(contextual = true, kind = Kind.QUERY)
-	public String xpand(Object self, String templateName, List<String> templateRoots) {
-		StringBuilder result = new StringBuilder();
-		ArrayList<URL> urls = new ArrayList<URL>(templateRoots.size());
-		
-		for (String s : templateRoots) {
-			try {
-				urls.add(new URL(s));
-			} catch (MalformedURLException ex) {
-				ILog l = Platform.getLog(Platform.getBundle("org.eclipse.papyrus.gmf.codegen")); //$NON-NLS-1$
-				l.log(new Status(Status.ERROR, l.getBundle().getSymbolicName(), ex.getClass().getSimpleName(), ex));
-			}
-		}
-		
-		final Collection<Variable> globals = new ArrayList<Variable>();
-		
-		globals.add( new Variable(VAR_MM_ACCESS, EcorePackage.eINSTANCE.getEString(), ""));
-		globals.add(new Variable(VAR_RT_TOKEN, EcorePackage.eINSTANCE.getEString(), "full"));
-		
-		BundleResourceManager rm = new BundleResourceManager(urls.toArray(new URL[urls.size()]));
-		try {
-			new XpandFacade(new Scope(rm, globals, new BufferOutput(result))).evaluate(templateName, self, null);
-		} catch (Exception ex) {
-			return ex.toString();
-		}
-		return result.toString();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/CodeStyle.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/CodeStyle.xpt
deleted file mode 100644
index bdf5d204f36..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/CodeStyle.xpt
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Artem Tikhomirov and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (independent) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::GenEditorGenerator»
-
-// Generic types
-«DEFINE G(String type) FOR gmfgen::GenCommonBase»«IF self.jdkComplianceLevel() > 4»<«type»>«ELSE»/*[«type»]*/«ENDIF»«ENDDEFINE»
-«DEFINE G2(String type1, String type2) FOR gmfgen::GenCommonBase»«IF self.jdkComplianceLevel() > 4»<«type1», «type2»>«ELSE»/*[«type1», «type2»]*/«ENDIF»«ENDDEFINE»
-«DEFINE _g2_3(String t, String a, String b, String c) FOR gmfgen::GenCommonBase»«t»«IF self.jdkComplianceLevel() > 4»<«a», «b»<«c»>>«ELSE»/*[«a», «b»[«c»]]*/«ENDIF»«ENDDEFINE»
-
-// e.g. java.util.List<String>
-«DEFINE G(String type, String typeArgument) FOR gmfgen::GenCommonBase»«type»«EXPAND G(typeArgument)»«ENDDEFINE»
-// e.g. java.util.Map<String, Integer>
-«DEFINE G2(String type, String typeArgument1, String typeArgument2) FOR gmfgen::GenCommonBase»«type»«EXPAND G2(typeArgument1, typeArgument2)»«ENDDEFINE»
-
-// java.util.List<String> varName = new Type<TypeArgument>
-// note, no constructor parameters, callers should add (); or whatever they think is reasonable
-// XXX perhaps, varName should go first, to be consistent with iterate?
-«DEFINE newGenericInstance(String varName, String type, String typeArgument) FOR gmfgen::GenCommonBase»«EXPAND G(type, typeArgument)» «varName» = new «EXPAND G(type, typeArgument)»«ENDDEFINE»
-
-// new HashMap<Object, String>
-«DEFINE newGenericInstance2(String varName, String type, String typeArgument1, String typeArgument2) FOR gmfgen::GenCommonBase»«EXPAND G2(type, typeArgument1, typeArgument2)» «varName»= new «EXPAND G2(type, typeArgument1, typeArgument2)»«ENDDEFINE»
-
-// new HashMap<Object, List<String>>
-«DEFINE newGenericInstance2(String varName, String type, String typeArgument1, String typeArgument2, String typeArgument3) FOR gmfgen::GenCommonBase»«EXPAND _g2_3(type, typeArgument1, typeArgument2, typeArgument3)» «varName»= new «EXPAND _g2_3(type, typeArgument1, typeArgument2, typeArgument3)»«ENDDEFINE»
-
-// iterate cycle with explicit iterator variable
-// use this one if you need access to iterator (i.e. remove elements) or when there's no java.lang.Iterable source (i.e. some API gives Iterator right away)
-«DEFINE iterate(String elementVar, String elementType, String iteratorVar, String iterationSource) FOR gmfgen::GenCommonBase-»
-for («EXPAND G('java.util.Iterator', elementType)» «iteratorVar» = «iterationSource»; «iteratorVar».hasNext();) {
-	«elementType» «elementVar» = «IF 'Object' <> elementType /*cast to Object is implicit*/ and not (self.jdkComplianceLevel() > 4) /*generics are not used then, should cast. Using 'not greater 4' instead of 'less than 5' to handle null/undefined case correctly*/»(«elementType») «ENDIF»«iteratorVar».next();
-«ENDDEFINE»
-
-//
-// generates Java5-style iterate cycle (no explicit iterator), if possibl, otherwise uses default iterator name, 'it'
-// beware of nested cycles using same 'it' name (relevant for Java 1.4)
-«DEFINE iterate(String elementVar, String elementType, String iterable /*java.lang.Iterable*/) FOR gmfgen::GenCommonBase-»
-«IF self.jdkComplianceLevel() > 4 -»
-for («elementType» «elementVar» : «iterable») {
-«ELSE-»
-«EXPAND iterate(elementVar, elementType, 'it', iterable.concat('.iterator()'))-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE emptyList FOR gmfgen::GenCommonBase-»
-«IF self.jdkComplianceLevel() > 4 -»
-java.util.Collections.emptyList()«ELSE-»
-java.util.Collections.EMPTY_LIST«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE emptyMap(String genericTypes) FOR gmfgen::GenCommonBase-»
-«IF self.jdkComplianceLevel() > 4 -»
-java.util.Collections.<«genericTypes»>emptyMap()«ELSE-»
-java.util.Collections.EMPTY_MAP«ENDIF-»
-«ENDDEFINE»
-
-// when need to cast 1.5-typed variable to be usable in 1.4 code. does nothing for 1.5 and greater. I.e.
-//   List/*[String]*/ coll = ...
-//   String aaa = (String) coll.get(0);
-// cast to string is needed in 1.4
-«DEFINE castTyped(String type) FOR gmfgen::GenCommonBase»«IF not (self.jdkComplianceLevel() > 4)»(«type») «ENDIF»«ENDDEFINE»
-
-// annotations are from Java 5 and above
-«DEFINE SuppressWarnings(String warnToken) FOR gmfgen::GenEditorGenerator»«EXPAND SuppressWarnings(warnToken) FOR diagram»«ENDDEFINE»
-«DEFINE SuppressWarnings(String warnToken) FOR gmfgen::GenCommonBase-»
-«IF self.jdkComplianceLevel() > 4 -»
-@SuppressWarnings(«warnToken»)
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE override FOR gmfgen::GenCommonBase-»
-«IF self.jdkComplianceLevel() > 4-»
-@Override
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE overrideI FOR gmfgen::GenCommonBase-»
-«IF self.jdkComplianceLevel() > 5-»
-@Override
-«ENDIF-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/MetaModel.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/MetaModel.qvto
deleted file mode 100644
index 92f2c0dff7e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/MetaModel.qvto
+++ /dev/null
@@ -1,212 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.StringOperations;
-import xpt.GenModelUtils;
-import gmf.CodeGenerationUtils;
-import gmf.GenPackageUtils;
-
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-/*
- * NOTE: Extensions from this file are supposed to be used 
- * ONLY from MetaModel.xpt. No other .xpt or .ext should import
- * this file. Common GenModel functionality, unrelated to meta-model 
- * access and access to generated model code should go into GenModelUtils.ext. 
- */
-
-library MetaModel;
-
-
---
--- GenPackageImpl#getQualifiedPackageInterfaceName()
---
-helper getQualifiedPackageInterfaceName(gp : genmodel::GenPackage) : String {
-	return getGenPackageQualifiedPackageInterfaceName(gp)
-}
-
---
--- GenPackageImpl#getQualifiedFactoryInterfaceName()
---
-helper getQualifiedFactoryInterfaceName(gp : genmodel::GenPackage) : String {
-	return getGenPackageQualifiedFactoryInterfaceName(gp)
-}
-
---
--- GenPackage#getFactoryInstanceName
---
-helper getFactoryInstanceName(gp : genmodel::GenPackage) : String {
-	return (if gp.genModel.suppressEMFMetaData then 'INSTANCE' else 'eINSTANCE' endif)
-}
-
---
--- GenPackageImpl#getQualifiedItemProviderAdapterFactoryClassName()
---
-helper getQualifiedItemProviderAdapterFactoryClassName(gp : genmodel::GenPackage) : String {
-	return getQualifiedPackageName(gp, gp.providerPackageSuffix) + '.' + getItemProviderAdapterFactoryClassName(gp)
-}
-
---
--- GenPackageImpl#getItemProviderAdapterFactoryClassName()
---
--- MODIFIERS: private
-helper getItemProviderAdapterFactoryClassName(gp : genmodel::GenPackage) : String {
-	return getPrefixedName(gp, 'ItemProviderAdapterFactory')
-}
-
---
--- GenClass#getQualifiedInterfaceName
---
-helper getQualifiedInterfaceName(gc : genmodel::GenClass) : String {
-	return getGenPackageQualifiedInterfaceName(gc)
-}
-
---
--- GenPackageImpl#getInterfacePackageName()
---
--- MODIFIERS: private
-helper getInterfacePackageName(gp : genmodel::GenPackage) : String {
-	return getQualifiedPackageName(gp, gp.interfacePackageSuffix)
-}
-
--- NOTE GenDataType#getQualifiedInstanceClassName returns primitive types as is,
--- while we return their java.lang wrappers
-helper genmodel::GenClassifier::getQualifiedClassName() : String {
-	return null
-}
-
-helper genmodel::GenDataType::getQualifiedClassName() : String {
-	return getObjectCompatibleClassName(self.ecoreDataType)
-}
-
-helper genmodel::GenEnum::getQualifiedClassName() : String {
-	return getInterfacePackageName(self.genPackage) + '.' + self.ecoreEnum.name
-}
-
---
--- GenClass#getClassifierAccessorName
---
-helper getClassifierAccessorName(gc : genmodel::GenClassifier) : String {
-	return switch { case (gc.getEcoreClassifier().name = 'Class') 'Class_'; case (gc.getEcoreClassifier().name = 'Name') 'Name_'; else gc.getEcoreClassifier().name; }
-}
-
---
--- GenFeature#getFeatureAccessorName
---
-helper getFeatureAccessorName(gf : genmodel::GenFeature) : String {
-	return gf.genClass.ecoreClass.name + '_' + gf.ecoreFeature.name.firstToUpper()
-}
-
--- GenFeatureImpl#getAccessorName
-helper getAccessorName(gf : genmodel::GenFeature) : String {
-	return (if isMapEntryFeature(gf) then 'Typed' + gf.ecoreFeature.name.firstToUpper() else gf.ecoreFeature.name.firstToUpper() endif)
-}
-
--- GenClassImpl#isMapEntry
-helper isMapEntry(gc : genmodel::GenClass) : Boolean {
-	return 'java.util.Map.Entry' = gc.ecoreClass.instanceClassName or 'java.util.Map$Entry' = gc.ecoreClass.instanceClassName and (gc.ecoreClass.getEStructuralFeature('key') <> null and gc.ecoreClass.getEStructuralFeature('value') <> null)
-}
-
-/*
- * Casts the argument (which is assumed to be of the given source class) to the given target class. 
- * A null value may be used for both source and target class to specify the EObject class.
- * If the cast is required, it will be parenthesized as a whole, producing, e.g., ((EObject) o). 
- * If the parentheses are not required, use unparenthesizedCast() extension.
- */
-helper parenthesizedCast(what : String, source : genmodel::GenClass, target : genmodel::GenClass) : String {
-	return (if needsCast(source, target) then '(' + unparenthesizedCast(what, source, target) + ')' else what endif)
-}
-
-/*
- * Casts the argument (which is assumed to be of the given source class) to the given target class. 
- * A null value may be used for both source and target class to specify the EObject class.
- * If the cast is required, it will NOT be parenthesized as a whole, producing, e.g., (EObject) o. 
- * If the parentheses are required, use parenthesizedCast() extension.
- */
-helper unparenthesizedCast(what : String, source : genmodel::GenClass, target : genmodel::GenClass) : String {
-	return (if needsCast(source, target) then (if target = null then '(org.eclipse.emf.ecore.EObject)' + what else '(' + getQualifiedInterfaceName(target) + ')' + what endif) else what endif)
-}
-
---See cast()
--- MODIFIERS: private
-helper needsCast(source : genmodel::GenClass, target : genmodel::GenClass) : Boolean {
-	return (if source = target then false else (if target = null then source <> null and isExternalInterface(source) else source = null or (isExternalInterface(target) or (isExternalInterface(source) or not target.isSuperTypeOf(source))) endif) endif)
-}
--- MODIFIERS: private
-helper genmodel::GenClassifier::getEcoreClassifier() : ecore::EClassifier {	return null }
--- MODIFIERS: private
-helper genmodel::GenClass::getEcoreClassifier() : ecore::EClassifier { return self.ecoreClass }
--- MODIFIERS: private
-helper genmodel::GenDataType::getEcoreClassifier() : ecore::EClassifier { return self.ecoreDataType }
-
--- GenPackageImpl#getReflectionPackageName()
--- MODIFIERS: private
-helper getReflectionPackageName(gp : genmodel::GenPackage) : String {
-	return getQualifiedPackageName(gp, gp.metaDataPackageSuffix)
-}
-
--- GenPackageImpl#getQualifiedPackageClassName()
--- MODIFIERS: private
-helper getQualifiedPackageClassName(gp : genmodel::GenPackage) : String {
-	return getReflectionClassPackageName(gp) + '.' + getPackageClassName(gp)
-}
-
--- GenPackageImpl#getReflectionClassPackageName()
--- MODIFIERS: private
-helper getReflectionClassPackageName(gp : genmodel::GenPackage) : String {
-	return getQualifiedPackageName(gp, (if gp.genModel.suppressInterfaces then gp.metaDataPackageSuffix else gp.classPackageSuffix endif))
-}
-
--- GenPackageImpl#getPackageClassName()
--- MODIFIERS: private
-helper getPackageClassName(gp : genmodel::GenPackage) : String {
-	return (if not gp.genModel.suppressEMFMetaData and not gp.genModel.suppressInterfaces then getPackageInterfaceName(gp) + 'Impl' else getPackageInterfaceName(gp) endif)
-}
-
--- GenPackageImpl#getPackageInterfaceName()
--- MODIFIERS: private
-helper getPackageInterfaceName(gp : genmodel::GenPackage) : String {
-	return (if gp.genModel.suppressEMFMetaData and not gp.genModel.suppressInterfaces then getPrefixedName(gp, 'PackageImpl') else getPrefixedName(gp, 'Package') endif)
-}
-
--- GenPackageImpl#getPrefixedName()
--- MODIFIERS: private
-helper getPrefixedName(gp : genmodel::GenPackage, name : String) : String {
-	return (if null <> gp.prefix then gp.prefix + name else name endif)
-}
-
--- GenPackageImpl#getQualifiedPackageName(String)
--- MODIFIERS: private
-helper getQualifiedPackageName(gp : genmodel::GenPackage, suffix : String) : String {
-	return (if isBlank(suffix) then getQualifiedPackageName(gp) else getQualifiedPackageName(gp) + '.' + suffix endif)
-}
-
--- GenPackageImpl#getQualifiedPackageName()
--- MODIFIERS: private
-helper getQualifiedPackageName(gp : genmodel::GenPackage) : String {
-	return (if isBlank(gp.basePackage) then safeName(gp.ecorePackage.name) else gp.basePackage + '.' + safeName(gp.ecorePackage.name) endif)
-}
-
--- GenFeatureImpl#isMapEntryFeature
--- MODIFIERS: private
-helper isMapEntryFeature(gf : genmodel::GenFeature) : Boolean {
-	return isMapEntry(gf.genClass) and ('key' = gf.ecoreFeature.name or 'value' = gf.ecoreFeature.name)
-}
-
--- MODIFIERS: private
-helper isBlank(s : String) : Boolean {
-	return null = s or s.size() = 0
-}
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/MetaModel.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/MetaModel.xpt
deleted file mode 100644
index ab1d4c848c6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/MetaModel.xpt
+++ /dev/null
@@ -1,196 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION MetaModel»
-«EXTENSION xpt::GenModelUtils»
-«EXTENSION gmf::GenModelUtils»
-
-/*
- * Does instanceof check.
- */
-«DEFINE IsInstance(accessor : String) FOR genmodel::GenClass-»
-«accessor» instanceof «getQualifiedInterfaceName(self)»«ENDDEFINE»
-
-// Shorthand, negates IsInstance - handy if you consider
-// different approaches for generated and dynamic models: false == instanceof
-// vs. !MetaModelFacility.isInstance
-«DEFINE NotInstance(accessor : String) FOR genmodel::GenClass-»
-false == «EXPAND IsInstance(accessor)»«ENDDEFINE»
-
-/**
- * Special kind of instanceof check, that compares eContainer() of the object.
- * Since metaClass may be an external interface, eContainer() might need cast to EObject  
- */
-«DEFINE IsContainerInstance(_object : String, metaClass : genmodel::GenClass) FOR genmodel::GenClass-»
-«EXPAND _getEObjectFeature(_object, 'eContainer()') FOR metaClass» instanceof «getQualifiedInterfaceName(self)»«ENDDEFINE»
-
-«DEFINE _getEObjectFeature(_object : String, feature : String) FOR genmodel::GenClass-»
-«IF isExternalInterface(self)»((org.eclipse.emf.ecore.EObject) «_object»).«feature»«ELSE»«_object».«feature»«ENDIF-»
-«ENDDEFINE»
-
-// Public/API-sort templates are named with first letter capitalized.
-// FIXME getFeatureValue* and setFeatureValue start with lowercase to indicate pending refactoring
-
-«DEFINE getFeatureValue(containerVar : String, containerClass : genmodel::GenClass) FOR genmodel::GenFeature-»
-«IF isExternalInterface(containerClass)-»
-((«EXPAND featureTargetType») ((org.eclipse.emf.ecore.EObject) «containerVar»).eGet(«EXPAND MetaFeature»))«-»
-«ELSE-»
-«containerVar».«getGetAccessor(self)»()«-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE featureTargetType FOR genmodel::GenFeature»«IF isListType(self)»java.util.List«ELSE»«EXPAND QualifiedClassName FOR findGenClassifier(genClass.genPackage.genModel, ecoreFeature.eType)»«ENDIF»«ENDDEFINE»
-
-/*
- * FIXME leave only one version of these two getFeatureValue
- *
- * A slightly more sophisticated version of getFeatureValue().
- * @param containerName the name of the container
- * @param feature the feature whose value is in interest
- * @param containerMetaClass the <code>GenClass</code> of the container, or <code>null</code>, if the container is declared as an <code>org.eclipse.emf.ecore.EObject</code>.
- * @param needsCastToResultType whether the cast to the result type is required (this parameter is only used if the <code>org.eclipse.emf.ecore.EClass</code> this feature belongs to is an external interface). 
- */
-«DEFINE getFeatureValue(containerVar : String, container : genmodel::GenClass, needsCastToResultType : Boolean) FOR genmodel::GenFeature-»
-«IF isExternalInterface(genClass)-»
-«IF needsCastToResultType»((«EXPAND featureTargetType») «ENDIF»«parenthesizedCast(containerVar, container, null)».eGet(«EXPAND MetaFeature»)«IF needsCastToResultType»)«ENDIF-»
-«ELSE-»
-«parenthesizedCast(containerVar, container, genClass)».«getGetAccessor(self)»()«-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE modifyFeature(targetVar : String, targetType : genmodel::GenClass, value : String) FOR genmodel::GenFeature-»
-«IF isListType(self)-»
-«EXPAND getFeatureValue(targetVar, targetType)».add(«value»);«-»
-«ELSE-»
-«EXPAND setFeatureValue(targetVar, targetType, value)»;«-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE replaceFeatureValue(targetVar : String, targetType : genmodel::GenClass, oldValue : String, newValue : String) FOR genmodel::GenFeature-»
-«IF isListType(self)-»
-	«EXPAND getFeatureValue(targetVar, targetType)».remove(«oldValue»);
-«ENDIF-»
-	«EXPAND modifyFeature(targetVar, targetType, newValue)-»
-«ENDDEFINE»
-
-«DEFINE moveFeatureValue(oldTarget : String, newTarget : String, targetType : genmodel::GenClass, value : String) FOR genmodel::GenFeature-»
-«IF isListType(self)-»
-	«EXPAND getFeatureValue(oldTarget, targetType)».remove(«value»);
-«ELSE-»
-	«EXPAND setFeatureValue(oldTarget, targetType, 'null')»;
-«ENDIF-»
-	«EXPAND modifyFeature(newTarget, targetType, value)-»
-«ENDDEFINE»
-
-«DEFINE setFeatureValue(targetVar : String, targetType : genmodel::GenClass, valueVar : String) FOR genmodel::GenFeature-»
-«EXPAND setFeatureValue(targetVar, targetType, valueVar, false)»«ENDDEFINE»
-
-// FIXME support list features as well, i.e. do .add() instead of eSet
-«DEFINE setFeatureValue(targetVar : String, targetType : genmodel::GenClass, valueVar : String, isPlainObjectValue : Boolean) FOR genmodel::GenFeature-»
-«IF isExternalInterface(targetType)-»
-((org.eclipse.emf.ecore.EObject) «targetVar»).eSet(«EXPAND MetaFeature», «valueVar»)«-»
-«ELSE-»
-«targetVar».set«getAccessorName(self)»(«IF not isPlainObjectValue»«valueVar»«ELSE»«IF isPrimitiveType(self)»«EXPAND _unwrapObjectToPrimitiveValue(valueVar)»«ELSE»(«EXPAND featureTargetType») «valueVar»«ENDIF»«ENDIF»)«-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE _unwrapObjectToPrimitiveValue(valueVar : String) FOR genmodel::GenFeature-»
-((«EXPAND featureTargetType») «valueVar»).«ecoreFeature.eType.instanceClassName»Value()«ENDDEFINE»
-
-«DEFINE MetaClass FOR genmodel::GenClassifier»«getQualifiedPackageInterfaceName(genPackage)».eINSTANCE.get«getClassifierAccessorName(self)»()«ENDDEFINE»
-
-«DEFINE MetaFeature FOR genmodel::GenFeature»«getQualifiedPackageInterfaceName(genClass.genPackage)».eINSTANCE.get«getFeatureAccessorName(self)»()«ENDDEFINE»
-
-// SomeFactory.eINSTANCE.createBlaBla();
-//NB: for map entries, the resulting type is EObject, not the qualified interface name. If cast is needed, use (un)parenthesizedCast() extension.
-//see GenClassImpl#hasFactoryInterfaceCreateMethod() for details why map entries should be treated differently
-«DEFINE NewInstance FOR genmodel::GenClass-»
-«IF isMapEntry(self)-»
-«getQualifiedFactoryInterfaceName(genPackage)».«getFactoryInstanceName(genPackage)».create(«EXPAND MetaClass»)«ELSE-»
-«getQualifiedFactoryInterfaceName(genPackage)».«getFactoryInstanceName(genPackage)».create«ecoreClass.name»()«ENDIF-»
-«ENDDEFINE»
-
-// XXX Need to take into account possible GenClass from generated and always available code
-// e.g. Notation or Ecore 
-
-// FIXME be consistent on final line feed - e.g. NewInstance adds a LF, while modifyFeature not, hence together they look odd.
-«DEFINE NewInstance(varName : String) FOR genmodel::GenClass-»
-«getQualifiedInterfaceName(self)» «varName» = «IF isMapEntry(self)»(«getQualifiedInterfaceName(self)») «ENDIF»«EXPAND NewInstance»;
-«ENDDEFINE»
-
-/*
- * Ensures value is of type EObject, may be no-op if context GenClass is compatible with EObject.
- * Note, injected value is not surrounded with parenthesis, may need to introduce another
- * template to accomplish that if needed.
- */
-«DEFINE DowncastToEObject(value : String) FOR genmodel::GenClass»«IF isExternalInterface(self)»(org.eclipse.emf.ecore.EObject) «ENDIF»«value»«ENDDEFINE»
-
-/*
- * Declares new variable of appropriate type and assigns casted value to it.
- */
-«DEFINE DeclareAndAssign(assignee : String, value : String) FOR genmodel::GenClass-»
-«getQualifiedInterfaceName(self)» «assignee» = («getQualifiedInterfaceName(self)») «value»;«ENDDEFINE»
-
-/*
- * third boolean parameter is to indicate the value is not EObject, so may
- * need extra cast in case dynamic model instances are in use.
- */
-«DEFINE DeclareAndAssign(assignee : String, value : String, isPlainObjectValue : Boolean) FOR genmodel::GenClass-»
-«EXPAND DeclareAndAssign(assignee, value)»«ENDDEFINE»
-
-«DEFINE DeclareAndAssign(assignee : String, value : String, isPlainObjectValue : Boolean) FOR genmodel::GenClassifier-»
-«self.getQualifiedClassName()» «assignee» = («self.getQualifiedClassName()») «value»;«ENDDEFINE»
-
-// @see IsContainerInstance
-«DEFINE DeclareAndAssignContainer(assignee : String, _object : String, metaClass : genmodel::GenClass) FOR genmodel::GenClass-»
-«getQualifiedInterfaceName(self)» «assignee» = («getQualifiedInterfaceName(self)») «EXPAND _getEObjectFeature(_object, 'eContainer()') FOR metaClass»;«ENDDEFINE»
-
-/*
- * Declares new variable of context type and assignes a value obtained from 'src',
- * which is of type 'srcMetaClass', via 'srcFeature'
- *
- * XXX in certain scenarions may need extra cast of the feature value
- */
-«DEFINE DeclareAndAssign(assignee : String, src : String, srcMetaClass : genmodel::GenClass, srcFeature : genmodel::GenFeature) FOR genmodel::GenClass-»
-«getQualifiedInterfaceName(self)» «assignee» = «EXPAND getFeatureValue(src, srcMetaClass) FOR srcFeature»;«ENDDEFINE»
-
-/*
- * Same as DeclareAndAssign, with extra operation applied to source object
- */
-«DEFINE DeclareAndAssign2(assignee : String, src : String, srcMetaClass : genmodel::GenClass, srcFeature : genmodel::GenFeature, srcExt : String, needCast : Boolean) FOR genmodel::GenClass-»
-«getQualifiedInterfaceName(self)» «assignee» = «IF needCast»(«getQualifiedInterfaceName(self)») «ENDIF»«EXPAND getFeatureValue(src, srcMetaClass) FOR srcFeature».«srcExt»;«ENDDEFINE»
-
-/*
- * Cast value of type EObject to specific type. Would be no-op with dynamic model instances,
- * therefore, the fact eObjectValue is actually EObject is essential
- */
-«DEFINE CastEObject(eObjectValue : String) FOR genmodel::GenClass»(«getQualifiedInterfaceName(self)») «eObjectValue»«ENDDEFINE»
-
-/**
- * Qualified interface name of the generated EClass, or EObject for dynamic models.
- * Use whenever class name is inevitable (e.g. method arguments)
- * SHOULD NEVER APPEAR in instanceof or any other similar comparison operation
- */
-«DEFINE QualifiedClassName FOR genmodel::GenClass»«getQualifiedInterfaceName(self)»«ENDDEFINE»
-«DEFINE QualifiedClassName FOR genmodel::GenClassifier»«self.getQualifiedClassName()»«ENDDEFINE»
-
-«DEFINE PopulateItemProviderFactories(factoryListVar : String) FOR gmfgen::GenEditorGenerator-»
-«FOREACH getAllDomainGenPackages(true)->asSequence() AS genPackage-»
-		«factoryListVar».add(new «getQualifiedItemProviderAdapterFactoryClassName(genPackage)»());
-«ENDFOREACH-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/ChildNodeLabelEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/ChildNodeLabelEditPart.xpt
deleted file mode 100644
index 817e209ab09..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/ChildNodeLabelEditPart.xpt
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::editparts::Utils»
-
-«DEFINE Main FOR gmfgen::GenChildLabelNode-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsList» {
-	
-	«EXPAND attributes-»
-	
-	«EXPAND impl::diagram::editparts::ChildNodeLabelEditPart::contsructor-»
-
-	«EXPAND getDragTracker-»
-	
-	«EXPAND createDefaultEditPolicies-»
-
-	«EXPAND impl::diagram::editparts::TextAware::methods(false, labelReadOnly, labelElementIcon, viewmap, labelModelFacet, self, getDiagram())-»
-
-	«EXPAND xpt::diagram::editparts::Common::notationalListeners-»
-
-	«EXPAND handleNotificationEvent-»
-
-	«EXPAND xpt::diagram::editparts::Common::labelFigure FOR viewmap-»
-	
-	«EXPAND impl::diagram::editparts::ChildNodeLabelEditPart::isSelectable-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenChildLabelNode»extends org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenChildLabelNode»implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenChildLabelNode-»
-	«EXPAND xpt::diagram::editparts::Common::visualIDConstant FOR self-»
-
-	«EXPAND impl::diagram::editparts::TextAware::fields FOR self-»
-«ENDDEFINE»
-
-«DEFINE getDragTracker FOR gmfgen::GenChildLabelNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.gef.DragTracker getDragTracker(org.eclipse.gef.Request request) {
-	«EXPAND impl::diagram::editparts::ChildNodeLabelEditPart::getDragTrackerBody-»
-}
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPolicies FOR gmfgen::GenChildLabelNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void createDefaultEditPolicies() {
-	«EXPAND impl::diagram::editparts::ChildNodeLabelEditPart::createDefaultEditPoliciesBody-»
-}
-«ENDDEFINE»
-
-«DEFINE handleNotificationEvent FOR gmfgen::GenChildLabelNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void handleNotificationEvent(org.eclipse.emf.common.notify.Notification event) {
-	«EXPAND impl::diagram::editparts::ChildNodeLabelEditPart::handleNotificationEventBody-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenChildLabelNode»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/CompartmentEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/CompartmentEditPart.xpt
deleted file mode 100644
index f4d46c40190..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/CompartmentEditPart.xpt
+++ /dev/null
@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::editparts::Utils»
-
-«DEFINE Main FOR gmfgen::GenCompartment-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsList» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND impl::diagram::editparts::CompartmentEditPart::contsructor-»
-	
-	«EXPAND impl::diagram::editparts::CompartmentEditPart::hasModelChildrenChanged-»
-	
-	«EXPAND impl::diagram::editparts::CompartmentEditPart::getCompartmentName-»
-	
-	«EXPAND impl::diagram::editparts::CompartmentEditPart::createFigure-»
-	
-	«EXPAND createDefaultEditPolicies-»
-	
-	«EXPAND impl::diagram::editparts::CompartmentEditPart::refreshVisuals-»
-	
-	«EXPAND handleNotificationEvent-»
-	
-	«EXPAND impl::diagram::editparts::CompartmentEditPart::refreshBounds-»
-	
-	«EXPAND impl::diagram::editparts::CompartmentEditPart::setRatio-»
-	
-	«EXPAND impl::diagram::editparts::CompartmentEditPart::getTargetEditPartMethod-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenCompartment-»
-extends «IF listLayout»org.eclipse.gmf.runtime.diagram.ui.editparts.ListCompartmentEditPart«ELSE»org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeCompartmentEditPart«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenCompartment»«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenCompartment-»
-	«EXPAND xpt::diagram::editparts::Common::visualIDConstant FOR self-»
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPolicies FOR gmfgen::GenCompartment-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void createDefaultEditPolicies() {
-		«EXPAND impl::diagram::editparts::CompartmentEditPart::createDefaultEditPoliciesBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE handleNotificationEvent FOR gmfgen::GenCompartment-»
-	«IF isStoringChildPositions(node)-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected void handleNotificationEvent(org.eclipse.emf.common.notify.Notification notification) {
-			«EXPAND impl::diagram::editparts::CompartmentEditPart::handleNotificationEventBody-»
-		}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenCompartment»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/DiagramEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/DiagramEditPart.xpt
deleted file mode 100644
index 69e95929a11..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/DiagramEditPart.xpt
+++ /dev/null
@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsList» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND impl::diagram::editparts::DiagramEditPart::_constructor-»
-	
-	«EXPAND createDefaultEditPolicies-»
-	
-	«EXPAND impl::diagram::editparts::DiagramEditPart::createFigure-»
-«IF getAllNodes()->exists(n | n.labels->exists(not oclIsKindOf(gmfgen::GenExternalNodeLabel))) /*iow, NodeLabelEditPart template (GenNodeLabel target) will require this EditPolicy*/-»
-	«EXPAND impl::diagram::editparts::NodeLabelEditPart::nodeLabelDragPolicyClass»
-«ENDIF-»
-
-«IF links->exists(labels->notEmpty())-»
-	«EXPAND impl::diagram::editparts::LinkLabelEditPart::linkLabelDragPolicyClass»
-«ENDIF-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenDiagram»extends org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public final static String MODEL_ID = "«editorGen.modelID»"; «EXPAND xpt::Common::nonNLS»
-	
-	«EXPAND xpt::diagram::editparts::Common::visualIDConstant FOR self-»
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPolicies FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void createDefaultEditPolicies() {
-		«EXPAND impl::diagram::editparts::DiagramEditPart::createDefaultEditPoliciesBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/ExternalNodeLabelEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/ExternalNodeLabelEditPart.xpt
deleted file mode 100644
index 482fab0ebf6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/ExternalNodeLabelEditPart.xpt
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenExternalNodeLabel-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsList» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND impl::diagram::editparts::ExternalNodeLabelEditPart::initializer-»
-	
-	«EXPAND impl::diagram::editparts::ExternalNodeLabelEditPart::_constructor-»
-	
-	«EXPAND createDefaultEditPolicies-»
-	
-	«EXPAND impl::diagram::editparts::ExternalNodeLabelEditPart::getBorderItemLocator-»
-	
-	«EXPAND impl::diagram::editparts::ExternalNodeLabelEditPart::refreshBounds-»
-	
-	«EXPAND impl::diagram::editparts::TextAware::methods(false, readOnly, elementIcon, viewmap, modelFacet, node, getDiagram())-»
-	
-	«EXPAND handleNotificationEvent-»
-	
-	«EXPAND impl::diagram::editparts::ExternalNodeLabelEditPart::createFigure-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenExternalNodeLabel»extends org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenExternalNodeLabel»implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart, org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenExternalNodeLabel-»
-	«EXPAND xpt::diagram::editparts::Common::visualIDConstant FOR self-»
-
-	«EXPAND impl::diagram::editparts::TextAware::fields FOR self-»
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPolicies FOR gmfgen::GenExternalNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void createDefaultEditPolicies() {
-		«EXPAND impl::diagram::editparts::ExternalNodeLabelEditPart::createDefaultEditPoliciesBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE handleNotificationEvent FOR gmfgen::GenExternalNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void handleNotificationEvent(org.eclipse.emf.common.notify.Notification event) {
-		«EXPAND impl::diagram::editparts::ExternalNodeLabelEditPart::handleNotificationEventBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenExternalNodeLabel»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/LinkEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/LinkEditPart.xpt
deleted file mode 100644
index 9c66a723b6d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/LinkEditPart.xpt
+++ /dev/null
@@ -1,64 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenLink-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsList» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND impl::diagram::editparts::LinkEditPart::_constructor-»
-	
-	«EXPAND createDefaultEditPolicies-»
-
-	«EXPAND impl::diagram::editparts::LinkEditPart::addFixedChild-»
-
-	«EXPAND impl::diagram::editparts::LinkEditPart::addChildVisual-»
-
-	«EXPAND impl::diagram::editparts::LinkEditPart::removeFixedChild-»
-
-	«EXPAND impl::diagram::editparts::LinkEditPart::removeChildVisual-»
-	
-	«EXPAND impl::diagram::editparts::LinkEditPart::createLinkFigure-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenLink»extends org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionNodeEditPart«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenLink-»
-	«IF treeBranch»implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITreeBranchEditPart«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenLink-»
-	«EXPAND xpt::diagram::editparts::Common::visualIDConstant-»
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPolicies FOR gmfgen::GenLink-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void createDefaultEditPolicies() {
-		«EXPAND impl::diagram::editparts::LinkEditPart::createDefaultEditPoliciesBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenLink-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/LinkLabelEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/LinkLabelEditPart.xpt
deleted file mode 100644
index 00eafb1976e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/LinkLabelEditPart.xpt
+++ /dev/null
@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenLinkLabel-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsList» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND impl::diagram::editparts::LinkLabelEditPart::initializer-»
-	
-	«EXPAND impl::diagram::editparts::LinkLabelEditPart::_constructor-»
-	
-	«EXPAND createDefaultEditPolicies-»
-	
-	«EXPAND impl::diagram::editparts::LinkLabelEditPart::getKeyPoint-»
-	
-	«EXPAND impl::diagram::editparts::TextAware::methods(false, readOnly, elementIcon, viewmap, modelFacet, link, getDiagram())-»
-	
-	«EXPAND handleNotificationEvent-»
-	
-	«EXPAND xpt::diagram::editparts::Common::labelFigure FOR viewmap-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenLinkLabel»extends org.eclipse.gmf.runtime.diagram.ui.editparts.LabelEditPart«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenLinkLabel»implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenLinkLabel-»
-	«EXPAND xpt::diagram::editparts::Common::visualIDConstant-»
-
-	«EXPAND impl::diagram::editparts::TextAware::fields-»
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPolicies FOR gmfgen::GenLinkLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void createDefaultEditPolicies() {
-		«EXPAND impl::diagram::editparts::LinkLabelEditPart::createDefaultEditPoliciesBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE handleNotificationEvent FOR gmfgen::GenLinkLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void handleNotificationEvent(org.eclipse.emf.common.notify.Notification event) {
-		«EXPAND impl::diagram::editparts::LinkLabelEditPart::handleNotificationEventBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenLinkLabel-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/NodeEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/NodeEditPart.xpt
deleted file mode 100644
index 591ca574118..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/NodeEditPart.xpt
+++ /dev/null
@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::editparts::Utils»
-
-«DEFINE Main FOR gmfgen::GenNode-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsList» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND impl::diagram::editparts::NodeEditPart::_constructor-»
-	
-	«EXPAND createDefaultEditPolicies-»
-	
-	«EXPAND impl::diagram::editparts::NodeEditPart::createLayoutEditPolicy-»
-	
-	«EXPAND impl::diagram::editparts::NodeEditPart::createNodeShape(self) FOR viewmap-»
-	
-«IF hasFixedChildren(self)-»
-	«EXPAND impl::diagram::editparts::NodeEditPart::addFixedChild-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::removeFixedChild-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::addChildVisual-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::removeChildVisual-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::getContentPaneFor-»
-«ENDIF-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::addBorderItem-»
-	
-	«EXPAND impl::diagram::editparts::NodeEditPart::createNodePlate-»
-	
-	«EXPAND impl::diagram::editparts::NodeEditPart::getPrimaryDragEditPolicy-»
-	
-	«EXPAND impl::diagram::editparts::NodeEditPart::createFigure-»
-	
-	«EXPAND impl::diagram::editparts::NodeEditPart::setupContentPane-»
-	
-	«EXPAND impl::diagram::editparts::NodeEditPart::getContentPane-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::setForegroundColor-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::setBackgroundColor-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::setLineWidth-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::setLineStyle-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::getPrimaryChildEditPart-»
-
-«IF hasChildrenInListCompartments(self)-»
-	«EXPAND impl::diagram::editparts::NodeEditPart::getTargetEditPartMethod-»
-«ENDIF-»
-
-	«EXPAND handleNotificationEvent-»
-
-	«EXPAND impl::diagram::editparts::NodeEditPart::innerClassDeclaration FOR viewmap-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenNode»extends «EXPAND impl::diagram::editparts::NodeEditPart::extendsListContents»«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenNode»«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNode-»
-	«EXPAND xpt::diagram::editparts::Common::visualIDConstant FOR self-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure contentPane;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure primaryShape;
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPolicies FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void createDefaultEditPolicies() {
-		«EXPAND impl::diagram::editparts::NodeEditPart::createDefaultEditPoliciesBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE handleNotificationEvent FOR gmfgen::GenNode-»
-«ENDDEFINE»
-
-«DEFINE handleNotificationEvent FOR gmfgen::GenTopLevelNode-»
-	«REM»This code is important for refreshing shortcut decoration
-	on adding corresponding annotation to the View instance.«ENDREM»
-	«IF getDiagram().generateShortcutIcon()-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected void handleNotificationEvent(org.eclipse.emf.common.notify.Notification event) {
-			«EXPAND impl::diagram::editparts::NodeEditPart::handleNotificationEventBody-»
-		}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNode-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/NodeLabelEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/NodeLabelEditPart.xpt
deleted file mode 100644
index dec944b62f0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editparts/NodeLabelEditPart.xpt
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::editparts::Utils»
-
-«DEFINE Main FOR gmfgen::GenNodeLabel-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartClassName» «EXPAND extendsList» «EXPAND implementsList» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND impl::diagram::editparts::NodeLabelEditPart::_constructor-»
-	
-	«EXPAND createDefaultEditPolicies-»
-	
-	«EXPAND impl::diagram::editparts::TextAware::methods(isStoringChildPositions(node), readOnly, elementIcon, viewmap, modelFacet, node, getDiagram())-»
-
-	«EXPAND xpt::diagram::editparts::Common::notationalListeners-»
-	
-	«EXPAND impl::diagram::editparts::NodeLabelEditPart::refreshBounds-»
-	
-	«EXPAND handleNotificationEvent-»
-	
-	«EXPAND xpt::diagram::editparts::Common::labelFigure FOR viewmap-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenNodeLabel»extends org.eclipse.gmf.runtime.diagram.ui.editparts.CompartmentEditPart«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenNodeLabel»implements org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNodeLabel-»
-	«EXPAND xpt::diagram::editparts::Common::visualIDConstant FOR self-»
-
-	«EXPAND impl::diagram::editparts::TextAware::fields FOR self-»
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPolicies FOR gmfgen::GenNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void createDefaultEditPolicies() {
-		«EXPAND impl::diagram::editparts::NodeLabelEditPart::createDefaultEditPoliciesBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE handleNotificationEvent FOR gmfgen::GenNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void handleNotificationEvent(org.eclipse.emf.common.notify.Notification event) {
-		«EXPAND impl::diagram::editparts::NodeLabelEditPart::handleNotificationEventBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNodeLabel-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt
deleted file mode 100644
index 9fd90f0f419..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editpolicies/ChildContainerCanonicalEditPolicy.xpt
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Artem Tikhomirov               moved from xpt::diagram::editpolicies to diagram::editpolicies (API location)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenChildContainer-»
-	«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPoliciesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «canonicalEditPolicyClassName» extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy {
-	«EXPAND impl::diagram::update::CanonicalUpdate::body-»
-
-	«EXPAND refreshSemanticMethod-»
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-
-«DEFINE refreshSemanticMethod FOR gmfgen::GenChildContainer-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected void refreshSemantic() {
-	if (resolveSemanticElement() == null) {
-		return;
-	}
-	«EXPAND CodeStyle::newGenericInstance('createdViews', 'java.util.LinkedList', 'org.eclipse.core.runtime.IAdaptable')»();
-	«EXPAND impl::diagram::update::CanonicalUpdate::refreshSemanticChildren('createdViews', getDiagram().editorGen.diagramUpdater)-»
-	«EXPAND impl::diagram::update::CanonicalUpdate::executeLayoutCommand('createdViews')-»
-	
-	makeViewsImmutable(createdViews);
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenChildContainer»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt
deleted file mode 100644
index 6a3d65580e3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/diagram/editpolicies/DiagramCanonicalEditPolicy.xpt
+++ /dev/null
@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Artem Tikhomirov               moved from xpt::diagram::editpolicies to diagram::editpolicies API location
- *                                   [281014] pass semantic hints right from the CEP
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editPoliciesPackageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «canonicalEditPolicyClassName» extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy {
-	«REM»
-		Perhaps, we need to supply implementation of refreshOnActivate() identical to that in CanonicalConnectionEditPolicy,
-		if we observe troubles like in the bug 114992. Although I suspect the fact we do no check for EP being active when creating
-		a connection implies we don't need this method.
-	«ENDREM»
-
-	«EXPAND impl::diagram::update::CanonicalUpdate::body-»
-
-	«EXPAND refreshSemanticMethod-»
-	«EXPAND refreshLinks-»
-	«EXPAND impl::diagram::update::domain2notation::DomainToNotationClass-»
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE refreshSemanticMethod FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected void refreshSemantic() {
-	if (resolveSemanticElement() == null) {
-		return;
-	}
-	«EXPAND CodeStyle::newGenericInstance('createdViews', 'java.util.LinkedList', 'org.eclipse.core.runtime.IAdaptable')»();
-	«EXPAND impl::diagram::update::CanonicalUpdate::refreshSemanticChildren('createdViews', editorGen.diagramUpdater)-»
-
-	«IF links->notEmpty()-»
-		«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.core.runtime.IAdaptable')» createdConnectionViews = refreshConnections();
-	«ENDIF-»
-
-	«EXPAND impl::diagram::update::CanonicalUpdate::executeLayoutCommand('createdViews')-»
-
-	«IF links->notEmpty()-»
-		createdViews.addAll(createdConnectionViews);
-	«ENDIF-»
-
-	makeViewsImmutable(createdViews);
-}
-«ENDDEFINE»
-
-«DEFINE refreshLinks FOR gmfgen::GenDiagram-»
-	«IF links->notEmpty()-»
-		«EXPAND refreshConnectionsMethod-»
-		
-		«EXPAND impl::diagram::update::CanonicalUpdate::refreshConnectionsAuxMethods-»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE refreshConnectionsMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.core.runtime.IAdaptable')» refreshConnections() {
-		«EXPAND impl::diagram::update::CanonicalUpdate::refreshConnectionsBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/emf-merge.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/emf-merge.xml
deleted file mode 100644
index c6d592a52d4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/emf-merge.xml
+++ /dev/null
@@ -1,233 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<merge:options 
-  indent="  "  
-  braceStyle="matching"  
-  redirect="Gen"
-  block="\s*@\s*generated\s*NOT\s*(?:\n\r?|\r\n?)"
-  noImport="\s*//\s*import\s+([\w.*]*)\s*;\s*(?:\n\r?|\r\n?)"
-  xmlns:merge="http://www.eclipse.org/org/eclipse/emf/codegen/jmerge/Options">
-
-<!-- Tabbed Standard
-
-  indent="&#x9;"  
-  braceStyle="standard"  
-
--->
-
-  <!-- this accepts both new and old style markup. -->
-
-  <merge:dictionaryPattern
-    name="modelMembers" 
-    select="Member/getComment" 
-    match="@\s*(model)"/>
-
-  <merge:dictionaryPattern
-    name="generatedUnmodifiableMembers" 
-    select="Member/getComment" 
-    match="@\s*(gen)erated\s*(This field/method[^(?:\n\r?|\r\n?)]*)*(?:\n\r?|\r\n?)"/>
-
-  <merge:dictionaryPattern
-    name="generatedModifiableMembers" 
-    select="Member/getComment" 
-    match="@\s*generated\s*(modifiable)\s*(?:\n\r?|\r\n?)"/>
-
-  <!-- This is like the above, but for backward compatibility -->
-  <merge:dictionaryPattern
-    name="generatedLastGenMembers" 
-    select="Member/getComment" 
-    match="@\s*(lastgen).*(?:\n\r?|\r\n?)"/>
-
-  <merge:dictionaryPattern
-    name="orderedMembers" 
-    select="Member/getComment" 
-    match="@\s*(ordered)\s*(?:\n\r?|\r\n?)"/>
-
-  <!-- Only push Annotations for the Members marked by gen-->
-  <merge:push targetParentMarkup="^gen$" select="Annotation"/>
-
-  <merge:pull 
-    sourceMarkup="^modifiable$"
-    sourceGet="Member/getComment"
-    sourceTransfer="(\s*&lt;!--\s*begin-user-doc.*?end-user-doc\s*-->\s*)(?:\n\r?|\r\n?)"
-    targetMarkup="^modifiable$"
-    targetPut="Member/setComment"/>
-  <merge:pull 
-    sourceMarkup="^gen$"
-    sourceGet="Member/getComment"
-    sourceTransfer="(\s*&lt;!--\s*begin-user-doc.*?end-user-doc\s*-->\s*)(?:\n\r?|\r\n?)"
-    targetMarkup="^gen$"
-    targetPut="Member/setComment"/>
-  <merge:pull 
-    sourceGet="Member/getFlags"
-    targetMarkup="^gen$"
-    equals="Member/getName"
-    targetPut="Member/setFlags"/>
-
-  <merge:pull 
-    sourceMarkup="^gen$"
-    sourceGet="AbstractType/getComment"
-    sourceTransfer="(\s*&lt;!--\s*begin-user-doc.*?end-user-doc\s*-->\s*)(?:\n\r?|\r\n?)"
-    targetMarkup="^modifiable$"
-    targetPut="AbstractType/setComment"/>
-
-  <merge:pull 
-    sourceGet="Type/getTypeParameters"
-    targetMarkup="^lastgen$|^gen$|^modifiable$|^model$"
-    targetPut="Type/setTypeParameters"/>
-  <merge:pull 
-    sourceGet="Type/getSuperclass"
-    targetMarkup="^lastgen$|^gen$|^modifiable$|^model$"
-    targetPut="Type/setSuperclass"/>
-  <merge:pull 
-    sourceGet="Type/getSuperInterfaces"
-    sourceTransfer="(\s*@\s*extends|\s*@\s*implements)(.*?)(?:&lt;!--|(?:\n\r?|\r\n?))"
-    targetMarkup="^lastgen$|^gen$|^modifiable$|^model$"
-    targetPut="Type/addSuperInterface"/>
-
-  <merge:pull 
-    sourceGet="Enum/getSuperInterfaces"
-    sourceTransfer="(\s*@\s*extends|\s*@\s*implements)(.*?)(?:&lt;!--|(?:\n\r?|\r\n?))"
-    targetMarkup="^lastgen$|^gen$|^modifiable$|^model$"
-    targetPut="Enum/addSuperInterface"/>
-
-  <merge:pull 
-    sourceGet="EnumConstant/getArguments"
-    targetMarkup="^lastgen$|^gen$|^modifiable$|^model$"
-    targetPut="EnumConstant/setArguments"/>
-  <merge:pull 
-    sourceGet="EnumConstant/getBody"
-    targetMarkup="^lastgen$|^gen$|^modifiable$|^model$$"
-    targetPut="EnumConstant/setBody"/>
-
-  <merge:pull 
-    sourceGet="AnnotationTypeMember/getType"
-    targetMarkup="^gen$"
-    targetPut="AnnotationTypeMember/setType"/>
-  <merge:pull 
-    sourceGet="AnnotationTypeMember/getDefaultValue"
-    targetMarkup="^gen$"
-    targetPut="AnnotationTypeMember/setDefaultValue"/>
-
-  <merge:pull 
-    sourceGet="Initializer/getBody"
-    targetMarkup="^gen$"
-    targetPut="Initializer/setBody"/>
-
-  <merge:pull 
-    sourceGet="Field/getType"
-    targetMarkup="^gen$"
-    targetPut="Field/setType"/>
-  <merge:pull 
-    sourceGet="Field/getInitializer"
-    targetMarkup="^gen$"
-    targetPut="Field/setInitializer"/>
-
-  <merge:pull 
-    sourceGet="Method/getTypeParameters"
-    targetMarkup="^gen$"
-    targetPut="Method/setTypeParameters"/>
-  <merge:pull 
-    sourceGet="Method/getReturnType"
-    targetMarkup="^gen$|^model$"
-    targetPut="Method/setReturnType"/>
-  <merge:pull 
-    sourceGet="Method/getParameters"
-    targetMarkup="^gen$"
-    targetPut="Method/setParameters"/>
-  <merge:pull 
-    sourceGet="Method/getBody"
-    targetMarkup="^gen$"
-    targetPut="Method/setBody"/>
-  <merge:pull 
-    sourceGet="Method/getExceptions"
-    targetMarkup="^gen$"
-    targetPut="Method/addException"/>
-
-  <merge:sweep markup="^gen$" select="Member"/>
-  <merge:sweep markup="^org.eclipse.emf.ecore.EMetaObject$" select="Import"/>
-  <merge:sweep markup="^org.eclipse.emf.ecore.impl.EMetaObjectImpl$" select="Import"/>
-  <merge:sweep markup="^org.eclipse.emf.ecore.util.EObjectCompositeEList$" select="Import"/>
-  <merge:sweep markup="^org.eclipse.emf.ecore.util.EObjectCompositeWithInverseEList$" select="Import"/>
-  <merge:sweep markup="^org.eclipse.emf.common.util.AbstractEnumerator$" select="Import"/>
-
-  <merge:sort markup="^ordered$" select="Field"/>
-  <merge:sort markup="^ordered$" select="EnumConstant"/>
-
-<!-- Basic Rules
-
-    <merge:pull 
-      sourceGet="CompilationUnit/getHeader"
-      targetPut="CompilationUnit/setHeader"/>
-
-    <merge:pull 
-      sourceGet="Package/getName"
-      targetPut="Package/setName"/>
-
-    <merge:pull 
-      sourceGet="Member/getFlags"
-      targetPut="Member/setFlags"/>
-    <merge:pull 
-      sourceGet="Member/getComment"
-      targetPut="Member/setComment"/>
-
-    <merge:pull 
-      sourceGet="Type/getSuperclass"
-      targetPut="Type/setSuperclass"/>
-    <merge:pull 
-      sourceGet="Type/getSuperInterfaces"
-      targetPut="Type/addSuperInterface"/>
-
-    <merge:pull 
-      sourceGet="Initializer/getBody"
-      targetPut="Initializer/setBody"/>
-
-    <merge:pull 
-      sourceGet="Field/getType"
-      targetPut="Field/setType"/>
-    <merge:pull 
-      sourceGet="Field/getInitializer"
-      targetPut="Field/setInitializer"/>
-
-    <merge:pull 
-      sourceGet="Method/getBody"
-      targetPut="Method/setBody"/>
-    <merge:pull 
-      sourceGet="Method/getReturnType"
-      targetPut="Method/setReturnType"/>
-    <merge:pull 
-      sourceGet="Method/getExceptions"
-      targetPut="Method/addException"/>
--->
-
-<!-- Push Enum Constants only for generated Enums -->
-<!-- 
-  <merge:push targetParentMarkup="^gen$" select="EnumConstant"/>
--->
-
-<!-- Push Annotation Type Members only for generated Annotation Types -->
-<!--
-  <merge:push targetParentMarkup="^gen$" select="AnnotationTypeMember"/>
--->
-
-<!-- Sets the content of annotations if the parent is marked with gen --> 
-<!--
-    <merge:pull 
-      sourceGet="Annotation/getContents"
-      targetParentMarkup="^gen$"
-      targetPut="Annotation/setContents"/>
--->      
-
-<!-- Remove annotations of generated target nodes if the annotation is not in the source -->
-<!--
-  <merge:sweep parentMarkup="^gen$" select="Annotation"/>
--->    
-
-<!-- 
-    <merge:pull 
-      sourceMarkup="^modifiable$"
-      sourceGet="Member/getComment"
-      targetMarkup="^gen$"
-      targetPut="Member/setComment"/>
--->
-
-</merge:options>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/CreateShortcutAction.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/CreateShortcutAction.xpt
deleted file mode 100644
index 844e76be99e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/CreateShortcutAction.xpt
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - [174961] migration to Commands/Handlers 
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::editor::Utils»
-«EXTENSION xpt::StringOperations»
-
-«DEFINE Main FOR gmfgen::CreateShortcutAction-»
-«EXPAND xpt::Common::copyright FOR owner.editorGen-»
-«EXPAND xpt::Common::packageStatement FOR qualifiedClassName»
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND className»«EXPAND extendsList» {
-«EXPAND _constructor-»
-«EXPAND createChooserDialog-»
-«EXPAND createShortcutDecorationCommand-»
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE className FOR gmfgen::CreateShortcutAction»«qualifiedClassName.xpandSplit('\\.')->last()»«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::CreateShortcutAction» extends org.eclipse.gmf.tooling.runtime.part.DefaultCreateShortcutHandler«ENDDEFINE»
-«DEFINE implementsList FOR gmfgen::CreateShortcutAction»«ENDDEFINE» 
-
-«DEFINE _constructor FOR gmfgen::CreateShortcutAction-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «EXPAND className»() {
-		this(«owner.editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getLogHelper());
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «EXPAND className»(org.eclipse.gmf.tooling.runtime.LogHelper logHelper) {
-		super(logHelper, «EXPAND xpt::plugin::Activator::preferenceHintAccess FOR owner.editorGen»);
-	}
-«ENDDEFINE»
-
-«DEFINE createShortcutDecorationCommand FOR gmfgen::CreateShortcutAction-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override FOR owner.editorGen.diagram-»
-	public org.eclipse.gmf.runtime.common.core.command.ICommand createShortcutDecorationCommand(org.eclipse.gmf.runtime.notation.View view, org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain, java.util.List<org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor> descriptors) {
-		return new «owner.editorGen.diagram.getCreateShortcutDecorationsCommandQualifiedClassName()»(editingDomain, view, descriptors);
-	}
-«ENDDEFINE»
-
-«DEFINE createChooserDialog FOR gmfgen::CreateShortcutAction-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override FOR owner.editorGen.diagram-»
-	public org.eclipse.gmf.tooling.runtime.part.DefaultElementChooserDialog createChooserDialog(org.eclipse.swt.widgets.Shell parentShell, org.eclipse.gmf.runtime.notation.View view) {
-		return new «owner.editorGen.diagram.getElementChooserQualifiedClassName()»(parentShell, view);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::CreateShortcutAction»«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«IF null <> editorGen.application-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForCreateShortcutOpenModel()), 'Select model to reference')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForCreateShortcutWizard()), 'Create shortcut')-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-«IF null <> editorGen.application-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForCreateShortcutOpenModel()))-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForCreateShortcutWizard()))-»
-«ENDIF-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/CustomAction.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/CustomAction.xpt
deleted file mode 100644
index 5808c253010..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/CustomAction.xpt
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::StringOperations»
-
-«DEFINE Main FOR gmfgen::GenCustomAction-»
-«EXPAND xpt::Common::copyright FOR owner.editorGen-»
-«EXPAND xpt::Common::packageStatement FOR qualifiedClassName»
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «qualifiedClassName.xpandSplit('\\.')->last()» extends org.eclipse.core.commands.AbstractHandler {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public Object execute(org.eclipse.core.commands.ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
-		org.eclipse.ui.IEditorPart diagramEditor = org.eclipse.ui.handlers.HandlerUtil.getActiveEditorChecked(event);
-		org.eclipse.jface.viewers.ISelection selection = org.eclipse.ui.handlers.HandlerUtil.getCurrentSelectionChecked(event);
-		// FIXME implement required behavior
-		throw new UnsupportedOperationException();
-	}
-}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/LoadResourceAction.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/LoadResourceAction.xpt
deleted file mode 100644
index c21de3943bd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/LoadResourceAction.xpt
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - [174961] migration to Commands/Handlers
- *    Michael Golubev - [403581] - not generation-dependent code extracted to gmft.runtime 
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::StringOperations»
-
-«DEFINE Main FOR gmfgen::LoadResourceAction-»
-«EXPAND xpt::Common::copyright FOR owner.editorGen-»
-«EXPAND xpt::Common::packageStatement FOR qualifiedClassName»
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «qualifiedClassName.xpandSplit('\\.')->last()»«EXPAND extendsList»«EXPAND implementsList» {
-«EXPAND executeMethod»
-«EXPAND additions»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::LoadResourceAction» extends org.eclipse.gmf.tooling.runtime.actions.DefaultLoadResourceAction«ENDDEFINE»
-«DEFINE implementsList FOR gmfgen::LoadResourceAction»«ENDDEFINE» 
-
-«DEFINE executeMethod FOR gmfgen::LoadResourceAction-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public Object execute(org.eclipse.core.commands.ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
-		return super.execute(event);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::LoadResourceAction»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/MenuAction.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/MenuAction.qvto
deleted file mode 100644
index d2a37e29c71..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/MenuAction.qvto
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library MenuAction;
-
-helper hasCommandsToContribute(editorGen : gmfgen::GenEditorGenerator) : Boolean {
-	return not editorGen.contextMenus->isEmpty()
-}
-
-helper hasHandlersToContribute(editorGen : gmfgen::GenEditorGenerator) : Boolean {
-	return hasCommandsToContribute(editorGen)
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/PredefinedAction.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/PredefinedAction.xpt
deleted file mode 100644
index 7653779fcb1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/PredefinedAction.xpt
+++ /dev/null
@@ -1,27 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenAction»«ERROR 'Asbtract template for ' + self.repr()»«ENDDEFINE»
-
-«DEFINE Main FOR gmfgen::LoadResourceAction»«EXPAND LoadResourceAction::Main»«ENDDEFINE»
-
-// XXX The reason we need editorGen here as an arument (not self.owner.editorGen) is we don't have 'honest' InitDiagramAction at the moment, and create it on the fly 
-«DEFINE Main(editorGen : gmfgen::GenEditorGenerator) FOR gmfgen::InitDiagramAction»«EXPAND xpt::editor::InitDiagramFileAction::InitDiagramFileAction(editorGen)»«ENDDEFINE»
-// This one is legal version of the above method
-«DEFINE Main FOR gmfgen::InitDiagramAction»«EXPAND xpt::editor::InitDiagramFileAction::InitDiagramFileAction(owner.editorGen)»«ENDDEFINE»
-
-«DEFINE Main FOR gmfgen::CreateShortcutAction»«EXPAND CreateShortcutAction::Main»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/extensions.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/extensions.xpt
deleted file mode 100644
index 2e62f79c940..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/actions/extensions.xpt
+++ /dev/null
@@ -1,157 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION impl::actions::MenuAction»
-«EXTENSION xpt::StringOperations»
-
-«DEFINE Main FOR gmfgen::GenEditorGenerator»
-   <extension point="org.eclipse.ui.menus" id="context-menus">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <!-- menuContribution locationURI="menu:org.eclipse.ui.main.menu?after=«»">
-      </menuContribution>
-      <menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar?after=«»">
-      </menuContribution -->
-«EXPAND menuContribution FOREACH contextMenus-»
-   </extension>
-
-«IF hasCommandsToContribute(self)-»
-   <extension point="org.eclipse.ui.commands" id="menu-commands">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <category id="«editor.iD»" name="%cmdcategory.name" description="%cmdcategory.desc"/>
-«EXPAND commandContribution FOREACH contextMenus-»
-   </extension>
-«ENDIF-»
-
-«IF hasHandlersToContribute(self)-»
-   <extension point="org.eclipse.ui.handlers" id="menu-handlers">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-«EXPAND handlerContribution FOREACH contextMenus-»
-   </extension>
-«ENDIF-»
-
-   <!-- optionally, specify keybindings -->
-«ENDDEFINE»
-
-«DEFINE menuContribution FOR gmfgen::GenContextMenu-»
-«EXPAND _menuContribution(self, 'popup:org.eclipse.gmf.runtime.diagram.ui.DiagramEditorContextMenu')-»
-«ENDDEFINE»
-
-«DEFINE menuContribution(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenContributionManager»«ERROR 'Abstract menuContribution for ' + self.repr()»«ENDDEFINE»
-«DEFINE menuContribution(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenMenuManager»«EXPAND _menuContribution(contextMenu, 'popup:' + iD)»«ENDDEFINE»
-«DEFINE menuContribution(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenToolBarManager»«EXPAND _menuContribution(contextMenu, 'toolbar:' + iD)»«ENDDEFINE»
-
-«DEFINE _menuContribution(contextMenu : gmfgen::GenContextMenu, locationURI : String) FOR gmfgen::GenContributionManager-»
-      <menuContribution locationURI="«locationURI»">
-«EXPAND menuEntry(contextMenu) FOREACH items-»
-      </menuContribution>
-«EXPAND menuContribution(contextMenu) FOREACH items[gmfgen::GenContributionManager]-»
-«ENDDEFINE»
-
-
-«DEFINE commandContribution FOR gmfgen::GenContributionManager-»
-«EXPAND commandContribution FOREACH items[gmfgen::GenCustomAction]-»
-«EXPAND commandContribution FOREACH items[gmfgen::GenAction]-»
-«EXPAND commandContribution FOREACH items[gmfgen::GenContributionManager]-»
-«ENDDEFINE»
-
-«DEFINE handlerContribution FOR gmfgen::GenContributionManager-»
-«EXPAND handlerContribution FOREACH items[gmfgen::GenCustomAction]-»
-«EXPAND handlerContribution FOREACH items[gmfgen::GenContributionManager]-»
-«ENDDEFINE»
-
-«DEFINE commandContribution FOR gmfgen::GenCustomAction-»
-      <command id="«EXPAND commandIdentifier»"
-         name="«name»"
-         categoryId="«owner.editorGen.editor.iD»"/>
-«ENDDEFINE»
-
-«DEFINE commandContribution FOR gmfgen::GenAction-»
-      <command id="«EXPAND commandIdentifier»"
-         name="«name/*FIXME: into i18n keys*/»"
-         categoryId="«owner.editorGen.editor.iD»"
-         defaultHandler="«qualifiedClassName»"/>
-«ENDDEFINE»
-
-«DEFINE handlerContribution FOR gmfgen::GenCustomAction-»
-      <handler
-         commandId="«EXPAND commandIdentifier»"
-         class="«qualifiedClassName»">
-         <enabledWhen>
-           <with variable="activePartId"><equals value="«owner.editorGen.editor.iD»"/></with>
-         </enabledWhen>
-      </handler>
-«ENDDEFINE»
-
-«DEFINE commandIdentifier FOR gmfgen::GenCustomAction»«owner.editorGen.plugin.iD».«qualifiedClassName.xpandSplit('\\.')->last()»«ENDDEFINE»
-«DEFINE commandIdentifier FOR gmfgen::GenAction»«owner.editorGen.plugin.iD».«qualifiedClassName.xpandSplit('\\.')->last()»«ENDDEFINE»
-
-«DEFINE menuEntry(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenContributionItem»«REM»NO-OP XXX or ERROR?«ENDREM»«ENDDEFINE»
-«DEFINE menuEntry(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenSeparator-»
-         <separator «IF groupName <> null»name="«groupName»" «ENDIF»visible="true"/>
-«ENDDEFINE»
-«DEFINE menuEntry(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenGroupMarker-»
-         <separator name="«groupName»"/>
-«ENDDEFINE»
-«DEFINE menuEntry(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenCommandAction-»
-         <command commandId="«commandIdentifier»">
-            <visibleWhen>
-«EXPAND menuCondition FOR contextMenu-»
-            </visibleWhen>
-         </command>
-«ENDDEFINE»
-«DEFINE menuEntry(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenCustomAction-»
-         <command commandId="«EXPAND commandIdentifier»">
-            <visibleWhen>
-«EXPAND menuCondition FOR contextMenu-»
-            </visibleWhen>
-         </command>
-«ENDDEFINE»
-«DEFINE menuEntry(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenAction-»
-         <command commandId="«EXPAND commandIdentifier»">
-            <visibleWhen>
-«EXPAND menuCondition FOR contextMenu-»
-            </visibleWhen>
-         </command>
-«ENDDEFINE»
-
-«DEFINE menuEntry(contextMenu : gmfgen::GenContextMenu) FOR gmfgen::GenMenuManager»
-         <menu id="«iD»" label="«name»">
-            <visibleWhen>
-«EXPAND menuCondition FOR contextMenu-»
-            </visibleWhen>
-         </menu>
-«ENDDEFINE»
-
-«DEFINE menuCondition FOR gmfgen::GenContextMenu-»
-               <and>
-                  <with variable="activePartId"><equals value="«editorGen.editor.iD»"/></with>
-                  <with variable="selection"><iterate ifEmpty="false">«IF context->size() > 1»<or>«ENDIF» 
-«REM»XXX, perhaps, <adapt type="EditPart">?«ENDREM-»
-«FOREACH context AS de-»
-                     <instanceof value="«de.getEditPartQualifiedClassName()»"/>
-«ENDFOREACH-»
-                  «IF context->size() > 1»</or>«ENDIF»</iterate></with>
-               </and>
-«ENDDEFINE»
-
-«DEFINE i18n FOR gmfgen::GenEditorGenerator-»
-«IF hasCommandsToContribute(self)-»
-# Commands and menu actions
-cmdcategory.name=«modelID» Editor Commands
-cmdcategory.desc=«modelID» Editor Commands
-«ENDIF»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/build/BuildUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/build/BuildUtils.qvto
deleted file mode 100644
index 6a34eaa7d58..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/build/BuildUtils.qvto
+++ /dev/null
@@ -1,46 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import gmf.EMFUtils;
-
-/*
- *               TEMPORARY WORKAROUND FOR GMFGen elements not compatible with EObject blackbox helpers
- *               GET RID OF THIS FILE ONCE issues with blackbox impl are resolved.
- *               This library merely "exports" error messages from antbuild.xpt to keep it clean.
- */
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-library BuildUtils;
-
-query GenEditorGenerator::uri() : String { return self.oclAsType(ecore::EObject).uri(); }
-query GenEditorGenerator::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-
-query GenCommonBase::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenEditorView::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query Behaviour::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query ElementType::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenPreferencePage::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenPropertySheet::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenPropertyTab::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenNavigator::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenPlugin::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query Palette::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenDiagramUpdater::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenApplication::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenParserImplementation::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenParsers::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenContributionItem::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
-query GenExpressionInterpreter::uriFragment() : String { return self.oclAsType(ecore::EObject).uriFragment(); }
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/build/antbuild.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/build/antbuild.xpt
deleted file mode 100644
index fbc76539f39..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/build/antbuild.xpt
+++ /dev/null
@@ -1,753 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION impl::build::BuildUtils /*gmf::EMFUtils*/»
-
-«DEFINE Main FOR gmfgen::GenEditorGenerator-»
-<?xml version="1.0" encoding="UTF-8"?>
-<project default="main" xmlns:xpt="eclipse.org/gmf/2008/xpand">
-<!-- Ant script analogous to org.eclipse.papyrus.gmf.codegen.util.Generator -->
-
-  <!-- Input, EMF Resource URI (just resource, not GenEditorGenerator element) -->
-  <property name="inputURI" value="«self.uri().substringBefore('#' + self.uriFragment())»"/>
-  <property name="outputRoot" value="c:/temp"/>«REM»TODO: Perhaps, may use empty for workspace? Need to check generation task impl«ENDREM»<!-- ${osgi.instance.area} -->
-
-
-  <target name="main" depends="init">
-«EXPAND mainTarget-»
-  </target>
-
-«EXPAND externalizeSupportTask»
-«EXPAND sharedCommandsTask»
-«EXPAND parsersTask FOR labelParsers-»
-«EXPAND editpoliciesTask FOR diagram»
-«EXPAND providersTask FOR diagram»
-«IF diagram.validationEnabled or (not audits.oclIsUndefined() and audits.rules->notEmpty())-»
-«EXPAND auditsTask FOR diagram-»
-«ENDIF-»
-«EXPAND metricsTask FOR metrics-»
-«EXPAND expressionProvidersTask FOR expressionProviders-»
-«EXPAND diagramupdateTask FOR diagramUpdater-»
-«EXPAND preferencesTask FOR diagram-»
-«EXPAND editorTask FOR editor»
-«EXPAND navigatorTask FOR navigator-»
-«EXPAND propertysheetTask FOR propertySheet-»
-«EXPAND pluginTask FOR plugin»
-«EXPAND rcpApplicationTask FOR application-»
-«EXPAND actionsTask-»
-
-  <target name="init">
-    
-    <!-- Destination -->
-    <property name="outputPluginRoot" value="${outputRoot}/«plugin.iD»/"/>
-    <property name="outputJavaRoot" value="${outputPluginRoot}/src/"/>
-    <!-- Template location -->
-    <property name="templateRoot" value="platform:/plugin/org.eclipse.papyrus.gmf.codegen/templates/«IF dynamicTemplates»,«self.templateDirectory»«ENDIF»"/>
-    <!-- Template names -->
-    <property name="NodeItemSemanticEditPolicyEmitter" value="xpt::diagram::editpolicies::NodeItemSemanticEditPolicy::NodeItemSemanticEditPolicy"/>
-    <property name="CreateNodeCommandEmitter" value="xpt::diagram::commands::CreateNodeCommand::CreateNodeCommand"/>
-    <property name="NodeEditPartEmitter" value="diagram::editparts::NodeEditPart::Main"/>
-    <property name="OpenDiagramEditPolicyEmitter" value="xpt::diagram::editpolicies::OpenDiagram::OpenDiagram"/>
-    <property name="ChildContainerCanonicalEditPolicyEmitter" value="diagram::editpolicies::ChildContainerCanonicalEditPolicy::Main"/>
-    <property name="GraphicalNodeEditPolicyEmitter" value="xpt::diagram::editpolicies::GraphicalNodeEditPolicy::GraphicalNodeEditPolicy"/>
-    <property name="ExternalNodeLabelEditPartEmitter" value="diagram::editparts::ExternalNodeLabelEditPart::Main"/>
-    <property name="NodeLabelEditPartEmitter" value="diagram::editparts::NodeLabelEditPart::Main"/>
-    <property name="ChildNodeLabelEditPartEmitter" value="diagram::editparts::ChildNodeLabelEditPart::Main"/>
-    <property name="CompartmentEditPartEmitter" value="diagram::editparts::CompartmentEditPart::Main"/>
-    <property name="CompartmentItemSemanticEditPolicyEmitter" value="xpt::diagram::editpolicies::CompartmentItemSemanticEditPolicy::CompartmentItemSemanticEditPolicy"/>
-    <property name="LinkEditPartEmitter" value="diagram::editparts::LinkEditPart::Main"/>
-    <property name="LinkItemSemanticEditPolicyEmitter" value="xpt::diagram::editpolicies::LinkItemSemanticEditPolicy::LinkItemSemanticEditPolicy"/>
-    <property name="LinkLabelEditPartEmitter" value="diagram::editparts::LinkLabelEditPart::Main"/>
-    <property name="CreateLinkCommandEmitter" value="xpt::diagram::commands::CreateLinkCommand::Main"/>
-    <property name="ReorientLinkCommandEmitter" value="xpt::diagram::commands::ReorientLinkCommand::ReorientLinkCommand"/>
-    <property name="ReorientRefLinkCommandEmitter" value="xpt::diagram::commands::ReorientRefLinkCommand::ReorientRefLinkCommand"/>
-    <property name="EditHelperEmitter" value="xpt::diagram::edithelpers::EditHelper::EditHelper"/>
-    <property name="EditHelperAdviceEmitter" value="xpt::diagram::edithelpers::EditHelperAdvice::EditHelperAdvice"/>
-    <property name="DiagramEditPartEmitter" value="diagram::editparts::DiagramEditPart::Main"/>
-    <property name="EditPartFactoryEmitter" value="xpt::diagram::editparts::EditPartFactory::EditPartFactory"/>
-    <property name="ElementInitializersEmitter" value="xpt::providers::ElementInitializers::ElementInitializers"/>
-    <property name="ElementTypesEmitter" value="xpt::providers::ElementTypes::ElementTypes"/>
-    <!-- Preferences -->
-    <property name="PreferenceInitializerEmitter" value="xpt::diagram::preferences::PreferenceInitializer::PreferenceInitializer"/>
-    <property name="CustomPreferencePageEmitter" value="impl::preferences::CustomPage::Main"/>
-    <property name="StandardPreferencePageEmitter" value="impl::preferences::StandardPage::Main"/>
-    <!-- Property Sheet -->
-    <property name="PropertySheetLabelProviderEmitter" value="xpt::propsheet::LabelProvider::Class"/>
-    <property name="PropertySectionEmitter" value="xpt::propsheet::PropertySection::Class"/>
-    <!-- Navigator -->
-    <property name="NavigatorContentProviderEmitter" value="xpt::navigator::NavigatorContentProvider::NavigatorContentProvider"/>
-    <property name="NavigatorLabelProviderEmitter" value="xpt::navigator::NavigatorLabelProvider::NavigatorLabelProvider"/>
-    <property name="NavigatorLinkHelperEmitter" value="xpt::navigator::NavigatorLinkHelper::NavigatorLinkHelper"/>
-    <property name="NavigatorSorterEmitter" value="xpt::navigator::NavigatorSorter::NavigatorSorter"/>
-    <property name="NavigatorActionProviderEmitter" value="xpt::navigator::NavigatorActionProvider::NavigatorActionProvider"/>
-    <property name="AbstractNavigatorItemEmitter" value="xpt::navigator::AbstractNavigatorItem::AbstractNavigatorItem"/>
-    <property name="NavigatorGroupEmitter" value="xpt::navigator::NavigatorGroup::NavigatorGroup"/>
-    <property name="NavigatorItemEmitter" value="xpt::navigator::NavigatorItem::NavigatorItem"/>
-    <!-- <property name="navigator group icon" value=""/> -->
-    <property name="DomainNavigatorContentProviderEmitter" value="xpt::navigator::DomainNavigatorContentProvider::DomainNavigatorContentProvider"/>
-    <property name="DomainNavigatorLabelProviderEmitter" value="xpt::navigator::DomainNavigatorLabelProvider::DomainNavigatorLabelProvider"/>
-    <property name="DomainNavigatorItemEmitter" value="xpt::navigator::DomainNavigatorItem::DomainNavigatorItem"/>
-    <property name="URIEditorInputTesterEmitter" value="xpt::editor::UriEditorInputTester::UriEditorInputTester"/>
-    <!-- Diagram Updater -->
-    <property name="DiagramUpdaterEmitter" value="xpt::diagram::updater::DiagramUpdater::DiagramUpdater"/>
-    <property name="UpdateCommandEmitter" value="xpt::diagram::updater::UpdateCommand::UpdateCommand"/>
-    <property name="NodeDescriptorEmitter" value="xpt::diagram::updater::NodeDescriptor::NodeDescriptor"/>
-    <property name="LinkDescriptorEmitter" value="xpt::diagram::updater::LinkDescriptor::LinkDescriptor"/>
-    <!--Plugin -->
-    <property name="ActivatorEmitter" value="xpt::plugin::Activator::Activator"/>
-    <property name="BundleManifestEmitter" value="xpt::plugin::manifest::manifest"/>
-    <property name="PluginXmlEmitter" value="xpt::plugin::plugin::plugin"/>
-    <property name="PluginPropertiesEmitter" value="xpt::plugin::properties::properties"/>
-    <property name="BuildPropertiesEmitter" value="xpt::plugin::build::build"/>
-    <property name="OptionsFileEmitter" value="xpt::plugin::options::options"/>
-    <!-- Editor -->
-    <property name="EditorEmitter" value="xpt::editor::Editor::Editor"/>
-    <property name="ActionBarContributorEmitter" value="xpt::editor::ActionBarContributor::ActionBarContributor"/>
-    <property name="PaletteEmitter" value="xpt::editor::palette::PaletteFactory::Factory"/>
-    <property name="DiagramEditorUtilEmitter" value="xpt::editor::DiagramEditorUtil::DiagramEditorUtil"/>
-    <property name="VisualIDRegistryEmitter" value="xpt::editor::VisualIDRegistry::VisualIDRegistry"/>
-    <property name="MatchingStrategyEmitter" value="xpt::editor::MatchingStrategy::MatchingStrategy"/>
-    <property name="DocumentProviderEmitter" value="xpt::editor::DocumentProvider::DocumentProvider"/>
-    <property name="ShortcutsDecoratorProviderEmitter" value="xpt::providers::ShortcutsDecoratorProvider::ShortcutsDecoratorProvider"/>
-    <property name="ShortcutPropertyTesterEmitter" value="xpt::editor::ShortcutPropertyTester::ShortcutPropertyTester"/>
-    <!-- RCP Application -->
-    <property name="ApplicationEmitter" value="xpt::application::Application::Application"/>
-    <property name="ActionBarAdvisorEmitter" value="xpt::application::ActionBarAdvisor::ActionBarAdvisor"/>
-    <property name="PerspectiveEmitter" value="xpt::application::Perspective::Perspective"/>
-    <property name="WorkbenchAdvisorEmitter" value="xpt::application::WorkbenchAdvisor::WorkbenchAdvisor"/>
-    <property name="WorkbenchWindowAdvisorEmitter" value="xpt::application::WorkbenchWindowAdvisor::WorkbenchWindowAdvisor"/>
-    <property name="WizardNewFileCreationPageEmitter" value="xpt::application::WizardNewFileCreationPage::WizardNewFileCreationPage"/>
-    <!-- Actions -->
-    <property name="CustomActionEmitter" value="impl::actions::CustomAction::Main"/>
-    <property name="PredefinedActionEmitter" value="impl::actions::PredefinedAction::Main"/>
-    <property name="NewDiagramFileWizardEmitter" value="xpt::editor::NewDiagramFileWizard::NewDiagramFileWizard"/>
-    <property name="DiagramContentInitializerEmitter" value="xpt::editor::DiagramContentInitializer::DiagramContentInitializer"/>
-    <property name="ModelElementSelectionPageEmitter" value="xpt::editor::ModelElementSelectionPage::ModelElementSelectionPage"/>
-    <property name="CreateShortcutDecorationsCommandEmitter" value="xpt::diagram::commands::CreateShortcutDecorationsCommand::CreateShortcutDecorationsCommand"/>
-    <property name="ElementChooserEmitter" value="xpt::editor::ElementChooser::ElementChooser"/>
-    <property name="ShortcutCreationWizardEmitter" value="xpt::editor::ShortcutCreationWizard::ShortcutCreationWizard"/>
-    <!-- String externalization -->
-    <property name="ExternalizeEmitter" value="xpt::Externalizer::Access"/>
-    <property name="MessagesEmitter" value="xpt::Externalizer::Values"/>
-    <!-- -->
-    <property name="ReorientLinkViewCommandEmitter" value="xpt::diagram::commands::ReorientLinkViewCommand::ReorientLinkViewCommand"/>
-    <!-- Parsers -->
-    <property name="AbstractParserEmitter" value="impl::parsers::AbstractParser::Main"/>
-    <property name="PredefinedParserEmitter" value="parsers::PredefinedParser::Main"/>
-    <property name="CustomParserEmitter" value="parsers::CustomParser::Main"/>
-    <!-- Providers -->
-    <property name="ViewProviderEmitter" value="xpt::providers::ViewProvider::ViewProvider"/>
-    <property name="EditPartProviderEmitter" value="xpt::providers::EditPartProvider::EditPartProvider"/>
-    <property name="ModelingAssistantProviderEmitter" value="xpt::providers::ModelingAssistantProvider::ModelingAssistantProvider"/>
-    <property name="IconProviderEmitter" value="xpt::providers::IconProvider::IconProvider"/>
-    <property name="ParserProviderEmitter" value="parsers::ParserProvider::Main"/>
-    <!-- Edit Policy --> 
-    <property name="BaseItemSemanticEditPolicyEmitter" value="xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::BaseItemSemanticEditPolicy"/>
-    <property name="TextSelectionEditPolicyEmitter" value="xpt::diagram::editpolicies::TextFeedback::TextSelectionEditPolicy"/>
-    <property name="TextNonResizableEditPolicyEmitter" value="xpt::diagram::editpolicies::TextFeedback::TextNonResizableEditPolicy"/>
-    <property name="DiagramCanonicalEditPolicyEmitter" value="diagram::editpolicies::DiagramCanonicalEditPolicy::Main"/>
-    <property name="DiagramItemSemanticEditPolicyEmitter" value="xpt::diagram::editpolicies::DiagramItemSemanticEditPolicy::DiagramItemSemanticEditPolicy"/>
-    <property name="BaseEditHelperEmitter" value="xpt::diagram::edithelpers::BaseEditHelper::BaseEditHelper"/>
-    <!-- wizard to create a diagram -->
-    <property name="CreationWizardEmitter" value="xpt::editor::CreationWizard::CreationWizard"/>
-    <property name="CreationWizardPageEmitter" value="xpt::editor::CreationWizardPage::CreationWizardPage"/>
-    <!-- delete from a diagram action -->
-    <property name="DeleteElementActionEmitter" value="xpt::editor::DeleteElementAction::DeleteElementAction"/>
-    <property name="DiagramEditorContextMenuProviderEmitter" value="xpt::editor::DiagramEditorContextMenuProvider::DiagramEditorContextMenuProvider"/>
-    <!-- Icons -->
-    <property name="ShortcutImageEmitter" value="/xpt/editor/shortcut.gif"/><!-- just a copy -->
-    <property name="GroupIconEmitter" value="/xpt/navigator/navigatorGroup.gif"/><!-- just a copy -->
-    <property name="DiagramIconEmitter" value="/xpt/editor/diagram.gif"/><!-- through EMF GIF Emitter-->
-    <property name="WizardBannerImageEmitter" value="/xpt/editor/wizban.gif"/><!-- through EMF GIF Emitter-->
-    <!-- Audits, metrics and validation -->
-    <property name="MetricProviderEmitter" value="xpt::providers::MetricProvider::MetricProvider"/>
-    <property name="ValidationProviderEmitter" value="xpt::providers::ValidationProvider::ValidationProvider"/>
-    <property name="ValidateActionEmitter" value="xpt::editor::ValidateAction::ValidateAction"/>
-    <property name="ValidationDecoratorProviderEmitter" value="xpt::providers::ValidationDecoratorProvider::ValidationDecoratorProvider"/>
-    <property name="MarkerNavigationProviderEmitter" value="xpt::providers::MarkerNavigationProvider::MarkerNavigationProvider"/>
-    <property name="ValidationMarkerEmitter" value="xpt::editor::ValidationMarker::ValidationMarker"/>
-    <property name="AbstractExpressionEmitter" value="xpt::expressions::AbstractExpression::AbstractExpression"/>
-    <property name="OCLExpressionFactoryEmitter" value="xpt::expressions::OCLExpressionFactory::OCLExpressionFactory"/>
-    <property name="RegexpExpressionFactoryEmitter" value="xpt::expressions::RegexpExpressionFactory::RegexpExpressionFactory"/>
-  </target>
-
-«EXPAND additions»
-</project>
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenEditorGenerator»«ENDDEFINE»
-
-«DEFINE mainTarget FOR gmfgen::GenEditorGenerator-»
-    <antcall target="externalize-support"/>
-    <antcall target="shared-commands"/>
-
-«EXPAND generateNode FOREACH diagram.topLevelNodes-»
-«EXPAND generateChildNode FOREACH diagram.childNodes-»
-«EXPAND generateCompartment FOREACH diagram.compartments-»
-«EXPAND generateLink FOREACH diagram.links-»
-«EXPAND generateDiagram FOR diagram-»
-
-    <antcall target="shared-edit-policy"/>
-    <antcall target="providers"/>
-
-    <antcall target="diagramupdate"/>
-    <antcall target="preferences"/>
-    <antcall target="editor"/>
-    <antcall target="plugin"/>
-
-«IF not labelParsers.oclIsUndefined()-»
-    <antcall target="parsers"/>
-«ENDIF-»
-«IF diagram.validationEnabled or (not audits.oclIsUndefined() and audits.rules->notEmpty())-»
-    <antcall target="audits"/>
-«ENDIF-»
-«IF not metrics.oclIsUndefined()-»
-    <antcall target="metrics"/>
-«ENDIF-»
-«IF not expressionProviders.oclIsUndefined()-»
-    <antcall target="expression-providers"/>
-«ENDIF-»
-«IF not propertySheet.oclIsUndefined()-»
-    <antcall target="propertysheet"/>
-«ENDIF-»
-«IF not navigator.oclIsUndefined()-»
-    <antcall target="navigator"/>
-«ENDIF-»
-«IF not application.oclIsUndefined()-»
-    <antcall target="rcp-app"/>
-«ENDIF-»
-«IF contextMenus->notEmpty()-»
-    <antcall target="actions"/>
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE sharedCommandsTask FOR gmfgen::GenEditorGenerator-»
-  <target name="shared-commands">
-«IF diagram.getAllNodes()->exists(n | not n.modelFacet.oclIsUndefined() and n.reorientedIncomingLinks->notEmpty()) /*see below GraphicalNodeEditPolicyEmitter condition*/-»
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«diagram.uriFragment()»">
-      <xpt:template name="${ReorientLinkViewCommandEmitter}" outfile="${outputJavaRoot}/«diagram.getReorientConnectionViewCommandQualifiedClassName().replace('.','/')».java"/>
-    </xpt:template-set>
-«ENDIF-»
-  </target>
-«ENDDEFINE»
-
-«DEFINE parsersTask FOR gmfgen::GenParsers-»
-  <target name="parsers">
-    <xpt:template-set templateRoot="${templateRoot}">
-«EXPAND invokeParserTemplate FOREACH implementations-»
-«IF implementations->exists(i | i.oclIsKindOf(gmfgen::PredefinedParser))-»
-      <xpt:template name="${AbstractParserEmitter}" outfile="${outputJavaRoot}/«implPackageName.replace('.','/')»/AbstractParser.java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDIF-»
-    </xpt:template-set>
-  </target>
-«ENDDEFINE»
-
-«DEFINE invokeParserTemplate FOR gmfgen::GenParserImplementation»«ERROR 'Abstract template invokeParserTemplate for '.concat(self.repr())»«ENDDEFINE»
-
-«DEFINE invokeParserTemplate FOR gmfgen::PredefinedParser-»
-      <xpt:template name="${PredefinedParserEmitter}" outfile="${outputJavaRoot}/«getQualifiedClassName().replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDDEFINE»
-«DEFINE invokeParserTemplate FOR gmfgen::CustomParser-»
-«IF generateBoilerplate-»
-      <xpt:template name="${CustomParserEmitter}" outfile="${outputJavaRoot}/«qualifiedName.replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDIF-»
-«ENDDEFINE»
-
-
-«REM»
-                                           N O D E
-«ENDREM»
-
-
-«DEFINE generateNode FOR gmfgen::GenNode-»
-    <!-- Node «visualID» -->
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-«EXPAND generateNodeItemSemanticEditPolicy-»
-«EXPAND generateCreateNodeCommand-»
-«EXPAND generateEditSupport-»
-      <xpt:template name="${NodeEditPartEmitter}" outfile="${outputJavaRoot}/«getEditPartQualifiedClassName().replace('.','/')».java"/>
-«EXPAND generateBehaviours-»
-«EXPAND generateChildContainerCanonicalEditPolicy-»
-«IF not modelFacet.oclIsUndefined() and reorientedIncomingLinks->notEmpty()-»
-      <xpt:template name="${GraphicalNodeEditPolicyEmitter}" outfile="${outputJavaRoot}/«getGraphicalNodeEditPolicyQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«EXPAND generateLabel FOREACH labels-»
-    </xpt:template-set>
-«ENDDEFINE»
-
-«DEFINE generateLabel FOR gmfgen::GenExternalNodeLabel-»
-      <xpt:template name="${ExternalNodeLabelEditPartEmitter}" outfile="${outputJavaRoot}/«getEditPartQualifiedClassName().replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDDEFINE»
-
-«DEFINE generateLabel FOR gmfgen::GenNodeLabel-»
-      <xpt:template name="${NodeLabelEditPartEmitter}" outfile="${outputJavaRoot}/«getEditPartQualifiedClassName().replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDDEFINE»
-
-«DEFINE generateBehaviours FOR gmfgen::GenCommonBase-»
-«EXPAND generateOpenDiagramEditPolicy FOREACH behaviour[gmfgen::OpenDiagramBehaviour] /*FIXME take into account shared behaviors! */-»
-«ENDDEFINE»
-
-«DEFINE generateOpenDiagramEditPolicy FOR gmfgen::OpenDiagramBehaviour-»
-      <xpt:template name="${OpenDiagramEditPolicyEmitter}" outfile="${outputJavaRoot}/«getEditPolicyQualifiedClassName().replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDDEFINE»
-
-«DEFINE generateNodeItemSemanticEditPolicy FOR gmfgen::GenNode-»
-«IF not sansDomain-»
-      <xpt:template name="${NodeItemSemanticEditPolicyEmitter}" outfile="${outputJavaRoot}/«getItemSemanticEditPolicyQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE generateCreateNodeCommand FOR gmfgen::GenNode-»
-«IF not modelFacet.oclIsUndefined()-»
-      <xpt:template name="${CreateNodeCommandEmitter}" outfile="${outputJavaRoot}/«getCreateCommandQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE generateEditSupport FOR gmfgen::GenCommonBase-»
-«IF not elementType.definedExternally-»
-«EXPAND generateEditHelperOrAdvice FOR elementType-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE generateEditHelperOrAdvice FOR gmfgen::ElementType»«ERROR 'Abstract template generateEditHelperOrAdvice for ' + self.repr()»«ENDDEFINE»
-«DEFINE generateEditHelperOrAdvice FOR gmfgen::SpecializationType-»
-«IF self.editHelperAdviceClassName <> null /*eIsSet*/-»
-      <xpt:template name="${EditHelperAdviceEmitter}" outfile="${outputJavaRoot}/«getEditHelperAdviceQualifiedClassName().replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDIF-»
-«ENDDEFINE»
-«DEFINE generateEditHelperOrAdvice FOR gmfgen::MetamodelType-»
-      <xpt:template name="${EditHelperEmitter}" outfile="${outputJavaRoot}/«getEditHelperQualifiedClassName().replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDDEFINE»
-
-«DEFINE generateChildContainerCanonicalEditPolicy FOR gmfgen::GenChildContainer-»
-«IF needsCanonicalEditPolicy()-»
-      <xpt:template name="${ChildContainerCanonicalEditPolicyEmitter}" outfile="${outputJavaRoot}/«getCanonicalEditPolicyQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«ENDDEFINE»
-
-
-«REM»
-                                           C H I L D  N O D E
-«ENDREM»
-
-«DEFINE generateChildNode FOR gmfgen::GenChildLabelNode-»
-    <!-- Child Node «visualID» -->
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-«EXPAND generateNodeItemSemanticEditPolicy-»
-«EXPAND generateCreateNodeCommand-»
-«EXPAND generateEditSupport-»
-«EXPAND generateBehaviours-»
-      <xpt:template name="${ChildNodeLabelEditPartEmitter}" outfile="${outputJavaRoot}/«getEditPartQualifiedClassName().replace('.','/')».java"/>
-    </xpt:template-set>
-«ENDDEFINE»
-
-«DEFINE generateChildNode FOR gmfgen::GenChildNode»«EXPAND generateNode»«ENDDEFINE»
-
-«REM»
-                                           C O M P A R T M E N T
-«ENDREM»
-
-«DEFINE generateCompartment FOR gmfgen::GenCompartment-»
-    <!-- Compartment «visualID» -->
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${CompartmentEditPartEmitter}" outfile="${outputJavaRoot}/«getEditPartQualifiedClassName().replace('.','/')».java"/>
-«IF not sansDomain-»
-      <xpt:template name="${CompartmentItemSemanticEditPolicyEmitter}" outfile="${outputJavaRoot}/«getItemSemanticEditPolicyQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«EXPAND generateChildContainerCanonicalEditPolicy-»
-    </xpt:template-set>
-«ENDDEFINE»
-
-«REM»
-                                           L I N K
-«ENDREM»
-
-«DEFINE generateLink FOR gmfgen::GenLink-»
-    <!-- Link «visualID» -->
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-«EXPAND generateEditSupport-»
-      <xpt:template name="${LinkEditPartEmitter}" outfile="${outputJavaRoot}/«getEditPartQualifiedClassName().replace('.','/')».java"/>
-«EXPAND generateBehaviours-»
-«IF not sansDomain-»
-      <xpt:template name="${LinkItemSemanticEditPolicyEmitter}" outfile="${outputJavaRoot}/«getItemSemanticEditPolicyQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«IF not modelFacet.oclIsUndefined() and (targetReorientingAllowed or sourceReorientingAllowed)-»
-      <xpt:template name="${CreateLinkCommandEmitter}" outfile="${outputJavaRoot}/«getCreateCommandQualifiedClassName().replace('.','/')».java"/>
-«IF modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet)-»
-      <xpt:template name="${ReorientLinkCommandEmitter}" outfile="${outputJavaRoot}/«getReorientCommandQualifiedClassName().replace('.','/')».java"/>
-«ELSEIF modelFacet.oclIsKindOf(gmfgen::FeatureLinkModelFacet)-»
-      <xpt:template name="${ReorientRefLinkCommandEmitter}" outfile="${outputJavaRoot}/«getReorientCommandQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«ENDIF-»
-«EXPAND generateLinkLabel FOREACH labels-»
-    </xpt:template-set>
-«ENDDEFINE»
-
-«DEFINE generateLinkLabel FOR gmfgen::GenLinkLabel-»
-      <xpt:template name="${LinkLabelEditPartEmitter}" outfile="${outputJavaRoot}/«getEditPartQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDDEFINE»
-
-«REM»
-                                           D I A G R A M
-«ENDREM»
-
-«DEFINE generateDiagram FOR gmfgen::GenDiagram-»
-    <!-- Diagram «visualID» -->
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-«EXPAND generateEditSupport-»
-      <xpt:template name="${DiagramEditPartEmitter}" outfile="${outputJavaRoot}/«getEditPartQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${EditPartFactoryEmitter}" outfile="${outputJavaRoot}/«getEditPartFactoryQualifiedClassName().replace('.','/')».java"/>«REM» Although, EPFactory is rather about editor, not diagram«ENDREM»
-      <xpt:template name="${ElementInitializersEmitter}" outfile="${outputJavaRoot}/«providersPackageName.replace('.','/')»/ElementInitializers.java"/>
-      <xpt:template name="${ElementTypesEmitter}" outfile="${outputJavaRoot}/«getElementTypesQualifiedClassName().replace('.','/')».java"/>
-«IF needsCanonicalEditPolicy()-»
-      <xpt:template name="${DiagramCanonicalEditPolicyEmitter}" outfile="${outputJavaRoot}/«getCanonicalEditPolicyQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«IF not sansDomain-»
-      <xpt:template name="${DiagramItemSemanticEditPolicyEmitter}" outfile="${outputJavaRoot}/«getItemSemanticEditPolicyQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-«EXPAND generateBehaviours-»
-    </xpt:template-set>
-«ENDDEFINE»
-
-«REM»
-                                           P R E F E R E N C E S
-«ENDREM»
-
-«DEFINE preferencesTask FOR gmfgen::GenDiagram-»
-  <target name="preferences">
-    <xpt:template name="${PreferenceInitializerEmitter}" outfile="${outputJavaRoot}/«preferencesPackageName.replace('.','/')»/DiagramPreferenceInitializer.java"«REM» FIXME - in Generator.java, classname is taken from template - get rid of that practice «ENDREM» 
-      templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»"/>
-«EXPAND generatePreferencePage FOREACH preferencePages-»
-  </target>
-«ENDDEFINE»
-
-«DEFINE generatePreferencePage FOR gmfgen::GenPreferencePage»«ERROR 'Abstract template generatePreferencePage for' + self.repr()»«ENDDEFINE»
-
-«DEFINE generatePreferencePage FOR gmfgen::GenCustomPreferencePage-»
-«IF generateBoilerplate-»
-    <xpt:template name="${CustomPreferencePageEmitter}" outfile="${outputJavaRoot}/«qualifiedClassName.replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDIF-»
-«EXPAND generatePreferencePage FOREACH children-»
-«ENDDEFINE»
-
-«DEFINE generatePreferencePage FOR gmfgen::GenStandardPreferencePage-»
-«IF kind <> gmfgen::StandardPreferencePages::Pathmaps-»
-    <xpt:template name="${StandardPreferencePageEmitter}" outfile="${outputJavaRoot}/«getQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDIF-»
-«EXPAND generatePreferencePage FOREACH children-»
-«ENDDEFINE»
-
-«REM»
-                                           P R O P E R T Y  S H E E T
-«ENDREM»
-
-«DEFINE propertysheetTask FOR gmfgen::GenPropertySheet-»
-  <target name="propertysheet">
-      <xpt:template name="${PropertySheetLabelProviderEmitter}" outfile="${outputJavaRoot}/«getLabelProviderQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»"/>
-«FOREACH tabs[gmfgen::GenCustomPropertyTab] AS t-»
-      <xpt:template name="${PropertySectionEmitter}" outfile="${outputJavaRoot}/«t.getQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«t.uriFragment()»"/>
-«ENDFOREACH-»
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           N A V I G A T O R
-«ENDREM»
-
-«DEFINE navigatorTask FOR gmfgen::GenNavigator-»
-  <target name="navigator">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${NavigatorContentProviderEmitter}" outfile="${outputJavaRoot}/«getContentProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${NavigatorLabelProviderEmitter}" outfile="${outputJavaRoot}/«getLabelProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${NavigatorLinkHelperEmitter}" outfile="${outputJavaRoot}/«getLinkHelperQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${NavigatorSorterEmitter}" outfile="${outputJavaRoot}/«getSorterQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${NavigatorActionProviderEmitter}" outfile="${outputJavaRoot}/«getActionProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${AbstractNavigatorItemEmitter}" outfile="${outputJavaRoot}/«getAbstractNavigatorItemQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${NavigatorGroupEmitter}" outfile="${outputJavaRoot}/«getNavigatorGroupQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${NavigatorItemEmitter}" outfile="${outputJavaRoot}/«getNavigatorItemQualifiedClassName().replace('.','/')».java"/>
-«IF generateDomainModelNavigator and not editorGen.domainGenModel.oclIsUndefined()-»
-      <!-- Naviagator for domain model -->
-      <xpt:template name="${DomainNavigatorContentProviderEmitter}" outfile="${outputJavaRoot}/«getDomainContentProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${DomainNavigatorLabelProviderEmitter}" outfile="${outputJavaRoot}/«getDomainLabelProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${DomainNavigatorItemEmitter}" outfile="${outputJavaRoot}/«getDomainNavigatorItemQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${URIEditorInputTesterEmitter}" outfile="${outputJavaRoot}/«getUriInputTesterQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-    </xpt:template-set>
-    <!-- generateNavigatorGroupIcons -->
-«FOREACH childReferences->select(not groupIcon.oclIsUndefined() and groupIcon.size() > 0 ).groupIcon->asOrderedSet() AS f-»
-«IF f.rfind('/') > 0 -»
-    <mkdir dir="${outputPluginRoot}/«f.substring(1, f.rfind('/'))»"/>
-«ENDIF-»
-    <get src="${templateRoot}${GroupIconEmitter}" dest="${outputPluginRoot}/«f»"/>
-«ENDFOREACH-»
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           E D I T O R
-«ENDREM»
-
-«DEFINE editorTask FOR gmfgen::GenEditorView-»
-  <target name="editor">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${EditorEmitter}" outfile="${outputJavaRoot}/«getQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${ActionBarContributorEmitter}" outfile="${outputJavaRoot}/«getActionBarContributorQualifiedClassName().replace('.','/')».java"/>
-    </xpt:template-set>
-«IF not editorGen.diagram.palette.oclIsUndefined()-»
-    <xpt:template name="${PaletteEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.palette.getFactoryQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«editorGen.diagram.palette.uriFragment()»"/>
-«ENDIF-»
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«editorGen.diagram.uriFragment()»">
-      <xpt:template name="${DiagramEditorUtilEmitter}" outfile="${outputJavaRoot}/«packageName.replace('.','/')»/«editorGen.diagram.diagramEditorUtilClassName».java"/>
-      <xpt:template name="${VisualIDRegistryEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.getVisualIDRegistryQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${MatchingStrategyEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.getMatchingStrategyQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${DocumentProviderEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.getDocumentProviderQualifiedClassName().replace('.','/')».java"/>
-      <!-- editor creation wizard -->
-      <xpt:template name="${CreationWizardEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.getCreationWizardQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${CreationWizardPageEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.getCreationWizardPageQualifiedClassName().replace('.','/')».java"/>
-      <!-- delete action on a diagram -->
-      <xpt:template name="${DeleteElementActionEmitter}" outfile="${outputJavaRoot}/«/*editorGen.editor.*/packageName.replace('.','/')»/DeleteElementAction.java"/>
-      <xpt:template name="${DiagramEditorContextMenuProviderEmitter}" outfile="${outputJavaRoot}/«/*editorGen.editor.*/packageName.replace('.','/')»/DiagramEditorContextMenuProvider.java"/>
-«IF editorGen.diagram.generateShortcutIcon()-»
-      <xpt:template name="${ShortcutsDecoratorProviderEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.getShortcutsDecoratorProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${ShortcutPropertyTesterEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.getShortcutPropertyTesterQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-    </xpt:template-set>
-    <!-- FIXME do not overwrite existing files -->
-«IF editorGen.diagram.creationWizardIconPath.indexOf('/') > 0 and not editorGen.diagram.creationWizardIconPath.startsWith('../')-»
-    <mkdir dir="${outputPluginRoot}/«editorGen.diagram.creationWizardIconPath.substring(1, editorGen.diagram.creationWizardIconPath.rfind('/'))»"/>
-«ENDIF-»
-    <get src="${templateRoot}${DiagramIconEmitter}" dest="«EXPAND processIconPath(editorGen.diagram.creationWizardIconPath) FOR editorGen»"/>
-«IF iconPath.indexOf('/') > 0 and not iconPath.startsWith('../')-»
-    <mkdir dir="${outputPluginRoot}/«iconPath.substring(1, iconPath.rfind('/'))»"/>
-«ENDIF-»
-    <get src="${templateRoot}${DiagramIconEmitter}" dest="«EXPAND processIconPath(iconPath) FOR editorGen»"/>
-    <mkdir dir="${outputPluginRoot}/icons/wizban/"/>
-    <get src="${templateRoot}${WizardBannerImageEmitter}" dest="${outputPluginRoot}/icons/wizban/New«IF editorGen.diagram.domainDiagramElement <> null /*@see CreationWizard.xpt*/»«editorGen.diagram.domainDiagramElement.genPackage.prefix»«ENDIF»Wizard.gif"/>
-«IF editorGen.diagram.generateShortcutIcon()-»
-    <mkdir dir="${outputPluginRoot}/icons/"/>
-    <get src="${templateRoot}${ShortcutImageEmitter}" dest="${outputPluginRoot}/icons/shortcut.gif"/>
-«ENDIF-»
-  </target>
-«ENDDEFINE»
-
-//#getCreationWizardIconPathX and #getIconPathX 
-«DEFINE processIconPath(String path) FOR gmfgen::GenEditorGenerator-»
-«IF '{reuseEMFIcon}'.equalsIgnoreCase(path)-»
-«IF diagram.domainDiagramElement <> null-»
-../«domainGenModel.editorPluginID»/icons/full/obj16/«diagram.domainDiagramElement.genPackage.prefix»ModelFile.gif«ELSE-»
-${outputPluginRoot}/icons/obj16/DiagramFile.gif
-«ENDIF-»
-«ELSE»${outputPluginRoot}/«path»«ENDIF-»
-«ENDDEFINE»
-
-«REM»
-                                           P L U G I N
-«ENDREM»
-
-«DEFINE pluginTask FOR gmfgen::GenPlugin-»
-  <target name="plugin">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${ActivatorEmitter}" outfile="${outputJavaRoot}/«getActivatorQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${BundleManifestEmitter}" outfile="${outputPluginRoot}/META-INF/MANIFEST.MF"/>
-      <xpt:template name="${PluginXmlEmitter}" outfile="${outputPluginRoot}/plugin.xml"/>
-      <xpt:template name="${PluginPropertiesEmitter}" outfile="${outputPluginRoot}/plugin.properties"/>
-      <xpt:template name="${BuildPropertiesEmitter}" outfile="${outputPluginRoot}/build.properties"/>
-      <xpt:template name="${OptionsFileEmitter}" outfile="${outputPluginRoot}/.options"/>
-    </xpt:template-set>
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           D I A G R A M  U P D A T E R
-«ENDREM»
-
-«DEFINE diagramupdateTask FOR gmfgen::GenDiagramUpdater-»
-  <target name="diagramupdate">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${DiagramUpdaterEmitter}" outfile="${outputJavaRoot}/«getDiagramUpdaterQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${UpdateCommandEmitter}" outfile="${outputJavaRoot}/«getUpdateCommandQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${NodeDescriptorEmitter}" outfile="${outputJavaRoot}/«getNodeDescriptorQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${LinkDescriptorEmitter}" outfile="${outputJavaRoot}/«getLinkDescriptorQualifiedClassName().replace('.','/')».java"/>
-    </xpt:template-set>
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           R C P     A P P L I C A T I O N
-«ENDREM»
-«DEFINE rcpApplicationTask FOR gmfgen::GenApplication-»
-  <target name="rcp-app">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${ApplicationEmitter}" outfile="${outputJavaRoot}/«getQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${ActionBarAdvisorEmitter}" outfile="${outputJavaRoot}/«getActionBarAdvisorQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${PerspectiveEmitter}" outfile="${outputJavaRoot}/«getPerspectiveQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${WorkbenchAdvisorEmitter}" outfile="${outputJavaRoot}/«getWorkbenchAdvisorQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${WorkbenchWindowAdvisorEmitter}" outfile="${outputJavaRoot}/«getWorkbenchWindowAdvisorQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${WizardNewFileCreationPageEmitter}" outfile="${outputJavaRoot}/«packageName.replace('.','/')»/WizardNewFileCreationPage.java"/>
-    </xpt:template-set>
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           A C T I O N S
-                                           FIXME: handle duplicates (processedItems in the original Generator code)
-«ENDREM»
-
-«DEFINE actionsTask FOR gmfgen::GenEditorGenerator-»
-«IF contextMenus->notEmpty()-»
-  <target name="actions">
-    <xpt:template-set templateRoot="${templateRoot}">
-«FOREACH contextMenus AS m-»
-«EXPAND invokeActionTemplate FOREACH m.items-»
-«ENDFOREACH-»
-    </xpt:template-set>
-«EXPAND legacyActionsSubTask FOR diagram-»
-  </target>
-«ENDIF-»
-«ENDDEFINE»
-
-«REM» actions that not yet migrated to ContributionItem approach.«ENDREM»
-«DEFINE legacyActionsSubTask FOR gmfgen::GenDiagram-»
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-«IF generateInitDiagramAction() or generateCreateShortcutAction()-»
-      <xpt:template name="${ModelElementSelectionPageEmitter}" outfile="${outputJavaRoot}/«editorGen.editor.packageName.replace('.','/')»/ModelElementSelectionPage.java"/>
-«ENDIF»
-«IF generateInitDiagramAction()-»
-      <!-- FIXME HACK! -->
-      <xpt:template name="xpt::editor::InitDiagramFileAction::Hack" outfile="${outputJavaRoot}/«getInitDiagramFileActionQualifiedClassName().replace('.','/')».java" inputURI="${inputURI}#«editorGen.uriFragment()»"/>
-«IF not synchronized»
-      <xpt:template name="${DiagramContentInitializerEmitter}" outfile="${outputJavaRoot}/«getDiagramContentInitializerQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-      <xpt:template name="${NewDiagramFileWizardEmitter}" outfile="${outputJavaRoot}/«editorGen.editor.packageName.replace('.','/')»/«newDiagramFileWizardClassName».java"/>
-«ENDIF-»
-«IF generateCreateShortcutAction()-»
-      <xpt:template name="${CreateShortcutDecorationsCommandEmitter}" outfile="${outputJavaRoot}/«getCreateShortcutDecorationsCommandQualifiedClassName().replace('.','/')».java"/>
-«IF editorGen.application.oclIsUndefined()-»
-      <xpt:template name="${ElementChooserEmitter}" outfile="${outputJavaRoot}/«getElementChooserQualifiedClassName().replace('.','/')».java"/>
-«ELSE-»
-      <xpt:template name="${ShortcutCreationWizardEmitter}" outfile="${outputJavaRoot}/«editorGen.editor.packageName.replace('.','/')»/ShortcutCreationWizard.java"/>
-«ENDIF-»
-«ENDIF-»
-    </xpt:template-set>
-«ENDDEFINE»
-
-«DEFINE invokeActionTemplate FOR gmfgen::GenContributionItem»«ERROR 'Abstract template invokeActionTemplate for '.concat(self.repr())»«ENDDEFINE»
-«DEFINE invokeActionTemplate FOR gmfgen::GenCustomAction-»
-«IF generateBoilerplate /* and not processedItems->contains(self) FIXME processedItems : List(gmfgen::GenContributionItem)*/»
-      <xpt:template name="${CustomActionEmitter}" outfile="${outputJavaRoot}/«qualifiedClassName.replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDIF»
-«ENDDEFINE»
-«DEFINE invokeActionTemplate FOR gmfgen::GenContributionManager-»
-«EXPAND invokeActionTemplate FOREACH items-»
-«ENDDEFINE»
-«DEFINE invokeActionTemplate FOR gmfgen::GenSharedContributionItem-»
-«EXPAND invokeActionTemplate FOR actualItem-»
-«ENDDEFINE»
-«DEFINE invokeActionTemplate FOR gmfgen::GenAction-»
-      <xpt:template name="${PredefinedActionEmitter}" outfile="${outputJavaRoot}/«qualifiedClassName.replace('.','/')».java" inputURI="${inputURI}#«uriFragment()»"/>
-«ENDDEFINE»
-
-«REM»
-                                           E X T E R N A L I Z E        S U P P O R T
-«ENDREM»
-«DEFINE externalizeSupportTask FOR gmfgen::GenEditorGenerator-»
-  <target name="externalize-support">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${ExternalizeEmitter}" outfile="${outputJavaRoot}/«editor.packageName.replace('.','/')»/Messages.java"/>
-      <xpt:template name="${MessagesEmitter}" outfile="${outputPluginRoot}/messages.properties"/>
-    </xpt:template-set>
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           P R O V I D E R S
-«ENDREM»
-«DEFINE providersTask FOR gmfgen::GenDiagram-»
-  <target name="providers">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${ViewProviderEmitter}" outfile="${outputJavaRoot}/«getNotationViewProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${EditPartProviderEmitter}" outfile="${outputJavaRoot}/«getEditPartProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${ModelingAssistantProviderEmitter}" outfile="${outputJavaRoot}/«getModelingAssistantProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${IconProviderEmitter}" outfile="${outputJavaRoot}/«getIconProviderQualifiedClassName().replace('.','/')».java"/>
-«IF not editorGen.labelParsers.oclIsUndefined() and (editorGen.labelParsers.extensibleViaService or editorGen.labelParsers.implementations->exists(pi | not pi.oclIsKindOf(gmfgen::ExternalParser)) /*existsNonExternalParser*/)-»
-      <xpt:template name="${ParserProviderEmitter}" outfile="${outputJavaRoot}/«editorGen.labelParsers.getQualifiedClassName().replace('.','/')».java" inputURI="${inputURI}#«editorGen.labelParsers.uriFragment()»"/>
-«ENDIF-»
-    </xpt:template-set>
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           E D I T  P O L I C I E S
-«ENDREM»
-«DEFINE editpoliciesTask FOR gmfgen::GenDiagram-»
-  <target name="shared-edit-policy">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-«IF getAllContainers()->exists(not sansDomain) or links->exists(not sansDomain) /*any element got an associated model entity*/-»
-      <xpt:template name="${BaseItemSemanticEditPolicyEmitter}" outfile="${outputJavaRoot}/«getBaseItemSemanticEditPolicyQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-      <xpt:template name="${TextSelectionEditPolicyEmitter}" outfile="${outputJavaRoot}/«getTextSelectionEditPolicyQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${TextNonResizableEditPolicyEmitter}" outfile="${outputJavaRoot}/«getTextNonResizableEditPolicyQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${BaseEditHelperEmitter}" outfile="${outputJavaRoot}/«getBaseEditHelperQualifiedClassName().replace('.','/')».java"/>
-    </xpt:template-set>
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           M E T R I C S
-«ENDREM»
-«DEFINE metricsTask FOR gmfgen::GenMetricContainer-»
-  <target name="metrics">
-    <xpt:template name="${MetricProviderEmitter}" outfile="${outputJavaRoot}/«editorGen.diagram.getMetricProviderQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«editorGen.diagram.uriFragment()»"/>
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           E X P R E S S I O N  P R O V I D E R S
-«ENDREM»
-«DEFINE expressionProvidersTask FOR gmfgen::GenExpressionProviderContainer-»
-  <target name="expression-providers">
-«FOREACH providers[GenExpressionInterpreter]->select(language = gmfgen::GenLanguage::ocl) AS i-»
-    <xpt:template name="${OCLExpressionFactoryEmitter}" outfile="${outputJavaRoot}/«i.getQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«i.uriFragment()»"/>
-«ENDFOREACH-»  
-«FOREACH providers[GenExpressionInterpreter]->select(language = gmfgen::GenLanguage::regexp or language = gmfgen::GenLanguage::nregexp) AS i-»
-    <xpt:template name="${RegexpExpressionFactoryEmitter}" outfile="${outputJavaRoot}/«i.getQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«i.uriFragment()»"/>
-«ENDFOREACH-»  
-«IF providers[GenExpressionInterpreter]->exists(language = gmfgen::GenLanguage::ocl or language = gmfgen::GenLanguage::regexp or language = gmfgen::GenLanguage::nregexp) /*needAbstractExpression*/-»
-    <xpt:template name="${AbstractExpressionEmitter}" outfile="${outputJavaRoot}/«getAbstractExpressionQualifiedClassName().replace('.','/')».java" templateRoot="${templateRoot}" inputURI="${inputURI}#«editorGen.diagram.uriFragment()»"/>
-«ENDIF-»
-  </target>
-«ENDDEFINE»
-
-«REM»
-                                           V A L I D A T I O N  &  A U D I T S
-«ENDREM»
-«DEFINE auditsTask FOR gmfgen::GenDiagram-»
-  <target name="audits">
-    <xpt:template-set templateRoot="${templateRoot}" inputURI="${inputURI}#«uriFragment()»">
-      <xpt:template name="${ValidationProviderEmitter}" outfile="${outputJavaRoot}/«getValidationProviderQualifiedClassName().replace('.','/')».java"/>
-      <xpt:template name="${ValidateActionEmitter}" outfile="${outputJavaRoot}/«editorGen.editor.packageName.replace('.','/')»/ValidateAction.java"/>
-«IF editorGen.application.oclIsUndefined()-»
-      <xpt:template name="${MarkerNavigationProviderEmitter}" outfile="${outputJavaRoot}/«getMarkerNavigationProviderQualifiedClassName().replace('.','/')».java"/>
-«ELSE-»
-      <xpt:template name="${ValidationMarkerEmitter}" outfile="${outputJavaRoot}/«editorGen.editor.packageName.replace('.','/')»/ValidationMarker.java"/>
-«ENDIF-»
-«IF validationDecorators-»
-      <xpt:template name="${ValidationDecoratorProviderEmitter}" outfile="${outputJavaRoot}/«getValidationDecoratorProviderQualifiedClassName().replace('.','/')».java"/>
-«ENDIF-»
-    </xpt:template-set>
-  </target>
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/commands/DeleteLinkCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/commands/DeleteLinkCommand.xpt
deleted file mode 100644
index f805c8ba164..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/commands/DeleteLinkCommand.xpt
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::GenModelUtils»
-
-«DEFINE newInstance(String requestVar) FOR gmfgen::GenLink»«EXPAND newDeleteLinkCommand(self, requestVar) FOR modelFacet»«ENDDEFINE»
-
-«DEFINE newRequest(String requestVar, String edgeVar) FOR gmfgen::GenLink»«EXPAND newDestroyRequest(self, requestVar, edgeVar) FOR modelFacet»«ENDDEFINE»
-
-«DEFINE newDeleteLinkCommand(gmfgen::GenLink genLink, String requestVar) FOR gmfgen::LinkModelFacet»
-«ERROR 'Unsupported model facet: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE newDeleteLinkCommand(gmfgen::GenLink genLink, String requestVar) FOR gmfgen::TypeLinkModelFacet-»
-«EXPAND newDeleteLinkWithClassCommand(genLink, requestVar)-»
-«ENDDEFINE»
-
-«DEFINE newDeleteLinkCommand(gmfgen::GenLink genLink, String requestVar) FOR gmfgen::FeatureLinkModelFacet-»
-«EXPAND newDeleteReferenceLinkCommand(genLink, requestVar)-»
-«ENDDEFINE»
-
-«DEFINE newDeleteReferenceLinkCommand(gmfgen::GenLink genLink, String destroyReferenceRequest) FOR gmfgen::FeatureLinkModelFacet-»
-new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyReferenceCommand(«destroyReferenceRequest»)«IF isContains(metaFeature)» {
-	protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor progressMonitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-		org.eclipse.emf.ecore.EObject referencedObject = getReferencedObject();
-		org.eclipse.emf.ecore.resource.Resource resource = referencedObject.eResource();
-		org.eclipse.gmf.runtime.common.core.command.CommandResult result = super.doExecuteWithResult(progressMonitor, info);
-		if (resource != null) {
-			resource.getContents().add(referencedObject);
-		}
-		return result;
-	}
-}«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE newDeleteLinkWithClassCommand(gmfgen::GenLink genLink, String destroyElementRequest) FOR gmfgen::TypeLinkModelFacet-»
-new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(«destroyElementRequest»)«-»
-«ENDDEFINE»
-
-«DEFINE newDestroyRequest(gmfgen::GenLink genLink, String requestVar, String edgeVar) FOR gmfgen::LinkModelFacet»
-«ERROR 'Unsupported model facet: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE newDestroyRequest(gmfgen::GenLink genLink, String requestVar, String edgeVar) FOR gmfgen::TypeLinkModelFacet-»
-org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest «requestVar» = new org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest(«edgeVar».getElement(), false);
-«ENDDEFINE»
-
-«DEFINE newDestroyRequest(gmfgen::GenLink genLink, String requestVar, String edgeVar) FOR gmfgen::FeatureLinkModelFacet-»
-«REM»FIXME source not always container, target is not always referenced object. And containerReference is known at generation time«ENDREM-»
-org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest «requestVar» = new org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest(«edgeVar».getSource().getElement(), null, «edgeVar».getTarget().getElement(), false);
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ChildNodeLabelEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ChildNodeLabelEditPart.xpt
deleted file mode 100644
index 66edb100f3d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ChildNodeLabelEditPart.xpt
+++ /dev/null
@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE contsructor FOR gmfgen::GenChildLabelNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-	}
-«ENDDEFINE»
-
-«DEFINE getDragTrackerBody FOR gmfgen::GenChildLabelNode-»
-	if (request instanceof org.eclipse.gef.requests.SelectionRequest && ((org.eclipse.gef.requests.SelectionRequest) request).getLastButtonPressed() == 3) {
-		return null;
-	}
-	return new org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx(this);
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPoliciesBody FOR gmfgen::GenChildLabelNode-»
-	super.createDefaultEditPolicies();
-	installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE, new «getItemSemanticEditPolicyQualifiedClassName()»());
-	installEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE, new «getDiagram().getTextNonResizableEditPolicyQualifiedClassName()»());
-	installEditPolicy(org.eclipse.gef.EditPolicy.COMPONENT_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.ListItemComponentEditPolicy());
-	installEditPolicy(org.eclipse.gef.EditPolicy.DIRECT_EDIT_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy());
-	«EXPAND additionalEditPolicies-»
-«ENDDEFINE»
-	
-«DEFINE additionalEditPolicies FOR gmfgen::GenChildLabelNode»«ENDDEFINE»
-
-«DEFINE handleNotificationEventBody FOR gmfgen::GenChildLabelNode-»
-	Object feature = event.getFeature();
-	«EXPAND xpt::diagram::editparts::Common::handleText FOR self-»
-	super.handleNotificationEvent(event);
-«ENDDEFINE»
-
-«DEFINE isSelectable FOR gmfgen::GenChildLabelNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override-»
-	public boolean isSelectable() {
-		return getFigure().isShowing();
-	}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ChoiceUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ChoiceUtils.qvto
deleted file mode 100644
index cbcb987cc70..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ChoiceUtils.qvto
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2012, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Svyatoslav Kovalsky (Montages) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-library Utils;
-
-
-helper gmfgen::GenCommonBase::isOclChoiceLabel() : Boolean {
-	return let labelModelFacet : gmfgen::LabelModelFacet 
-		= if self.oclIsKindOf(gmfgen::GenChildLabelNode) then self.oclAsType(gmfgen::GenChildLabelNode).labelModelFacet 
-	      else (if self.oclIsKindOf(gmfgen::GenLabel) then self.oclAsType(gmfgen::GenLabel).modelFacet 
-	 	  else null 
-	 	  endif)
-	 	  endif	 	      
-	in (labelModelFacet <> null) 
-		and labelModelFacet.parser.oclIsKindOf(gmfgen::OclChoiceParser);
-}
-
-helper gmfgen::GenCommonBase::isOclChoiceLabelWithShowExpr() : Boolean {
-	return let labelModelFacet : gmfgen::LabelModelFacet 
-		= if self.oclIsKindOf(gmfgen::GenChildLabelNode) then self.oclAsType(gmfgen::GenChildLabelNode).labelModelFacet 
-	      else (if self.oclIsKindOf(gmfgen::GenLabel) then self.oclAsType(gmfgen::GenLabel).modelFacet 
-	 	  else null 
-	 	  endif)
-	 	  endif	 	      
-	in (labelModelFacet <> null) 
-		and labelModelFacet.parser.oclIsKindOf(gmfgen::OclChoiceParser)
-		and (labelModelFacet.parser.oclAsType(gmfgen::OclChoiceParser).showExpression <> null);
-}
-
-helper isChoiceLabel(modelFacet : gmfgen::LabelModelFacet) : Boolean {
-	return modelFacet.parser.oclIsKindOf(gmfgen::PredefinedEnumParser)
-			or modelFacet.parser.oclIsKindOf(gmfgen::OclChoiceParser);
-}
-
-helper getDirectManagerFQN(modelFacet : gmfgen::LabelModelFacet) : String {
-	return 
-	 (if isChoiceLabel(modelFacet) then 
-		-- 'org.eclipse.gmf.runtime.diagram.ui.tools.ComboDirectEditManager'
-		'org.eclipse.gmf.tooling.runtime.directedit.ComboDirectEditManager'
-	  else
-		'org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager'
-	  endif);
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt
deleted file mode 100644
index f3915447813..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/CompartmentEditPart.xpt
+++ /dev/null
@@ -1,168 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::editparts::Utils»
-
-«DEFINE contsructor FOR gmfgen::GenCompartment-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-	}
-«ENDDEFINE»
-
-«DEFINE hasModelChildrenChanged FOR gmfgen::GenCompartment-»
-	«IF listLayout-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected boolean hasModelChildrenChanged(org.eclipse.emf.common.notify.Notification evt) {
-			return false;
-		}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getCompartmentName FOR gmfgen::GenCompartment-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getCompartmentName() {
-		return «EXPAND xpt::Externalizer::accessorCall(i18nKeyForCompartmentTitle(self)) FOR getDiagram().editorGen»;
-	}
-«ENDDEFINE»
-
-«DEFINE createFigure FOR gmfgen::GenCompartment-»
-	«IF not needsTitle-»
-		«REM»By default titles are shown even if there are no TitleStyle, we need to switch it off«ENDREM»«-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.draw2d.IFigure createFigure() {
-			org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure result = (org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure) super.createFigure();
-			result.setTitleVisibility(false);
-			return result;
-		}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPoliciesBody FOR gmfgen::GenCompartment-»
-	super.createDefaultEditPolicies();
-	«IF canCollapse-»
-		installEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy());
-	«ENDIF-»
-	«EXPAND xpt::diagram::editparts::Common::installSemanticEditPolicy-»
-	«IF childNodes->size() > 0-»
-		«EXPAND xpt::diagram::editparts::Common::installCreationEditPolicy-»
-		installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy());
-	«ENDIF-»
-	«EXPAND xpt::diagram::editparts::Common::installCanonicalEditPolicy-»
-	«EXPAND xpt::diagram::editparts::Common::behaviour-»
-	«EXPAND additionalEditPolicies-»
-«ENDDEFINE»
-
-
-«DEFINE additionalEditPolicies FOR gmfgen::GenCompartment»«ENDDEFINE»
-
-«DEFINE refreshVisuals FOR gmfgen::GenCompartment-»
-	«IF isStoringChildPositions(node)-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected void refreshVisuals() {
-			super.refreshVisuals();
-			refreshBounds();
-		}
-	«ENDIF-»
-«ENDDEFINE»
-	
-«DEFINE handleNotificationEventBody FOR gmfgen::GenCompartment-»
-	super.handleNotificationEvent(notification);
-	Object feature = notification.getFeature();
-	if (org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width().equals(feature)
-			|| org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height().equals(feature)
-			|| org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_X().equals(feature)
-			|| org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-		refreshBounds();
-	} 
-«ENDDEFINE»
-	
-«DEFINE refreshBounds FOR gmfgen::GenCompartment-»
-	«IF isStoringChildPositions(node)-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected void refreshBounds() {
-			int x = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_X())).intValue();
-			int y = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-			int width = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width())).intValue();
-			int height = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height())).intValue();
-			((org.eclipse.gef.GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new org.eclipse.draw2d.geometry.Rectangle(x, y, width, height));
-		}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE setRatio FOR gmfgen::GenCompartment-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setRatio(Double ratio) {
-		«IF gmfgen::ViewmapLayoutType::UNKNOWN = node.getLayoutType()-»
-		if (getFigure().getParent().getLayoutManager() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout) {
-			super.setRatio(ratio);
-		}
-		«ELSE-»
-		// nothing to do -- parent layout does not accept Double constraints as ratio
-		// super.setRatio(ratio); 
-		«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE getTargetEditPartMethod FOR gmfgen::GenCompartment»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gef.EditPart getTargetEditPart(org.eclipse.gef.Request request) {
-		«IF self.childNodes->size() > 0-»
-			if (request instanceof org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest) {
-				org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter adapter = ((org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-				org.eclipse.gmf.runtime.emf.type.core.IElementType type = (org.eclipse.gmf.runtime.emf.type.core.IElementType) adapter.getAdapter(org.eclipse.gmf.runtime.emf.type.core.IElementType.class);
-			«FOREACH self.childNodes->asSequence() AS childNode-»
-				if (type == «EXPAND xpt::providers::ElementTypes::accessElementType FOR childNode») {
-					return this;
-				}
-			«ENDFOREACH-»
-				return getParent().getTargetEditPart(request);
-			}
-			if (request instanceof org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest) {
-				«IF haveOneOfChildNodesIncomimgLinks(self)-»
-				if (org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_CONNECTION_END.equals(request.getType())) {
-					for (Object type : ((org.eclipse.gmf.runtime.diagram.ui.requests.CreateUnspecifiedTypeConnectionRequest) request).getElementTypes()) {
-						if (type instanceof org.eclipse.gmf.runtime.emf.type.core.IElementType) {
-							org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = (org.eclipse.gmf.runtime.emf.type.core.IElementType) type;
-							if («FOREACH collectIncomingLinks(self) AS link SEPARATOR ' || '»elementType.equals(«EXPAND xpt::providers::ElementTypes::accessElementType FOR link»)«ENDFOREACH»)
-								return super.getTargetEditPart(request);
-						}
-					}
-				}
-				«ENDIF-»
-				return getParent().getTargetEditPart(request);
-			}
-		«ENDIF-»
-		return super.getTargetEditPart(request);
-	}
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-«EXPAND internal_i18nAccessors FOREACH compartments»
-«ENDDEFINE»
-
-«DEFINE internal_i18nAccessors FOR gmfgen::GenCompartment-»
-«IF null <> title»«EXPAND xpt::Externalizer::accessorField(i18nKeyForCompartmentTitle(self))»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND internal_i18nValues FOREACH compartments»
-«ENDDEFINE»
-
-«DEFINE internal_i18nValues FOR gmfgen::GenCompartment-»
-«IF null <> title»«EXPAND xpt::Externalizer::messageEntry(i18nKeyForCompartmentTitle(self), title)»«ENDIF-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/DiagramEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/DiagramEditPart.xpt
deleted file mode 100644
index 48cf63e4019..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/DiagramEditPart.xpt
+++ /dev/null
@@ -1,110 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::editparts::Utils»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-	}
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPoliciesBody FOR gmfgen::GenDiagram-»
-	super.createDefaultEditPolicies();
-	«EXPAND xpt::diagram::editparts::Common::installSemanticEditPolicy-»
-	«EXPAND xpt::diagram::editparts::Common::installCanonicalEditPolicy-»
-	«EXPAND xpt::diagram::editparts::Common::installCreationEditPolicy-»
-	«IF generateCreateShortcutAction() and null = editorGen.application-»
-		«EXPAND dragDropEditPolicy-»
-	«ENDIF-»
-	«IF shouldGenerateDiagramViewmap(self)-»
-		«EXPAND layotEditPolicy-»
-	«ENDIF-»
-	«EXPAND xpt::diagram::editparts::Common::behaviour FOR self-»
-	// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.POPUPBAR_ROLE);
-	«EXPAND additionalEditPolicies-»
-«ENDDEFINE»
-
-	«DEFINE dragDropEditPolicy FOR gmfgen::GenDiagram-»
-		installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.DiagramDragDropEditPolicy() {
-			public org.eclipse.gef.commands.Command getDropObjectsCommand(org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest dropRequest) {
-				«EXPAND CodeStyle::newGenericInstance('viewDescriptors', 'java.util.ArrayList', 'org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor')»();
-				for («EXPAND CodeStyle::G('java.util.Iterator', '?')» it = dropRequest.getObjects().iterator(); it.hasNext();) {
-					Object nextObject = it.next();
-					if (false == nextObject instanceof org.eclipse.emf.ecore.EObject) {
-						continue;
-					}
-					viewDescriptors.add(new org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor(new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter((org.eclipse.emf.ecore.EObject) nextObject), org.eclipse.gmf.runtime.notation.Node.class, null, getDiagramPreferencesHint()));
-				}
-				return createShortcutsCommand(dropRequest, viewDescriptors);
-			}
-
-			private org.eclipse.gef.commands.Command createShortcutsCommand(org.eclipse.gmf.runtime.diagram.ui.requests.DropObjectsRequest dropRequest, «EXPAND CodeStyle::G('java.util.List', 'org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor')» viewDescriptors) {
-				org.eclipse.gef.commands.Command command = createViewsAndArrangeCommand(dropRequest, viewDescriptors);
-				if (command != null) {
-					return command.chain(new org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy(new «getCreateShortcutDecorationsCommandQualifiedClassName()»(getEditingDomain(), (org.eclipse.gmf.runtime.notation.View) getModel(), viewDescriptors)));
-				}
-				return null;
-			}
-		});
-	«ENDDEFINE»
-	
-	«DEFINE layotEditPolicy FOR gmfgen::GenDiagram-»
-		// diagram figure does layout; need to install child editpolicy to show selection feedback
-		installEditPolicy(org.eclipse.gef.EditPolicy.LAYOUT_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-			protected org.eclipse.gef.EditPolicy createChildEditPolicy(org.eclipse.gef.EditPart child) {
-				final org.eclipse.gef.editpolicies.NonResizableEditPolicy p = new org.eclipse.gef.editpolicies.NonResizableEditPolicy();
-				p.setDragAllowed(false);
-				return p;
-			}
-			protected org.eclipse.gef.commands.Command getMoveChildrenCommand(org.eclipse.gef.Request request) {
-				return null;
-			}
-			protected org.eclipse.gef.commands.Command getCreateCommand(org.eclipse.gef.requests.CreateRequest request) {
-				return null;
-			}
-		});
-	«ENDDEFINE»
-
-	«DEFINE additionalEditPolicies FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE createFigure FOR gmfgen::GenDiagram-»
-	«IF shouldGenerateDiagramViewmap(self)-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected org.eclipse.draw2d.IFigure createFigure() {
-			org.eclipse.draw2d.FreeformLayer l = new org.eclipse.draw2d.FreeformLayer();
-			l.setBorder(new org.eclipse.draw2d.MarginBorder(50));
-			«EXPAND initLayout('lm') FOR viewmap.layoutType-»
-			l.setLayoutManager(lm);
-			return l;
-		}
-	«ENDIF»
-«ENDDEFINE»
-
-«DEFINE initLayout(varName : String) FOR gmfgen::ViewmapLayoutType-»
-	«IF self = gmfgen::ViewmapLayoutType::TOOLBAR_LAYOUT-»
-		org.eclipse.draw2d.ToolbarLayout «varName» = new org.eclipse.draw2d.ToolbarLayout();
-		«varName».setSpacing(10);
-	«ELSEIF self = gmfgen::ViewmapLayoutType::FLOW_LAYOUT-»
-		org.eclipse.draw2d.FlowLayout «varName» = new org.eclipse.draw2d.FlowLayout();
-		«varName».setMajorSpacing(10);
-		«varName».setMinorSpacing(10);
-	«ELSE-»
-		org.eclipse.draw2d.LayoutManager «varName» = null; /*FIXME - unknown layout type*/
-	«ENDIF-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ExternalNodeLabelEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ExternalNodeLabelEditPart.xpt
deleted file mode 100644
index 9fb6154e316..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/ExternalNodeLabelEditPart.xpt
+++ /dev/null
@@ -1,74 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE initializer FOR gmfgen::GenExternalNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	static {
-		registerSnapBackPosition(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall», new org.eclipse.draw2d.geometry.Point(0, 0));
-	}
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenExternalNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-	}
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPoliciesBody FOR gmfgen::GenExternalNodeLabel-»
-	super.createDefaultEditPolicies();
-	installEditPolicy(org.eclipse.gef.EditPolicy.DIRECT_EDIT_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy());
-	installEditPolicy(org.eclipse.gef.EditPolicy.SELECTION_FEEDBACK_ROLE, new «getDiagram().getTextSelectionEditPolicyQualifiedClassName()»());
-	«EXPAND xpt::diagram::editparts::Common::behaviour FOR self-»
-	«EXPAND additionalEditPolicies-»
-«ENDDEFINE»
-
-«DEFINE additionalEditPolicies FOR gmfgen::GenExternalNodeLabel»«ENDDEFINE»
-
-«DEFINE getBorderItemLocator FOR gmfgen::GenExternalNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator getBorderItemLocator() {
-		org.eclipse.draw2d.IFigure parentFigure = getFigure().getParent();
-		if (parentFigure != null && parentFigure.getLayoutManager() != null) {
-			Object constraint = parentFigure.getLayoutManager().getConstraint(getFigure());
-			return (org.eclipse.gmf.runtime.diagram.ui.figures.IBorderItemLocator) constraint;
-		}
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE refreshBounds FOR gmfgen::GenExternalNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void refreshBounds() {
-		int x = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_X())).intValue();
-		int y = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-		int width = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width())).intValue();
-		int height = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height())).intValue();
-		getBorderItemLocator().setConstraint(new org.eclipse.draw2d.geometry.Rectangle(x, y, width, height));
-	}
-«ENDDEFINE»
-
-«DEFINE handleNotificationEventBody FOR gmfgen::GenExternalNodeLabel-»
-	Object feature = event.getFeature();
-	«EXPAND xpt::diagram::editparts::Common::handleText FOR self-»
-	super.handleNotificationEvent(event);
-«ENDDEFINE»
-
-«DEFINE createFigure FOR gmfgen::GenExternalNodeLabel-»
-	«EXPAND xpt::diagram::editparts::Common::labelFigure FOR viewmap-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt
deleted file mode 100644
index 8d40a11bb99..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/LinkEditPart.xpt
+++ /dev/null
@@ -1,194 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«DEFINE _constructor FOR gmfgen::GenLink-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-	}
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPoliciesBody FOR gmfgen::GenLink-»
-	super.createDefaultEditPolicies();
-	«IF null = modelFacet-»
-		installEditPolicy(org.eclipse.gef.EditPolicy.COMPONENT_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.ViewComponentEditPolicy());
-	«ENDIF-»
-	«EXPAND xpt::diagram::editparts::Common::installSemanticEditPolicy-»
-	«EXPAND installGraphicalNodeEditPolicy-»
-	«EXPAND xpt::diagram::editparts::Common::behaviour FOR self-»
-	«EXPAND additionalEditPolicies-»
-«ENDDEFINE»
-
-«DEFINE installGraphicalNodeEditPolicy FOR gmfgen::GenLink-»
-«ENDDEFINE»
-
-«DEFINE additionalEditPolicies FOR gmfgen::GenLink»«ENDDEFINE»
-
-«DEFINE addFixedChild FOR gmfgen::GenLink-»
-«IF labels->notEmpty() and (labels->exists(l | l.viewmap.oclIsKindOf(gmfgen::ParentAssignedViewmap)) 
-	or labels->exists(l | l.viewmap.oclIsKindOf(gmfgen::ModeledViewmap))) -»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean addFixedChild(org.eclipse.gef.EditPart childEditPart) {
-		«FOREACH labels AS label-»
-			«EXPAND addLabel(label) FOR label.viewmap-»
-		«ENDFOREACH-»
-		return false;
-	}
-«ENDIF»
-«ENDDEFINE»
-
-// Note, condition in addFixedChild template above should be changed if addLabel support added for Viewmaps other than ParentAssignedViewmap
-«DEFINE addLabel(label : gmfgen::GenLinkLabel) FOR gmfgen::Viewmap»«ENDDEFINE»
-«DEFINE addLabel(label : gmfgen::GenLinkLabel) FOR gmfgen::ParentAssignedViewmap-»
-	«EXPAND addLabelCommonCode(getterName, label)-»
-«ENDDEFINE»
-
-«DEFINE addLabel(label : gmfgen::GenLinkLabel) FOR gmfgen::ModeledViewmap-»
-	«LET figureModel.oclAsType(gmfgraph::DiagramLabel).accessor AS labelAccessor-»
-		«IF not labelAccessor.oclIsUndefined() and not labelAccessor.accessor.oclIsUndefined()-»
-			«EXPAND addLabelCommonCode(labelAccessor.accessor, label)-»
-		«ENDIF-»
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE addLabelCommonCode(getterName : String, label : gmfgen::GenLinkLabel) FOR gmfgen::Viewmap-»
- 	if (childEditPart instanceof «label.getEditPartQualifiedClassName()») {
- 		((«label.getEditPartQualifiedClassName()») childEditPart).«EXPAND impl::diagram::editparts::TextAware::labelSetterName»(
- 				getPrimaryShape().«getterName»());
- 				return true;
- 	}
-«ENDDEFINE»
-
-«DEFINE removeFixedChild FOR gmfgen::GenLink-»
-«IF labels->notEmpty() and (labels->exists(l | l.viewmap.oclIsKindOf(gmfgen::ParentAssignedViewmap)) 
-	or labels->exists(l | l.viewmap.oclIsKindOf(gmfgen::ModeledViewmap))) -»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean removeFixedChild(org.eclipse.gef.EditPart childEditPart) {
-		«FOREACH labels AS label-»
-			«EXPAND removeLabel(label) FOR label.viewmap-»
-		«ENDFOREACH-»
-		return false;
-	}
-«ENDIF»
-«ENDDEFINE»
-
-// Note, condition in removeFixedChild template above should be changed if removeLabel support added for Viewmaps other than ParentAssignedViewmap
-«DEFINE removeLabel(label : gmfgen::GenLinkLabel) FOR gmfgen::Viewmap»«ENDDEFINE»
-«DEFINE removeLabel(label : gmfgen::GenLinkLabel) FOR gmfgen::ParentAssignedViewmap-»
-	«EXPAND removeLabelCommonCode FOR label-»
-«ENDDEFINE»
-
-«DEFINE removeLabel(label : gmfgen::GenLinkLabel) FOR gmfgen::ModeledViewmap-»
-	«EXPAND removeLabelCommonCode FOR label-»
-«ENDDEFINE»
-
-«DEFINE removeLabelCommonCode FOR gmfgen::GenLinkLabel-»
-	if (childEditPart instanceof «getEditPartQualifiedClassName()») {
- 		return true;
- 	}
-«ENDDEFINE»
-
-«DEFINE addChildVisual FOR gmfgen::GenLink-»
-«IF labels->notEmpty() and (labels->exists(l | l.viewmap.oclIsKindOf(gmfgen::ParentAssignedViewmap))
-	or labels->exists(l | l.viewmap.oclIsKindOf(gmfgen::ModeledViewmap)))-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void addChildVisual(org.eclipse.gef.EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, index);
-	}
-«ENDIF»
-«ENDDEFINE»
-
-«DEFINE removeChildVisual FOR gmfgen::GenLink-»
-«IF labels->notEmpty() and (labels->exists(l | l.viewmap.oclIsKindOf(gmfgen::ParentAssignedViewmap))
-	or labels->exists(l | l.viewmap.oclIsKindOf(gmfgen::ModeledViewmap)))-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void removeChildVisual(org.eclipse.gef.EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)) {
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-«ENDIF»
-«ENDDEFINE»
-
-«DEFINE createLinkFigure FOR gmfgen::GenLink-»
-	«EXPAND xpt::Common::generatedMemberComment(
-		'Creates figure for this edit part.\n' + 
-		'\n' + 
-		'Body of this method does not depend on settings in generation model\n' + 
-		'so you may safely remove <i>generated</i> tag and modify it.\n'
-	)»
-	«EXPAND createLinkFigure(self) FOR viewmap-»
-«ENDDEFINE»
-
-«DEFINE createLinkFigure(link : gmfgen::GenLink) FOR gmfgen::Viewmap-»
-	«ERROR 'Unknown viewmap: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE createLinkFigure(link : gmfgen::GenLink) FOR gmfgen::ModeledViewmap-»
-		protected org.eclipse.draw2d.Connection createConnectionFigure() {
-			return new «EXPAND _modeledViewmapFigureFQN»();
-		}
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		public «EXPAND _modeledViewmapFigureFQN» getPrimaryShape() {
-			return («EXPAND _modeledViewmapFigureFQN») getFigure();
-		}
-		
-		«EXPAND impl::diagram::editparts::viewmaps::modeledViewmapProducer::viewmapClassBody-»
-«ENDDEFINE»
-
-«DEFINE _modeledViewmapFigureFQN FOR gmfgen::ModeledViewmap-»
-«EXPAND impl::diagram::editparts::viewmaps::modeledViewmapProducer::viewmapFigureFQN FOR self-»
-«ENDDEFINE»
-
-«DEFINE createLinkFigure(link : gmfgen::GenLink) FOR gmfgen::FigureViewmap-»
-	«LET (if figureQualifiedClassName = null then 'org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx' else figureQualifiedClassName endif) AS fqn-»
-		protected org.eclipse.draw2d.Connection createConnectionFigure() {
-			return new «fqn»();
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public «fqn» getPrimaryShape() {
-			return («fqn») getFigure();
-		}
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE createLinkFigure(link : gmfgen::GenLink) FOR gmfgen::SnippetViewmap»
-	protected org.eclipse.draw2d.Connection createConnectionFigure() {
-		return «body»;
-	}
-«ENDDEFINE»
-
-«DEFINE createLinkFigure(link : gmfgen::GenLink) FOR gmfgen::InnerClassViewmap»
-	protected org.eclipse.draw2d.Connection createConnectionFigure() {
-		return new «className»();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «className» getPrimaryShape() {
-		return («className») getFigure();
-	}
-
-	«classBody»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/LinkLabelEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/LinkLabelEditPart.xpt
deleted file mode 100644
index 0c86f57f465..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/LinkLabelEditPart.xpt
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::ViewmapAttributesUtils»
-
-«DEFINE initializer FOR gmfgen::GenLinkLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	static {
-		registerSnapBackPosition(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»,
-				new org.eclipse.draw2d.geometry.Point(«labelOffsetX(viewmap, 0)», «labelOffsetY(viewmap, 0)»));
-	}
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenLinkLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-	}
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPoliciesBody FOR gmfgen::GenLinkLabel-»
-	super.createDefaultEditPolicies();
-	installEditPolicy(org.eclipse.gef.EditPolicy.DIRECT_EDIT_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy());
-	installEditPolicy(org.eclipse.gef.EditPolicy.SELECTION_FEEDBACK_ROLE, new «getDiagram().getTextSelectionEditPolicyQualifiedClassName()»());
-	installEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE,	new «EXPAND linkLabelDragPolicyQualifiedClassName FOR self.getDiagram()»());
-	«EXPAND xpt::diagram::editparts::Common::behaviour FOR self-»
-	«EXPAND additionalEditPolicies-»
-«ENDDEFINE»
-
-«DEFINE additionalEditPolicies FOR gmfgen::GenLinkLabel»«ENDDEFINE»
-
-«DEFINE getKeyPoint FOR gmfgen::GenLinkLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public int getKeyPoint() {
-		return org.eclipse.draw2d.ConnectionLocator.«alignment»;
-	}
-«ENDDEFINE»
-
-«DEFINE handleNotificationEventBody FOR gmfgen::GenLinkLabel-»
-	Object feature = event.getFeature();
-	«EXPAND xpt::diagram::editparts::Common::handleText FOR self-»
-	super.handleNotificationEvent(event);
-«ENDDEFINE»
-
-«REM»since 3.1, old generated NodeLabelDragPolicy extracted to GMFT-runtime, 
-see org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy.
-The next 2 DEFINE's are left here as a hook for backward compatibility with possible AROUND's
-«ENDREM» 
-«DEFINE linkLabelDragPolicyQualifiedClassName FOR gmfgen::GenDiagram»org.eclipse.gmf.tooling.runtime.edit.policies.DefaultLinkLabelDragPolicy«ENDDEFINE»
-«DEFINE linkLabelDragPolicyClass FOR gmfgen::GenDiagram»
-«REM»not generated by default anymore«ENDREM»«-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt
deleted file mode 100644
index 31341c1a95b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/NodeEditPart.xpt
+++ /dev/null
@@ -1,596 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«EXTENSION xpt::diagram::ViewmapAttributesUtils»
-«EXTENSION xpt::diagram::editparts::Utils»
-«EXTENSION xpt::diagram::Utils»
-
-
-«DEFINE extendsListContents FOR gmfgen::GenNode-»
-«IF hasBorderItems(self)»org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderedShapeEditPart«ELSE»org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE extendsListContents FOR gmfgen::GenChildSideAffixedNode-»
-«IF hasBorderItems(self)»org.eclipse.gmf.runtime.diagram.ui.editparts.BorderedBorderItemEditPart«ELSE»org.eclipse.gmf.runtime.diagram.ui.editparts.AbstractBorderItemEditPart«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-	}
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPoliciesBody FOR gmfgen::GenNode-»
-«EXPAND installCreationRolePolicy-»
-	super.createDefaultEditPolicies();
-	«EXPAND installPrimaryDragEditPolicy-»
-	«EXPAND xpt::diagram::editparts::Common::installSemanticEditPolicy-»
-	«EXPAND installGraphicalNodeEditPolicy-»
-	«IF not childNodes->isEmpty()-»
-		installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.DRAG_DROP_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.DragDropEditPolicy());
-	«ENDIF-»
-	«EXPAND xpt::diagram::editparts::Common::installCanonicalEditPolicy-»
-	installEditPolicy(org.eclipse.gef.EditPolicy.LAYOUT_ROLE, createLayoutEditPolicy());
-	«EXPAND xpt::diagram::editparts::Common::behaviour FOR self-»
-	// XXX need an SCR to runtime to have another abstract superclass that would let children add reasonable editpolicies
-	// removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CONNECTION_HANDLES_ROLE);
-	«EXPAND additionalEditPolicies-»
-«ENDDEFINE»
-
-«DEFINE additionalEditPolicies FOR gmfgen::GenNode»«ENDDEFINE»
-
-«DEFINE installGraphicalNodeEditPolicy FOR gmfgen::GenNode-»
-	«IF needsGraphicalNodeEditPolicy(self)-»
-		installEditPolicy(org.eclipse.gef.EditPolicy.GRAPHICAL_NODE_ROLE, new «getGraphicalNodeEditPolicyQualifiedClassName()»());
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE installCreationRolePolicy FOR gmfgen::GenNode-»
-«IF self.childNodes->notEmpty() or hasChildrenInListCompartments(self)-»
-	«EXPAND xpt::diagram::editparts::Common::installCreationEditPolicy-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE installPrimaryDragEditPolicy FOR gmfgen::GenNode»«ENDDEFINE»
-
-«DEFINE installPrimaryDragEditPolicy FOR gmfgen::GenChildSideAffixedNode-»
-		installEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE, getPrimaryDragEditPolicy());
-«ENDDEFINE»
-
-«DEFINE createLayoutEditPolicy FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gef.editpolicies.LayoutEditPolicy createLayoutEditPolicy() {
-		«EXPAND createLayoutEditPolicyBody-»
-	}
-«ENDDEFINE»
-
-«DEFINE createLayoutEditPolicyBody FOR gmfgen::GenNode-»
-	«IF gmfgen::ViewmapLayoutType::XY_LAYOUT = getLayoutType()-»
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.XYLayoutEditPolicy() {
-
-			protected org.eclipse.gef.EditPolicy createChildEditPolicy(org.eclipse.gef.EditPart child) {
-				«EXPAND borderItemSelectionEditPolicy-»
-				org.eclipse.gef.EditPolicy result = super.createChildEditPolicy(child);
-				if (result == null) {
-					return new org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy();
-				}
-				return result;
-			}
-		};
-		return lep;
-	«ELSEIF gmfgen::ViewmapLayoutType::TOOLBAR_LAYOUT = getLayoutType()»
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.ConstrainedToolbarLayoutEditPolicy() {
-
-			protected org.eclipse.gef.EditPolicy createChildEditPolicy(org.eclipse.gef.EditPart child) {
-				«EXPAND borderItemSelectionEditPolicy-»
-				if (child.getEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE) == null) {
-					if (child instanceof org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart) {
-						return new «getDiagram().getTextSelectionEditPolicyQualifiedClassName()»();
-					}
-				}
-				return super.createChildEditPolicy(child);
-			}
-		};
-		return lep;
-	«ELSEIF gmfgen::ViewmapLayoutType::FLOW_LAYOUT = getLayoutType()»
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.FlowLayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.FlowLayoutEditPolicy() {
-			«IF hasBorderItems(self)»
-			protected org.eclipse.gef.EditPolicy createChildEditPolicy(org.eclipse.gef.EditPart child) {
-				«EXPAND borderItemSelectionEditPolicy-»
-				return super.createChildEditPolicy(child);
-			}
-			«ENDIF-»
-
-			protected org.eclipse.gef.commands.Command createAddCommand(org.eclipse.gef.EditPart child, org.eclipse.gef.EditPart after) {
-				return null;
-			}
-
-			protected org.eclipse.gef.commands.Command createMoveChildCommand(org.eclipse.gef.EditPart child, org.eclipse.gef.EditPart after) {
-				return null;
-			}
-
-			protected org.eclipse.gef.commands.Command getCreateCommand(org.eclipse.gef.requests.CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	«ELSE-»
-		org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy lep = new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LayoutEditPolicy() {
-
-			protected org.eclipse.gef.EditPolicy createChildEditPolicy(org.eclipse.gef.EditPart child) {
-				«EXPAND borderItemSelectionEditPolicy-»
-				org.eclipse.gef.EditPolicy result = child.getEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE);
-				if (result == null) {
-					result = new org.eclipse.gef.editpolicies.NonResizableEditPolicy();
-				}
-				return result;
-			}
-
-			protected org.eclipse.gef.commands.Command getMoveChildrenCommand(org.eclipse.gef.Request request) {
-				return null;
-			}
-
-			protected org.eclipse.gef.commands.Command getCreateCommand(org.eclipse.gef.requests.CreateRequest request) {
-				return null;
-			}
-		};
-		return lep;
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE borderItemSelectionEditPolicy FOR gmfgen::GenNode-»
-«IF hasBorderItems(self)-»
-org.eclipse.gmf.runtime.notation.View childView = (org.eclipse.gmf.runtime.notation.View) child.getModel();
-switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDiagram()»(childView)) {
-«IF getExternalLabels(self)->size() > 0-»
-«FOREACH getExternalLabels(self) AS nextLabel-»
-«EXPAND xpt::Common::caseVisualID FOR nextLabel-»
-«ENDFOREACH-»
-	return «EXPAND borderItemSelectionEP»;
-«ENDIF-»
-«IF getSideAffixedChildren(self)->size() > 0-»
-«FOREACH getSideAffixedChildren(self) AS nextBorderItem-»
-«EXPAND xpt::Common::caseVisualID FOR nextBorderItem-»
-«ENDFOREACH-»
-	return new org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy();
-«ENDIF-»
-}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE borderItemSelectionEP FOR gmfgen::GenNode-»
-new org.eclipse.gmf.runtime.diagram.ui.editpolicies.BorderItemSelectionEditPolicy() {
-
-	protected java.util.List createSelectionHandles() {
-		org.eclipse.gef.handles.MoveHandle mh = new org.eclipse.gef.handles.MoveHandle((org.eclipse.gef.GraphicalEditPart) getHost());
-		mh.setBorder(null);
-		return java.util.Collections.singletonList(mh);
-	}
-}
-«ENDDEFINE»
-
-/* 
-  FIXME
-  1. single generation of createNodeShape(), with inner body filled by polymorphic initPrimaryShape, same as in Lite RT
-  2. getPrimaryShape() for SnippetViewmap. Other templates use it regardless of Viewmap kind, perhaps need to add className to SnippetViewmap (with IFigure being default?)
-  3. Common (single and shared with Lite RT) condition when to force useLocalConstraints. Lite checks for compartments isEmpty, shouldn't we do the same?
-*/
-«DEFINE createNodeShape(node : gmfgen::GenNode) FOR gmfgen::Viewmap-»
-	«ERROR 'Unknown viewmap: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE createNodeShape(node : gmfgen::GenNode) FOR gmfgen::ModeledViewmap-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected org.eclipse.draw2d.IFigure createNodeShape() {
-			return primaryShape = new «EXPAND _modeledViewmapFigureFQN»()«-»
-				«IF node.childNodes->notEmpty() and node.getLayoutType() = gmfgen::ViewmapLayoutType::XY_LAYOUT»«EXPAND forceUseLocalCoordinates»«ENDIF»;
-		}
-		
-		«REM»FIXME: we don't have QVTo helper, only EXPAND, so we can't call «EXPAND getPrimaryShapeMethod FOR fqn »«ENDREM»«-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		public «EXPAND _modeledViewmapFigureFQN» getPrimaryShape() {
-			return («EXPAND _modeledViewmapFigureFQN») primaryShape;
-		}
-«ENDDEFINE»
-
-«DEFINE _modeledViewmapFigureFQN FOR gmfgen::ModeledViewmap»«EXPAND impl::diagram::editparts::viewmaps::modeledViewmapProducer::viewmapFigureFQN FOR self»«ENDDEFINE»
-
-«DEFINE createNodeShape(node : gmfgen::GenNode) FOR gmfgen::FigureViewmap-»
-	«LET (if figureQualifiedClassName = null then 'org.eclipse.draw2d.RectangleFigure' else figureQualifiedClassName endif) AS fqn-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected org.eclipse.draw2d.IFigure createNodeShape() {
-			return primaryShape = new «fqn»()«IF node.childNodes->notEmpty() and node.getLayoutType() = gmfgen::ViewmapLayoutType::XY_LAYOUT»«EXPAND forceUseLocalCoordinates»«ENDIF»;
-		}
-
-		«EXPAND getPrimaryShapeMethod FOR fqn-»
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE createNodeShape(node : gmfgen::GenNode) FOR gmfgen::SnippetViewmap-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure createNodeShape() {
-		return «body»;
-	}
-«ENDDEFINE»
-
-«DEFINE createNodeShape(node : gmfgen::GenNode) FOR gmfgen::InnerClassViewmap-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure createNodeShape() {
-		return primaryShape = new «className»()«IF node.childNodes->notEmpty() and node.getLayoutType() = gmfgen::ViewmapLayoutType::XY_LAYOUT»«EXPAND forceUseLocalCoordinates»«ENDIF»;
-	}
-
-	«EXPAND getPrimaryShapeMethod FOR className-»
-«ENDDEFINE»
-
-«DEFINE forceUseLocalCoordinates FOR OclAny-»
-{
-	protected boolean useLocalCoordinates() {
-		return true;
-	}
-}«-»
-«ENDDEFINE»
-
-«DEFINE getPrimaryShapeMethod FOR String-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «self» getPrimaryShape() {
-		return («self») primaryShape;
-	}
-«ENDDEFINE»
-
-«DEFINE addFixedChild FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean addFixedChild(org.eclipse.gef.EditPart childEditPart) {
-«FOREACH getInnerFixedLabels(self) AS label-»
-«LET label.viewmap.oclAsType(gmfgen::ParentAssignedViewmap) AS childViewmap-»
-«LET childViewmap.getterName AS getterName-»
-		if (childEditPart instanceof «label.getEditPartQualifiedClassName()») {
-			((«label.getEditPartQualifiedClassName()») childEditPart).«EXPAND impl::diagram::editparts::TextAware::labelSetterName FOR childViewmap»(getPrimaryShape().«getterName»());
-			return true;
-		}
-«ENDLET-»
-«ENDLET-»
-«ENDFOREACH-»
-«FOREACH getInnerFixedLabelsWithModeledViewmaps(self) AS label-»
-«LET label.viewmap.oclAsType(gmfgen::ModeledViewmap) AS childViewmap-»
-«LET childViewmap.figureModel.oclAsType(gmfgraph::DiagramLabel).accessor.accessor AS getterName-»
-		if (childEditPart instanceof «label.getEditPartQualifiedClassName()») {
-			((«label.getEditPartQualifiedClassName()») childEditPart).«EXPAND impl::diagram::editparts::TextAware::labelSetterName FOR childViewmap»(getPrimaryShape().«getterName»());
-			return true;
-		}
-«ENDLET-»
-«ENDLET-»
-«ENDFOREACH-»
-«FOREACH getPinnedCompartments(self) AS compartment-»
-«LET compartment.viewmap.oclAsType(gmfgen::ParentAssignedViewmap) AS childViewmap-»
-		if (childEditPart instanceof «compartment.getEditPartQualifiedClassName()») {
-			org.eclipse.draw2d.IFigure pane = getPrimaryShape().«childViewmap.getterName»();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((«compartment.getEditPartQualifiedClassName()») childEditPart).getFigure());
-			return true;
-		}	
-«ENDLET-»
-«ENDFOREACH-»
-«FOREACH getPinnedCompartmentsWithModeledViewmaps(self) AS compartment-»
-«LET compartment.viewmap.oclAsType(gmfgen::ModeledViewmap) AS childViewmap-»
-«LET childViewmap.figureModel.oclAsType(gmfgraph::Compartment).accessor.accessor AS getterName-»
-		if (childEditPart instanceof «compartment.getEditPartQualifiedClassName()») {
-			org.eclipse.draw2d.IFigure pane = getPrimaryShape().«getterName»();
-			setupContentPane(pane); // FIXME each comparment should handle his content pane in his own way 
-			pane.add(((«compartment.getEditPartQualifiedClassName()») childEditPart).getFigure());
-			return true;
-		}	
-«ENDLET-»
-«ENDLET-»
-«ENDFOREACH-»
-«FOREACH getSideAffixedChildren(self) AS child-»
-		if (childEditPart instanceof «child.getEditPartQualifiedClassName()») {
-			org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator locator = new org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator(getMainFigure(), org.eclipse.draw2d.PositionConstants.«child.preferredSideName»);
-			getBorderedFigure().getBorderItemContainer().add(((«child.getEditPartQualifiedClassName()») childEditPart).getFigure(), locator);
-			return true;
-		}
-«ENDFOREACH-»
-		return false;
-	}
-«ENDDEFINE»
-
-«DEFINE removeFixedChild FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean removeFixedChild(org.eclipse.gef.EditPart childEditPart) {
-«FOREACH getInnerFixedLabels(self) AS label-»
-		if (childEditPart instanceof «label.getEditPartQualifiedClassName()») {
-			return true;
-		}
-«ENDFOREACH-»
-«FOREACH getInnerFixedLabelsWithModeledViewmaps(self) AS label-»
-		if (childEditPart instanceof «label.getEditPartQualifiedClassName()») {
-			return true;
-		}
-«ENDFOREACH-»
-«FOREACH getPinnedCompartments(self) AS compartment-»
-«LET compartment.viewmap.oclAsType(gmfgen::ParentAssignedViewmap) AS childViewmap-»
-		if (childEditPart instanceof «compartment.getEditPartQualifiedClassName()») {
-			org.eclipse.draw2d.IFigure pane = getPrimaryShape().«childViewmap.getterName»();
-			pane.remove(((«compartment.getEditPartQualifiedClassName()») childEditPart).getFigure());
-			return true;
-		}	
-«ENDLET-»
-«ENDFOREACH-»
-«FOREACH getPinnedCompartmentsWithModeledViewmaps(self) AS compartment-»
-«LET compartment.viewmap.oclAsType(gmfgen::ModeledViewmap) AS childViewmap-»
-«LET childViewmap.figureModel.oclAsType(gmfgraph::Compartment).accessor.accessor AS getterName-»
-		if (childEditPart instanceof «compartment.getEditPartQualifiedClassName()») {
-			org.eclipse.draw2d.IFigure pane = getPrimaryShape().«getterName»();
-			pane.remove(((«compartment.getEditPartQualifiedClassName()») childEditPart).getFigure());
-			return true;
-		}	
-«ENDLET-»
-«ENDLET-»
-«ENDFOREACH-»
-«FOREACH getSideAffixedChildren(self) AS child-»
-		if (childEditPart instanceof «child.getEditPartQualifiedClassName()») {
-			getBorderedFigure().getBorderItemContainer().remove(((«child.getEditPartQualifiedClassName()») childEditPart).getFigure());
-			return true;
-		}
-«ENDFOREACH-»
-		return false;
-	}
-«ENDDEFINE»
-
-«DEFINE addChildVisual FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void addChildVisual(org.eclipse.gef.EditPart childEditPart, int index) {
-		if (addFixedChild(childEditPart)) {
-			return;
-		}
-		super.addChildVisual(childEditPart, -1);
-	}
-«ENDDEFINE»
-
-«DEFINE removeChildVisual FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void removeChildVisual(org.eclipse.gef.EditPart childEditPart) {
-		if (removeFixedChild(childEditPart)){
-			return;
-		}
-		super.removeChildVisual(childEditPart);
-	}
-«ENDDEFINE»
-
-«DEFINE getContentPaneFor FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure getContentPaneFor(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart editPart) {
-		«REM»it is unclear what we should return for labels here«ENDREM-»
-«FOREACH getPinnedCompartments(self) AS compartment»«LET compartment.viewmap.oclAsType(gmfgen::ParentAssignedViewmap) AS childViewmap-»
-		if (editPart instanceof «compartment.getEditPartQualifiedClassName()») {
-			return getPrimaryShape().«childViewmap.getterName»();
-		}	
-«ENDLET»«ENDFOREACH-»
-«FOREACH getPinnedCompartmentsWithModeledViewmaps(self) AS compartment-»
-«LET compartment.viewmap.oclAsType(gmfgen::ModeledViewmap) AS childViewmap-»
-«LET childViewmap.figureModel.oclAsType(gmfgraph::Compartment).accessor.accessor AS getterName-»
-		if (editPart instanceof «compartment.getEditPartQualifiedClassName()») {
-			return getPrimaryShape().«getterName»();
-		}	
-«ENDLET-»
-«ENDLET-»
-«ENDFOREACH-»
-«IF hasBorderItems(self)-»
-		if (editPart instanceof org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart) {
-			return getBorderedFigure().getBorderItemContainer();
-		}
-«ENDIF-»
-		return getContentPane();
-	}
-«ENDDEFINE»
-
-«DEFINE addBorderItem FOR gmfgen::GenNode-»
-	«IF getExternalLabels(self)->size() > 0-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected void addBorderItem(org.eclipse.draw2d.IFigure borderItemContainer, org.eclipse.gmf.runtime.diagram.ui.editparts.IBorderItemEditPart borderItemEditPart) {
-			if («FOREACH getExternalLabels(self) AS label SEPARATOR ' || '»borderItemEditPart instanceof «label.getEditPartQualifiedClassName()»«ENDFOREACH») {
-				org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator locator = new org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemLocator(getMainFigure(), org.eclipse.draw2d.PositionConstants.SOUTH);
-				locator.setBorderItemOffset(new org.eclipse.draw2d.geometry.Dimension(-20, -20));
-				borderItemContainer.add(borderItemEditPart.getFigure(), locator);
-			} else {
-				super.addBorderItem(borderItemContainer, borderItemEditPart);
-			}
-		}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE createNodePlate FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure createNodePlate() {
-		org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure result = new org.eclipse.gmf.runtime.gef.ui.figures.DefaultSizeNodeFigure(«IF getDiagram().isPixelMapMode()»«defaultSizeWidth(viewmap, 40)», «defaultSizeHeight(viewmap, 40)»«ELSE»getMapMode().DPtoLP(«defaultSizeWidth(viewmap, 40)»), getMapMode().DPtoLP(«defaultSizeHeight(viewmap, 40)»)«ENDIF»);
-		«EXPAND setupNodePlate-»
-		return result;
-	}
-«ENDDEFINE»
-
-«DEFINE setupNodePlate FOR gmfgen::GenNode»«ENDDEFINE»
-
-«DEFINE setupNodePlate FOR gmfgen::GenChildSideAffixedNode»
-	//FIXME: workaround for #154536
-	result.getBounds().setSize(result.getPreferredSize());
-«ENDDEFINE»
-
-«DEFINE getPrimaryDragEditPolicy FOR gmfgen::GenNode-»
-	«LET getResizeConstraints(viewmap) AS rc-»
-		«IF null <> primaryDragEditPolicyQualifiedClassName or null <> rc-»
-			«EXPAND xpt::Common::generatedMemberComment»
-			public org.eclipse.gef.EditPolicy getPrimaryDragEditPolicy() {
-				«IF null <> primaryDragEditPolicyQualifiedClassName-»
-					return new «primaryDragEditPolicyQualifiedClassName»();
-				«ELSE-»
-					org.eclipse.gef.EditPolicy result = super.getPrimaryDragEditPolicy();
-					if (result instanceof org.eclipse.gef.editpolicies.ResizableEditPolicy) {
-						org.eclipse.gef.editpolicies.ResizableEditPolicy ep = (org.eclipse.gef.editpolicies.ResizableEditPolicy) result;
-						ep.setResizeDirections(
-							«IF rc.resizeHandleNames->size() > 0-»
-								«FOREACH rc.resizeHandleNames->asSequence() AS name SEPARATOR ' | '»org.eclipse.draw2d.PositionConstants.«name»«ENDFOREACH-»
-							«ELSE»org.eclipse.draw2d.PositionConstants.NONE«ENDIF»);
-					}
-					return result;
-				«ENDIF-»
-			}
-		«ENDIF-»
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE createFigure FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment(
-		'Creates figure for this edit part.\n' + 
-		'\n' + 
-		'Body of this method does not depend on settings in generation model\n' + 
-		'so you may safely remove <i>generated</i> tag and modify it.\n'
-	)»
-	protected org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure create«IF hasBorderItems(self)»Main«ELSE»Node«ENDIF»Figure() {
-		org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure figure = createNodePlate();
-		figure.setLayoutManager(new org.eclipse.draw2d.StackLayout());
-		org.eclipse.draw2d.IFigure shape = createNodeShape();
-		figure.add(shape);
-		contentPane = setupContentPane(shape);
-		return figure;
-	}
-«ENDDEFINE»
-
-«DEFINE setupContentPane FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment(
-		'Default implementation treats passed figure as content pane.\n' + 
-		'Respects layout one may have set for generated figure.\n' + 
-		'@param nodeShape instance of generated figure class'
-	)»
-	protected org.eclipse.draw2d.IFigure setupContentPane(org.eclipse.draw2d.IFigure nodeShape) {
-		«IF not childNodes->isEmpty() or (not compartments->isEmpty() or labels[not oclIsKindOf(gmfgen::GenExternalNodeLabel)]->notEmpty())-»
-			if (nodeShape.getLayoutManager() == null) {
-				«IF getLayoutType() = gmfgen::ViewmapLayoutType::XY_LAYOUT-»
-					nodeShape.setLayoutManager(new org.eclipse.draw2d.FreeformLayout() {
-
-						public Object getConstraint(org.eclipse.draw2d.IFigure figure) {
-							Object result = constraints.get(figure);
-							if (result == null) {
-								result = new org.eclipse.draw2d.geometry.Rectangle(0, 0, -1, -1);
-							}
-							return result;
-						}
-					});
-				«ELSE-»
-					org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout layout =new org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout();
-					layout.setSpacing(«IF getDiagram().isPixelMapMode()»5«ELSE»getMapMode().DPtoLP(5)«ENDIF»);
-					nodeShape.setLayoutManager(layout);
-				«ENDIF-»
-			}
-		«ENDIF-»
-		return nodeShape; // use nodeShape itself as contentPane
-	}
-«ENDDEFINE»
-
-«DEFINE getContentPane FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.draw2d.IFigure getContentPane() {
-		if (contentPane != null) {
-			return contentPane;
-		}
-		return super.getContentPane();
-	}
-«ENDDEFINE»
-
-«DEFINE setForegroundColor FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setForegroundColor(org.eclipse.swt.graphics.Color color) {
-		if (primaryShape != null) {
-			primaryShape.setForegroundColor(color);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE setBackgroundColor FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setBackgroundColor(org.eclipse.swt.graphics.Color color) {
-		if (primaryShape != null) {
-			primaryShape.setBackgroundColor(color);
-		}
-	}
-«ENDDEFINE»
- 
-«DEFINE setLineWidth FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setLineWidth(int width) {
-		if (primaryShape instanceof org.eclipse.draw2d.Shape) {
-			((org.eclipse.draw2d.Shape) primaryShape).setLineWidth(«IF getDiagram().isPixelMapMode()»width«ELSE»getMapMode().DPtoLP(width)«ENDIF»);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE setLineStyle FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setLineType(int style) {
-		if (primaryShape instanceof org.eclipse.draw2d.Shape) {
-			((org.eclipse.draw2d.Shape) primaryShape).setLineStyle(style);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE getPrimaryChildEditPart FOR gmfgen::GenNode-»
-	«IF not labels->isEmpty()-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.gef.EditPart getPrimaryChildEditPart() {
-			return getChildBySemanticHint(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall FOR labels->first()»);
-		}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE handleNotificationEventBody FOR gmfgen::GenTopLevelNode-»
-	if (event.getNotifier() == getModel() && org.eclipse.emf.ecore.EcorePackage.eINSTANCE.getEModelElement_EAnnotations().equals(event.getFeature())) {
-		handleMajorSemanticChange();
-	} else {
-		super.handleNotificationEvent(event);
-	}
-«ENDDEFINE»
-
-«DEFINE innerClassDeclaration FOR gmfgen::Viewmap»
-«ENDDEFINE»
-
-«DEFINE innerClassDeclaration FOR gmfgen::InnerClassViewmap»
-	«classBody»
-«ENDDEFINE»
-
-«DEFINE innerClassDeclaration FOR gmfgen::ModeledViewmap»
-	«EXPAND impl::diagram::editparts::viewmaps::modeledViewmapProducer::viewmapClassBody FOR self»
-«ENDDEFINE»
-
-«DEFINE getTargetEditPartMethod FOR gmfgen::GenNode»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gef.EditPart getTargetEditPart(org.eclipse.gef.Request request) {
-		if (request instanceof org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest) {
-			org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter adapter = ((org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewAndElementRequest) request).getViewAndElementDescriptor().getCreateElementRequestAdapter();
-			org.eclipse.gmf.runtime.emf.type.core.IElementType type = (org.eclipse.gmf.runtime.emf.type.core.IElementType) adapter.getAdapter(org.eclipse.gmf.runtime.emf.type.core.IElementType.class);
-«FOREACH compartments->asSequence() AS compartment-»
-	«IF listCompartmentHasChildren(compartment)-»
-		«FOREACH compartment.childNodes->asSequence() AS childNode-»
-			if (type == «EXPAND xpt::providers::ElementTypes::accessElementType FOR childNode») {
-				return getChildBySemanticHint(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall FOR compartment»);
-			}
-		«ENDFOREACH-»
-	«ENDIF-»
-«ENDFOREACH-»
-		}
-		return super.getTargetEditPart(request);
-	}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/NodeLabelEditPart.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/NodeLabelEditPart.xpt
deleted file mode 100644
index 61cec8a41fb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/NodeLabelEditPart.xpt
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::editparts::Utils»
-
-«DEFINE _constructor FOR gmfgen::GenNodeLabel-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartClassName»(org.eclipse.gmf.runtime.notation.View view) {
-		super(view);
-	}
-«ENDDEFINE»
-
-«DEFINE createDefaultEditPoliciesBody FOR gmfgen::GenNodeLabel-»
-	super.createDefaultEditPolicies();
-	installEditPolicy(org.eclipse.gef.EditPolicy.SELECTION_FEEDBACK_ROLE, new «getDiagram().getTextSelectionEditPolicyQualifiedClassName()»());
-	installEditPolicy(org.eclipse.gef.EditPolicy.DIRECT_EDIT_ROLE, new org.eclipse.gmf.runtime.diagram.ui.editpolicies.LabelDirectEditPolicy());
-	installEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE, new «EXPAND nodeLabelDragPolicyQualifiedClassName FOR self.getDiagram()»());
-	«EXPAND xpt::diagram::editparts::Common::behaviour FOR self-»
-	«EXPAND additionalEditPolicies-»
-«ENDDEFINE»
-
-«DEFINE additionalEditPolicies FOR gmfgen::GenNodeLabel»«ENDDEFINE»
-
-«DEFINE refreshBounds FOR gmfgen::GenNodeLabel-»
-	«IF isStoringChildPositions(node)-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected void refreshBounds() {
-			int width = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width())).intValue();
-			int height = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height())).intValue();
-			org.eclipse.draw2d.geometry.Dimension size = new org.eclipse.draw2d.geometry.Dimension(width, height);
-			int x = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_X())).intValue();
-			int y = ((Integer) getStructuralFeatureValue(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_Y())).intValue();
-			org.eclipse.draw2d.geometry.Point loc = new org.eclipse.draw2d.geometry.Point(x, y);
-			((org.eclipse.gef.GraphicalEditPart) getParent()).setLayoutConstraint(this, getFigure(), new org.eclipse.draw2d.geometry.Rectangle(loc, size));
-		}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE handleNotificationEventBody FOR gmfgen::GenNodeLabel-»
-	Object feature = event.getFeature();
-	«IF isStoringChildPositions(node)-»
-		«EXPAND xpt::diagram::editparts::Common::handleBounds FOR self-»
-	«ENDIF-»
-	«EXPAND xpt::diagram::editparts::Common::handleText FOR self-»
-	super.handleNotificationEvent(event);
-«ENDDEFINE»
-
-«REM»since 3.1, old generated NodeLabelDragPolicy extracted to GMFT-runtime, 
-see org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy.
-The next 2 DEFINE's are left here as a hook for backward compatibility with possible AROUND's
-«ENDREM» 
-«DEFINE nodeLabelDragPolicyQualifiedClassName FOR gmfgen::GenDiagram»org.eclipse.gmf.tooling.runtime.edit.policies.DefaultNodeLabelDragPolicy«ENDDEFINE»
-
-«DEFINE nodeLabelDragPolicyClass FOR gmfgen::GenDiagram-»
-«REM»not generated by default anymore«ENDREM»«-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/RuntimeLabelsSupport.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/RuntimeLabelsSupport.qvto
deleted file mode 100644
index 600ccd3aa52..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/RuntimeLabelsSupport.qvto
+++ /dev/null
@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2012, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.OclMigrationProblems;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype gmfgraph uses "http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition";
-
-library RuntimeLabelsSupport;
-
-
-helper isVerticalLabel(commonBase : gmfgen::GenCommonBase) : Boolean {
-  return 
-  	not commonBase.viewmap.oclIsUndefined() and (
-    	(commonBase.viewmap.oclIsKindOf(gmfgen::ParentAssignedViewmap) and isVerticalLabelParentAssignedViewmap(commonBase.viewmap.oclAsType(gmfgen::ParentAssignedViewmap)))
-    	or 
-    	(commonBase.viewmap.oclIsKindOf(gmfgen::ModeledViewmap) and isVerticalLabelModeledViewmap(commonBase.viewmap.oclAsType(gmfgen::ModeledViewmap)))
-    )
-}
-
-helper isVerticalLabelParentAssignedViewmap(vm : gmfgen::ParentAssignedViewmap) : Boolean {
-	return undefinedAsFalse(vm.figureQualifiedClassName = getVerticalLabelFQN())
-}
-
-helper isVerticalLabelModeledViewmap(vm : gmfgen::ModeledViewmap) : Boolean {
-	return 
-		not vm.figureModel.oclIsUndefined()
-		and vm.figureModel.oclIsKindOf(gmfgraph::DiagramLabel)
-		and isVerticalDiagramLabel(vm.figureModel.oclAsType(gmfgraph::DiagramLabel))
-}
-
-helper isVerticalDiagramLabel(dl : gmfgraph::DiagramLabel) : Boolean {
-	return 
-		not dl.accessor.figure.oclIsUndefined() and dl.accessor.figure.oclIsKindOf(gmfgraph::VerticalLabel)
-}
-
-
-helper getSimpleLabelDelegateFQN() : String {
-  return getRuntimeLabelPackage().concat(".").concat("SimpleLabelDelegate");
-}
-
-helper getVerticalLabelFQN() : String {
-  return getRuntimeLabelPackage().concat(".").concat("VerticalLabel");
-}
-
-helper getVerticalLabelDelegateFQN() : String {
-  return getRuntimeLabelPackage().concat(".").concat("VerticalLabelDelegate");
-}
-
-helper getVerticalLabelCellEditorLocatorFQN() : String {
-  return getRuntimeLabelPackage().concat(".").concat("VerticalLabelCellEditorLocator");
-}
-
-helper getRuntimeLabelPackage() : String {
-  return "org.eclipse.gmf.tooling.runtime.draw2d.labels";
-}
-
-helper supportsVerticalLabels(diagram : gmfgen::GenDiagram) : Boolean {
-  return diagram.getAllNodes()->exists(n | hasVerticalLabels(n))
-}
-
-helper hasVerticalLabels(node : gmfgen::GenNode) : Boolean {
-  return isVerticalLabel(node) or node.labels->exists(label | isVerticalLabel(label))
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
deleted file mode 100644
index cabe878b5b6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/TextAware.xpt
+++ /dev/null
@@ -1,687 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::ViewmapAttributesUtils»
-«EXTENSION impl::diagram::editparts::ChoiceUtils»
-«EXTENSION impl::diagram::editparts::RuntimeLabelsSupport»
-«EXTENSION impl::parsers::expression»
-
-«DEFINE fields FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gef.tools.DirectEditManager manager;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.common.ui.services.parser.IParser parser;
-
-	«IF isOclChoiceLabel() or isViewExpressionDefiedAndOcl()-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTracker.Registrator myOclRegistrator;
-	«ELSE-»
-	«EXPAND xpt::Common::generatedMemberComment»
- 	private «EXPAND CodeStyle::G('java.util.List', '?')» parserElements;
-	«ENDIF-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private String defaultText;	
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate labelDelegate;
-«ENDDEFINE»
-
-«DEFINE methods(needsRefreshBounds : Boolean, readOnly : Boolean, useElementIcon : Boolean, viewmap : gmfgen::Viewmap,
-		modelFacet : gmfgen::LabelModelFacet, host : gmfgen::GenCommonBase, diagram : gmfgen::GenDiagram) FOR gmfgen::GenCommonBase-»
-	«EXPAND getLabelTextHelper-»
-	
-	«EXPAND setLabelTextHelper-»
-	
-	«EXPAND getLabelIconHelper-»
-	
-	«EXPAND setLabelIconHelper-»
-	
-	«EXPAND labelSetter-»
-	
-	«EXPAND getModelChildren-»
-	
-	«EXPAND getChildBySemanticHint-»
-	
-	«EXPAND getParserElement(modelFacet)-»
-	
-	«EXPAND getLabelIcon(useElementIcon, diagram)-»
-	
-	«EXPAND getLabelText-»
-	
-	«EXPAND setLabelText(diagram)-»
-	
-	«EXPAND getEditText-»
-	
-	«EXPAND isEditable(readOnly)-»
-	
-	«EXPAND getEditTextValidator-»
-	
-	«EXPAND getCompletionProcessor-»
-	
-	«EXPAND getParserOptions-»
-	
-	«EXPAND getParser(modelFacet, diagram, host)-»
-	
-	«EXPAND getManager(diagram, modelFacet)-»
-	
-	«EXPAND setManager-»
-	
-	«EXPAND performDirectEdit-»
-	
-	«EXPAND performDirectEditAtPoint(modelFacet)-»
-
-«IF not(isChoiceLabel(modelFacet))-»
-	«EXPAND performDirectEditWithInitialChar-»
-«ENDIF»	
-	
-	«EXPAND performDirectEditRequest(modelFacet)-»
-	
-	«EXPAND refreshVisuals(needsRefreshBounds)-»
-	
-	«EXPAND refreshLabel(diagram)-»
-	
-	«EXPAND refreshUnderline-»
-	
-	«EXPAND refreshStrikeThrough-»
-	
-	«EXPAND refreshFont-»
-	
-	«EXPAND refreshSelectionFeedback-»
-	
-	«EXPAND setFontColor-»
-	
-	«EXPAND addSemanticListeners-»
-	
-	«EXPAND removeSemanticListeners-»
-	
-	«EXPAND getAccessibleEditPart-»
-	
-	«EXPAND getFontStyleOwnerView(viewmap)-»
-		
-«IF isOclChoiceLabelWithShowExpr() or isViewExpressionDefiedAndOcl()-»
-	«EXPAND getOclTracker-»
-«ENDIF-»
-	
-«IF isOclChoiceLabel() or isViewExpressionDefiedAndOcl()-»
-	«EXPAND getOclRegistrator-»
-«ENDIF-»
-
-  «EXPAND getLabelDelegate -»
-    
-  «EXPAND getAdapter -»
-«ENDDEFINE»
-
-«DEFINE labelSetterName FOR gmfgen::ParentAssignedViewmap-»
-«IF setterName <> null»«setterName»«ELSE»setLabel«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE labelSetterName FOR gmfgen::Viewmap»setLabel«ENDDEFINE»
-«DEFINE labelSetterName FOR gmfgen::ModeledViewmap»setLabel«ENDDEFINE»
-
-«DEFINE getLabelTextHelper FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected String getLabelTextHelper(org.eclipse.draw2d.IFigure figure) {
-		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			return ((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) figure).getText();
-		} «IF isVerticalLabel(self)-»
-		else if (figure instanceof «getVerticalLabelFQN()») {
-			return ((«getVerticalLabelFQN()») figure).getText();
-    	} «ENDIF-»
-		else if (figure instanceof org.eclipse.draw2d.Label) {
-			return ((org.eclipse.draw2d.Label) figure).getText();
-		} else {
-			return getLabelDelegate().getText();
-		} 
-	}
-«ENDDEFINE»
-
-«DEFINE setLabelTextHelper FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setLabelTextHelper(org.eclipse.draw2d.IFigure figure, String text) {
-		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) figure).setText(text);
-		} «IF isVerticalLabel(self)-»
-		else if (figure instanceof «getVerticalLabelFQN()») {
-			((«getVerticalLabelFQN()») figure).setText(text);
-    	} «ENDIF-»
-		else if (figure instanceof org.eclipse.draw2d.Label) {
-			((org.eclipse.draw2d.Label) figure).setText(text);
-		} else {
-			getLabelDelegate().setText(text);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE getLabelIconHelper FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.swt.graphics.Image getLabelIconHelper(org.eclipse.draw2d.IFigure figure) {
-		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			return ((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) figure).getIcon();
-		} «IF isVerticalLabel(self)-»
-		else if (figure instanceof «getVerticalLabelFQN()») {
-			//icons are not supported for verical labels now
-			return null;
-    	} «ENDIF-»
-		else if (figure instanceof org.eclipse.draw2d.Label) {
-			return ((org.eclipse.draw2d.Label) figure).getIcon();
-		} else {
-			return getLabelDelegate().getIcon(0);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE setLabelIconHelper FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setLabelIconHelper(org.eclipse.draw2d.IFigure figure, org.eclipse.swt.graphics.Image icon) {
-		if (figure instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) figure).setIcon(icon);
-			return;
-		} «IF isVerticalLabel(self)-»
-		else if (figure instanceof «getVerticalLabelFQN()») {
-			//icons are not supported for verical labels now, nothing to do
-			return;
-    	} «ENDIF-»
-		else if (figure instanceof org.eclipse.draw2d.Label) {
-			((org.eclipse.draw2d.Label) figure).setIcon(icon);
-			return;
-		} else {
-			getLabelDelegate().setIcon(icon, 0);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE getLabelDelegate FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate getLabelDelegate(){
-		if (labelDelegate == null){
-			org.eclipse.draw2d.IFigure label = getFigure();
-      		if (label instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel){
-        		labelDelegate = new org.eclipse.gmf.runtime.diagram.ui.label.WrappingLabelDelegate((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel)label);
-      		} «IF isVerticalLabel(self)-»
-      		else if (label instanceof «getVerticalLabelFQN()») {
-        		labelDelegate = new «getVerticalLabelDelegateFQN()»((«getVerticalLabelFQN()»)label); 
-      		} «ENDIF-»
-      		else {
-        		labelDelegate = new «getSimpleLabelDelegateFQN()»((org.eclipse.draw2d.Label)label);
-      		}
-    	}
-		return labelDelegate;
-	}
-«ENDDEFINE»
-
-«DEFINE getAdapter FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override-»
-	public Object getAdapter(Class key) {
-		if (org.eclipse.gmf.runtime.diagram.ui.label.ILabelDelegate.class.equals(key)){
-			return getLabelDelegate();
-		}
-		return super.getAdapter(key);
-	}
-«ENDDEFINE»
-
-«DEFINE labelSetter FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void «EXPAND labelSetterName FOR viewmap»(«EXPAND labelSetterFigureClassName FOR viewmap» figure) {
-		unregisterVisuals();
-		setFigure(figure);
-		defaultText = getLabelTextHelper(figure);
-		registerVisuals();
-		refreshVisuals();
-	}
-«ENDDEFINE»
-
-«DEFINE labelSetterFigureClassName FOR gmfgen::ParentAssignedViewmap-»
-	«IF figureQualifiedClassName <> null-»
-	«figureQualifiedClassName»
-	«ELSE-»
-	org.eclipse.draw2d.IFigure
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE labelSetterFigureClassName FOR gmfgen::ModeledViewmap-»
-«EXPAND impl::diagram::editparts::viewmaps::modeledViewmapProducer::viewmapFigureFQN FOR self-»
-«ENDDEFINE»
-
-«DEFINE labelSetterFigureClassName FOR gmfgen::Viewmap-»
-	org.eclipse.draw2d.IFigure
-«ENDDEFINE»
-
-«DEFINE getModelChildren FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::SuppressWarnings('"rawtypes"')-»
-	protected java.util.List getModelChildren() {
-		return java.util.Collections.EMPTY_LIST;
-	}
-«ENDDEFINE»
-
-«DEFINE getChildBySemanticHint FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart getChildBySemanticHint(String semanticHint) {
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE getParserElement(modelFacet : gmfgen::LabelModelFacet) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.emf.ecore.EObject getParserElement() {
-«IF modelFacet = null»
-		org.eclipse.emf.ecore.EObject element = resolveSemanticElement();
-		return element != null ? element : (org.eclipse.gmf.runtime.notation.View) getModel();
-«ELSE»«EXPAND getParserElement FOR modelFacet»«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE getParserElement FOR gmfgen::LabelModelFacet-»
-		return resolveSemanticElement();
-«ENDDEFINE»
-
-«DEFINE getParserElement FOR gmfgen::DesignLabelModelFacet-»
-		return (org.eclipse.gmf.runtime.notation.View) getModel();
-«ENDDEFINE»
-
-«DEFINE getLabelIcon(useElementIcon : Boolean, diagram : gmfgen::GenDiagram) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.swt.graphics.Image getLabelIcon() {
-		«IF useElementIcon-»
-		org.eclipse.emf.ecore.EObject parserElement = getParserElement();
-		if (parserElement == null) {
-			return null;
-		}
-		return «diagram.getElementTypesQualifiedClassName()».getImage(parserElement.eClass());
-		«ELSE-»
-		return null;
-		«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE getLabelText FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected String getLabelText() {
-		String text = null;
-		org.eclipse.emf.ecore.EObject parserElement = getParserElement();
-		if (parserElement != null && getParser() != null) {
-			text = getParser().getPrintString(
-				new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(parserElement),
-				getParserOptions().intValue());
-		}
-		if (text == null || text.length() == 0) {
-			text = defaultText;
-		}
-		return text;
-	}
-«ENDDEFINE»
-
-«DEFINE setLabelText(diagram : gmfgen::GenDiagram) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setLabelText(String text) {
-		setLabelTextHelper(getFigure(), text);
-		refreshSelectionFeedback();
-	}
-«ENDDEFINE»
-
-«DEFINE getEditText FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getEditText() {
-		if (getParserElement() == null || getParser() == null) {
-			return ""; «EXPAND xpt::Common::nonNLS»
-		}
-		return getParser().getEditString(
-			new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(getParserElement()),
-			getParserOptions().intValue());
-	}
-«ENDDEFINE»
-
-«DEFINE isEditable(readOnly : Boolean) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean isEditable() {
-		«IF readOnly-»
-		return false;
-		«ELSE-»
-		return getParser() != null;
-		«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE getEditTextValidator FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.jface.viewers.ICellEditorValidator getEditTextValidator() {
-		return new org.eclipse.jface.viewers.ICellEditorValidator() {
-
-			public String isValid(final Object value) {
-				if (value instanceof String) {
-					final org.eclipse.emf.ecore.EObject element = getParserElement();
-					final org.eclipse.gmf.runtime.common.ui.services.parser.IParser parser = getParser();
-					try {
-						org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus valid =
-							(org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus) getEditingDomain().runExclusive(
-								new org.eclipse.emf.transaction.RunnableWithResult.Impl«EXPAND CodeStyle::G('org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus')»() {
-
-							public void run() {
-								setResult(parser.isValidEditString(new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(element), (String) value));
-							}
-						});
-						return valid.getCode() == org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus.EDITABLE ? null : valid.getMessage();
-					} catch (InterruptedException ie) {
-						ie.printStackTrace();
-					}
-				}
-
-				// shouldn't get here
-				return null;
-			}
-		};
-	}
-«ENDDEFINE»
-
-«DEFINE getCompletionProcessor FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.jface.text.contentassist.IContentAssistProcessor getCompletionProcessor() {
-		if (getParserElement() == null || getParser() == null) {
-			return null;
-		}
-		return getParser().getCompletionProcessor(new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(getParserElement()));
-	}
-«ENDDEFINE»
-
-«DEFINE getParserOptions FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions getParserOptions() {
-		return org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions.NONE;
-	}
-«ENDDEFINE»
-
-«DEFINE getParser(modelFacet : gmfgen::LabelModelFacet, diagram : gmfgen::GenDiagram, host : gmfgen::GenCommonBase) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.ui.services.parser.IParser getParser() {
-		if (parser == null) {
-			parser = «EXPAND parsers::ParserProvider::accessorCall(host, modelFacet, 'getParserElement()')»;
-		}
-		return parser;
-	}
-«ENDDEFINE»
-
-«DEFINE getManager(diagram : gmfgen::GenDiagram, modelFacet : gmfgen::LabelModelFacet) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gef.tools.DirectEditManager getManager() {
-		if (manager == null) {
-			setManager(new «getDirectManagerFQN(modelFacet)»(this,
-				null,
-				«diagram.getEditPartFactoryQualifiedClassName()».getTextCellEditorLocator(this)));
-		}
-		return manager;
-	}
-«ENDDEFINE»
-
-«DEFINE setManager FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setManager(org.eclipse.gef.tools.DirectEditManager manager) {
-		this.manager = manager;
-	}
-«ENDDEFINE»
-
-«DEFINE performDirectEdit FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void performDirectEdit() {
-		getManager().show();
-	}
-«ENDDEFINE»
-	
-«DEFINE performDirectEditAtPoint(modelFacet : gmfgen::LabelModelFacet) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void performDirectEdit(org.eclipse.draw2d.geometry.Point eventLocation) {
-		if (getManager().getClass() == «getDirectManagerFQN(modelFacet)».class) {
-			((«getDirectManagerFQN(modelFacet)») getManager()).show(eventLocation.getSWTPoint());
-		}
-	}
-«ENDDEFINE»
-	
-«DEFINE performDirectEditWithInitialChar FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private void performDirectEdit(char initialCharacter) {
-		if (getManager() instanceof org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager) {
-			((org.eclipse.gmf.runtime.diagram.ui.tools.TextDirectEditManager) getManager()).show(initialCharacter);
-		} else //
-		{
-			performDirectEdit();
-		}
-	}
-«ENDDEFINE»
-	
-«DEFINE performDirectEditRequest(modelFacet : gmfgen::LabelModelFacet) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void performDirectEditRequest(org.eclipse.gef.Request request) {
-		final org.eclipse.gef.Request theRequest = request;
-		try {
-			getEditingDomain().runExclusive(new Runnable() {
-
-				public void run() {
-					if (isActive() && isEditable()) {
-						«IF not(isChoiceLabel(modelFacet))-»
-						if (theRequest.getExtendedData().get(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR) instanceof Character) {
-							Character initialChar = (Character) theRequest.getExtendedData().get(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_DIRECTEDIT_EXTENDEDDATA_INITIAL_CHAR);
-							performDirectEdit(initialChar.charValue());
-						} else «ENDIF» if ((theRequest instanceof org.eclipse.gef.requests.DirectEditRequest) && (getEditText().equals(getLabelText()))) {
-							org.eclipse.gef.requests.DirectEditRequest editRequest = (org.eclipse.gef.requests.DirectEditRequest) theRequest;
-							performDirectEdit(editRequest.getLocation());
-						} else {
-							performDirectEdit();
-						}
-					}
-				}
-			});
-		} catch (InterruptedException e) {
-			e.printStackTrace();
-		}
-	}
-«ENDDEFINE»
-	
-«DEFINE refreshVisuals(needsRefreshBounds : Boolean) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void refreshVisuals() {
-		super.refreshVisuals();
-		refreshLabel();
-		refreshFont();
-		refreshFontColor();
-		refreshUnderline();
-		refreshStrikeThrough();
-		«IF needsRefreshBounds-»
-		refreshBounds();
-		«ENDIF-»
-	}
-«ENDDEFINE»
-	
-«DEFINE refreshLabel(diagram : gmfgen::GenDiagram) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void refreshLabel() {
-		setLabelTextHelper(getFigure(), getLabelText());
-		setLabelIconHelper(getFigure(), getLabelIcon());
-		refreshSelectionFeedback();
-	}
-«ENDDEFINE»
-	
-«DEFINE refreshUnderline FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void refreshUnderline() {
-		org.eclipse.gmf.runtime.notation.FontStyle style =
-			(org.eclipse.gmf.runtime.notation.FontStyle) getFontStyleOwnerView().getStyle(
-				org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getFigure()).setTextUnderline(style.isUnderline());
-		}
-	}
-«ENDDEFINE»
-	
-«DEFINE refreshStrikeThrough FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void refreshStrikeThrough() {
-		org.eclipse.gmf.runtime.notation.FontStyle style =
-			(org.eclipse.gmf.runtime.notation.FontStyle) getFontStyleOwnerView().getStyle(
-				org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null && getFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getFigure()).setTextStrikeThrough(style.isStrikeThrough());
-		}
-	}
-«ENDDEFINE»
-	
-«DEFINE refreshFont FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void refreshFont() {
-		org.eclipse.gmf.runtime.notation.FontStyle style =
-			(org.eclipse.gmf.runtime.notation.FontStyle) getFontStyleOwnerView().getStyle(
-				org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle());
-		if (style != null) {
-			org.eclipse.swt.graphics.FontData fontData = new org.eclipse.swt.graphics.FontData(
-				style.getFontName(), style.getFontHeight(),
-				(style.isBold() ? org.eclipse.swt.SWT.BOLD : org.eclipse.swt.SWT.NORMAL) |
-				(style.isItalic() ? org.eclipse.swt.SWT.ITALIC : org.eclipse.swt.SWT.NORMAL));
-			setFont(fontData);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE refreshSelectionFeedback FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private void refreshSelectionFeedback() {
-		requestEditPolicyFeedbackRefresh(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE);
-		requestEditPolicyFeedbackRefresh(org.eclipse.gef.EditPolicy.SELECTION_FEEDBACK_ROLE);
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	private void requestEditPolicyFeedbackRefresh(String editPolicyKey) {
-		Object editPolicy = getEditPolicy(editPolicyKey);
-		if (editPolicy instanceof org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy) {
-			((org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy)editPolicy).refreshFeedback();
-		}
-	}
-«ENDDEFINE»
-
-	
-«DEFINE setFontColor FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setFontColor(org.eclipse.swt.graphics.Color color) {
-		getFigure().setForegroundColor(color);
-	}
-«ENDDEFINE»
-	
-«DEFINE addSemanticListeners FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void addSemanticListeners() {
-«IF isOclChoiceLabel() or isViewExpressionDefiedAndOcl()-»
-		«IF isOclChoiceLabelWithShowExpr() or isViewExpressionDefiedAndOcl()-»
-		org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTracker tracker = getTracker();
-		tracker.initialize(resolveSemanticElement());
-		tracker.installListeners(getEditingDomain(), this, getOclRegistrator());
-		«ELSE-»
-		super.addSemanticListeners();
-		«ENDIF-»
-		«IF isOclChoiceLabel()-»
-		((org.eclipse.gmf.tooling.runtime.parsers.OclChoiceParser) getParser()).installListeners(this, getOclRegistrator());
-		«ENDIF-»		
-«ELSE-»
-		if (getParser() instanceof org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser) {
-			org.eclipse.emf.ecore.EObject element = resolveSemanticElement();
-			parserElements = ((org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser) getParser()).getSemanticElementsBeingParsed(element);
-			for (int i = 0; i < parserElements.size(); i++) {
-				addListenerFilter("SemanticModel" + i, this, (org.eclipse.emf.ecore.EObject) parserElements.get(i)); «EXPAND xpt::Common::nonNLS»
-			}
-		} else {
-			super.addSemanticListeners();
-		}
-«ENDIF-»	
-	}
-«ENDDEFINE»
-	
-«DEFINE removeSemanticListeners FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void removeSemanticListeners() {
-«IF isOclChoiceLabel() or isViewExpressionDefiedAndOcl()-»			
-		«IF isOclChoiceLabel()-»
-		((org.eclipse.gmf.tooling.runtime.parsers.OclChoiceParser) getParser()).uninstallListeners();
-		«ENDIF-»
-		«IF isOclChoiceLabelWithShowExpr() or isViewExpressionDefiedAndOcl()-»
-		getTracker().uninstallListeners();	
-		«ELSE-»
-		super.removeSemanticListeners();
-		«ENDIF-»	
-«ELSE-»		
-		if (parserElements != null) {
-			for (int i = 0; i < parserElements.size(); i++) {
-				removeListenerFilter("SemanticModel" + i); «EXPAND xpt::Common::nonNLS»
-			}
-		} else {
-			super.removeSemanticListeners();
-		}
-«ENDIF-»
-	}
-«ENDDEFINE»
-	
-«DEFINE getAccessibleEditPart FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gef.AccessibleEditPart getAccessibleEditPart() {
-		if (accessibleEP == null) {
-			accessibleEP = new AccessibleGraphicalEditPart() {
-
-				public void getName(org.eclipse.swt.accessibility.AccessibleEvent e) {
-					e.result = getLabelTextHelper(getFigure());
-				}
-			};
-		}
-		return accessibleEP;
-	}
-«ENDDEFINE»
-	
-«DEFINE getFontStyleOwnerView(viewmap : gmfgen::Viewmap) FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	 private org.eclipse.gmf.runtime.notation.View getFontStyleOwnerView() {
-		«IF viewmap.isFixedFont()-»
-		return (org.eclipse.gmf.runtime.notation.View) getModel();
-		«ELSE-»
-		return getPrimaryView();
-		«ENDIF-»
-	 }
-«ENDDEFINE»
-
-«DEFINE getOclTracker FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTracker getTracker() {
-		return ((org.eclipse.gmf.tooling.runtime.ocl.tracker.HasOclTracker) getParser()).getOclTracker();
-	}
-«ENDDEFINE»
-
-«DEFINE getOclRegistrator FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTracker.Registrator getOclRegistrator() {
-		if (myOclRegistrator == null) {
-			myOclRegistrator = new org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTracker.Registrator() {
-
-				«EXPAND CodeStyle::overrideI-»
-				public void registerListener(String filterId, org.eclipse.gmf.runtime.diagram.core.listener.NotificationListener listener, org.eclipse.emf.ecore.EObject element) {
-					addListenerFilter(filterId, listener, element);
- 				}
-
-				«EXPAND CodeStyle::overrideI-»
-				public void unregisterListener(String filterId) {
-					removeListenerFilter(filterId);
-				}
-			};
-		}
-		return myOclRegistrator;
-	}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/viewmaps/BareFigure.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/viewmaps/BareFigure.qvto
deleted file mode 100644
index d3ff41ca42d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/viewmaps/BareFigure.qvto
+++ /dev/null
@@ -1,47 +0,0 @@
-/*****************************************************************************
- * Copyright (c) 2011, 2020 Borland, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - xPand implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-modeltype gmfgraph uses "http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
- 
-library BareFigure;
-
-helper isSomethingToWorkWith() : Boolean {
-	return false
-}
-
-helper isBareFigureDescriptor(descriptor : gmfgraph::FigureDescriptor) : Boolean {
-	return 
-		descriptor.actualFigure.oclIsKindOf(gmfgraph::RealFigure) and  
-		isBareFigure(descriptor.actualFigure.oclAsType(gmfgraph::RealFigure))
-}
-
-helper isBareFigure(figure : gmfgraph::RealFigure) : Boolean {
-	return 
-		let eClass : ecore::EClass = figure.oclAsType(ecore::EObject).eClass() in 
-		let featuresToCheck : OrderedSet(ecore::EStructuralFeature) = eClass.eAllStructuralFeatures->
-			reject(f : ecore::EStructuralFeature | 
-				f._derived  
-				or (f.eContainingClass.name = 'RealFigure' and f.name = 'name')
-				or (f.eContainingClass.name = 'RealFigure' and f.name = 'children')
-				or (f.eContainingClass.name = 'CustomClass' and f.name = 'qualifiedClassName')
-				or (f.eContainingClass.name = 'CustomFigure' and f.name = 'customChildren')
-			)
-		in 
-			figure.children->isEmpty() 
-			and not featuresToCheck->exists(f : ecore::EStructuralFeature |
-				figure.oclAsType(ecore::EObject).eIsSet(f)
-			) 
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/viewmaps/modeledViewmapProducer.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/viewmaps/modeledViewmapProducer.xpt
deleted file mode 100644
index 361e19fe1c5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/editparts/viewmaps/modeledViewmapProducer.xpt
+++ /dev/null
@@ -1,76 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2011, 2020 Montages AG, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Montages) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-
-«EXTENSION impl::diagram::editparts::viewmaps::BareFigure»
-
-«DEFINE viewmapFigureFQN FOR gmfgen::ModeledViewmap-»
-«EXPAND figureFQN FOR self.figureModel-»
-«ENDDEFINE»
-
-«DEFINE figureFQN FOR ecore::EObject-»
-«ERROR 'Unknown figureModel: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE figureFQN FOR gmfgraph::DiagramLabel-»
-«IF self.figure.actualFigure.oclIsUndefined()-»
-org.eclipse.draw2d.Label«-»
-«ELSEIF self.accessor.oclIsUndefined()-»
-«REM»FIXME: bare instances«ENDREM»«-»
-«EXPAND Runtime::fqn FOR self.figure.actualFigure-»
-«ELSE-»
-«EXPAND Runtime::fqn FOR self.accessor.figure-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE figureFQN FOR gmfgraph::Node-»
-«EXPAND nodeOrLinkFQN FOR self-»
-«ENDDEFINE»
-
-«DEFINE figureFQN FOR gmfgraph::Connection-»
-«EXPAND nodeOrLinkFQN FOR self-»
-«ENDDEFINE»
-
-«DEFINE nodeOrLinkFQN FOR gmfgraph::DiagramElement-»
-«IF self.figure.actualFigure.oclIsUndefined()-»
-org.eclipse.draw2d.RoundedRectangle«-»
-«ELSEIF isBareFigureDescriptor(self.figure)-»
-«EXPAND Runtime::fqn FOR self.figure.actualFigure-»
-«ELSE-»
-«REM»actual InnerClassViewmap case«ENDREM»«-»
-«self.figure.name.firstToUpper()-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE viewmapClassBody FOR gmfgen::ModeledViewmap-»
-«EXPAND classBody FOR self.figureModel-»
-«ENDDEFINE»
-
-«DEFINE classBody FOR ecore::EObject-»
-«ERROR 'Unknown figureModel: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE classBody FOR gmfgraph::DiagramElement-»
-«IF self.figure.actualFigure.oclIsUndefined() or isBareFigureDescriptor(self.figure)-»
-«REM»nothing to do«ENDREM»«-»
-«ELSE-»
-«REM»actual InnerClassViewmap case«ENDREM»«-»
-«EXPAND top::Descriptor::Inner FOR self.figure-»
-«ENDIF-»
-«ENDDEFINE»
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/update/CanonicalUpdate.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/update/CanonicalUpdate.xpt
deleted file mode 100644
index 82cafc54215..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/update/CanonicalUpdate.xpt
+++ /dev/null
@@ -1,462 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Artem Tikhomirov             - refactoring of containerBaseCanonicalMethods.xpt; extraction of API/non-API of CEP templates
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION xpt::diagram::updater::Utils»
-
-«DEFINE body FOR gmfgen::GenContainerBase-»
-	«EXPAND attributes-»
-
-	«EXPAND refreshOnActivateMethod-»
-
-	«EXPAND getFeaturesToSynchronizeMethod-»
-	
-	«EXPAND getSemanticChildrenListMethod-»
-
-	«EXPAND isOrphanedMethod-»
-
-	«EXPAND isMyDiagramElementMethod-»
-	
-	«EXPAND isShortcutMethod-»
-«ENDDEFINE»
-
-// used to be package-local field
-«DEFINE attributes FOR gmfgen::GenContainerBase-»
-«IF getSemanticChildrenContainmentFeatures(self)->size() > 1-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «EXPAND CodeStyle::G('java.util.Set', 'org.eclipse.emf.ecore.EStructuralFeature')» myFeaturesToSynchronize;
-«ENDIF-»
-«ENDDEFINE»
-
-«REM»
-	The canonical update mechanism of the GMF Runtime heavily depends on EditPart listeners being registered
-	prior to actual canonical update (thus, any change from this policy gets known to the interested EditParts.
-	NodeEditPart.activate() installs a transaction post-commit listener that refreshes the edit part. Canonical EditPolicy 
-	is installed on a top (diagram) element, and its activation happens before diagram children get activated (and have a chance
-	to install their listeners). Hence this what I believe to be an questionable hack (at least, GEF's 
-	activation sequence gets violated). See bugzilla https://bugs.eclipse.org/bugs/show_bug.cgi?id=314670  
-«ENDREM»
-«DEFINE refreshOnActivateMethod FOR gmfgen::GenContainerBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void refreshOnActivate() {
-		// Need to activate editpart children before invoking the canonical refresh for EditParts to add event listeners
-		«EXPAND CodeStyle::G('java.util.List', '?')» c = getHost().getChildren();
-		for (int i = 0; i < c.size(); i++) {
-			((org.eclipse.gef.EditPart) c.get(i)).activate();
-		}
-		super.refreshOnActivate();
-	}
-«ENDDEFINE»
-
-«DEFINE getFeaturesToSynchronizeMethod FOR gmfgen::GenContainerBase-»
-«IF getSemanticChildrenChildFeatures(self)->size() = 1-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.emf.ecore.EStructuralFeature getFeatureToSynchronize() {
-		return «EXPAND MetaModel::MetaFeature FOR getSemanticChildrenContainmentFeatures(self)->any(true)»;
-	}
-«ELSEIF getSemanticChildrenChildFeatures(self)->size() > 1-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected java.util.Set getFeaturesToSynchronize() {
-		if (myFeaturesToSynchronize == null) {
-			myFeaturesToSynchronize = new «EXPAND CodeStyle::G('java.util.HashSet', 'org.eclipse.emf.ecore.EStructuralFeature')»();
-			«EXPAND _addContainmentFeature FOREACH getSemanticChildrenContainmentFeatures(self)-»
-		}
-		return myFeaturesToSynchronize;
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getSemanticChildrenListMethod FOR gmfgen::GenContainerBase-»
-«EXPAND xpt::Common::generatedMemberComment»
-«EXPAND CodeStyle::SuppressWarnings('"rawtypes"')»
-protected java.util.List getSemanticChildrenList() {
-	«IF hasSemanticChildren(self) /*REVISIT: is there real need for this check - Generator seems to consult needsCanonicalEP, which in turns ensures there are semantic children?*/-»
-	org.eclipse.gmf.runtime.notation.View viewObject = (org.eclipse.gmf.runtime.notation.View) getHost().getModel();
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', 'org.eclipse.emf.ecore.EObject')»();
-	«EXPAND CodeStyle::G('java.util.List', getDiagram().editorGen.diagramUpdater.getNodeDescriptorQualifiedClassName())» childDescriptors = «EXPAND xpt::diagram::updater::DiagramUpdater::getSemanticChildrenMethodCall»(viewObject);
-	«EXPAND CodeStyle::iterate('d', getDiagram().editorGen.diagramUpdater.getNodeDescriptorQualifiedClassName(), 'childDescriptors')-»
-		result.add(d.getModelElement());
-	}
-	return result;
-	«ELSE-»
-	return java.util.Collections.EMPTY_LIST;
-	«ENDIF-»
-}
-«ENDDEFINE»
-
-«DEFINE isShortcutMethod FOR gmfgen::GenContainerBase»«ENDDEFINE»
-«DEFINE isShortcutMethod FOR gmfgen::GenDiagram-»
-«IF containsShortcutsTo->notEmpty()-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected static boolean isShortcut(org.eclipse.gmf.runtime.notation.View view) {
-	return view.getEAnnotation("Shortcut") != null; «EXPAND xpt::Common::nonNLS»
-}
-«ENDIF»
-«ENDDEFINE»
-
-«DEFINE isOrphanedMethod FOR gmfgen::GenContainerBase-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected boolean isOrphaned(«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.emf.ecore.EObject')» semanticChildren, final org.eclipse.gmf.runtime.notation.View view) {
-	«IF self.oclIsKindOf(gmfgen::GenDiagram) and self.oclAsType(gmfgen::GenDiagram).containsShortcutsTo->notEmpty()-»
-		if (isShortcut(view)) {
-			return «getDiagram().editorGen.diagramUpdater.getDiagramUpdaterQualifiedClassName()».isShortcutOrphaned(view);
-		}
-	«ENDIF-»
-	return isMyDiagramElement(view) && !semanticChildren.contains(view.getElement());
-}
-«ENDDEFINE»
-
-«DEFINE isMyDiagramElementMethod FOR gmfgen::GenContainerBase-»
-«EXPAND xpt::Common::generatedMemberComment»
-private boolean isMyDiagramElement(org.eclipse.gmf.runtime.notation.View view) {
-«LET getSemanticChildren(self)->size() AS semanticChildrenSize-»
-	«IF semanticChildrenSize = 0 /* shall not happen, provided #needsCanonicalEditPolicy is correct */-»
-	return false;
-	«ELSEIF semanticChildrenSize = 1-»
-	return «EXPAND xpt::editor::VisualIDRegistry::visualID FOR getSemanticChildren(self)->first()» == «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDiagram()»(view);
-	«ELSE-»
-	int visualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDiagram()»(view);
-	«IF semanticChildrenSize > 3 /* do not produce switch statement for short lists */-»
-	switch (visualID) {
-		«EXPAND xpt::Common::caseVisualID FOREACH getSemanticChildren(self)»
-		return true;
-	}
-	return false;
-	«ELSE-»
-	return visualID == «EXPAND xpt::editor::VisualIDRegistry::visualID FOREACH getSemanticChildren(self) SEPARATOR ' || visualID == '»; 
-	«ENDIF-»
-	«ENDIF-»
-«ENDLET-»
-}
-«ENDDEFINE»
-
-//
-// accessible from outside
-
-// Alternative implementation of CEP.refreshSemanticChildren
-«DEFINE refreshSemanticChildren(String createdViewsVar, gmfgen::GenDiagramUpdater diagramUpdater) FOR gmfgen::GenContainerBase-»
-«LET hasConformableSemanticChildren(self) AS childrenShareSameMetaclass-»
-		«EXPAND CodeStyle::G('java.util.List', diagramUpdater.getNodeDescriptorQualifiedClassName())» childDescriptors = «-» 
-			«IF hasSemanticChildren(self) /*REVISIT: is there real need for this check - Generator seems to consult needsCanonicalEP, which in turns ensures there are semantic children?, but with respect to #352271*/-»
-				«EXPAND xpt::diagram::updater::DiagramUpdater::getSemanticChildrenMethodCall»((org.eclipse.gmf.runtime.notation.View) getHost().getModel());
-			«ELSE-»
-				/* see #352271 */ «EXPAND CodeStyle::emptyList»;
-			«ENDIF-»
-		«EXPAND CodeStyle::newGenericInstance('orphaned', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View')»();
-		«LET self.oclIsKindOf(gmfgen::GenDiagram) and self.oclAsType(gmfgen::GenDiagram).containsShortcutsTo->notEmpty() AS safeHasShortcuts-»
-		// we care to check only views we recognize as ours«IF safeHasShortcuts» and not shortcuts«ENDIF»
-		«EXPAND CodeStyle::newGenericInstance('knownViewChildren', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View')»();
-		«EXPAND CodeStyle::iterate('v', 'org.eclipse.gmf.runtime.notation.View', 'getViewChildren()')-»
-«IF safeHasShortcuts-»
-			if (isShortcut(v)) {
-				if («getDiagram().editorGen.diagramUpdater.getDiagramUpdaterQualifiedClassName()».isShortcutOrphaned(v)) {
-					orphaned.add(v);
-				}
-				continue;
-			} 
-«ENDIF-»
-			if (isMyDiagramElement(v)) {
-				knownViewChildren.add(v);
-			}
-		}
-		«ENDLET-»
-		// alternative to #cleanCanonicalSemanticChildren(getViewChildren(), semanticChildren)
-		«IF childrenShareSameMetaclass-»
-		«EXPAND CodeStyle::newGenericInstance2('potentialViews', 'java.util.HashMap', diagramUpdater.getNodeDescriptorQualifiedClassName(), 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View')»();
-		«ENDIF-»
-		//
-		// iteration happens over list of desired semantic elements, trying to find best matching View, while original CEP
-		// iterates views, potentially losing view (size/bounds) information - i.e. if there are few views to reference same EObject, only last one 
-		// to answer isOrphaned == true will be used for the domain element representation, see #cleanCanonicalSemanticChildren()
-		«EXPAND CodeStyle::iterate('next', diagramUpdater.getNodeDescriptorQualifiedClassName(), 'descriptorsIterator', 'childDescriptors.iterator()')-»
-			String hint = «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall('next.getVisualID()')»;
-			«EXPAND CodeStyle::newGenericInstance('perfectMatch', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View')»(); // both semanticElement and hint match that of NodeDescriptor
-			«IF childrenShareSameMetaclass-»
-			«EXPAND CodeStyle::newGenericInstance('potentialMatch', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View')»(); // semanticElement matches, hint does not
-			«ENDIF-»
-			«EXPAND CodeStyle::iterate('childView', 'org.eclipse.gmf.runtime.notation.View', 'getViewChildren()')-»
-				org.eclipse.emf.ecore.EObject semanticElement = childView.getElement();
-				if (next.getModelElement().equals(semanticElement)) {
-					if (hint.equals(childView.getType())) {
-						perfectMatch.add(childView);
-						// actually, can stop iteration over view children here, but
-						// may want to use not the first view but last one as a 'real' match (the way original CEP does
-						// with its trick with viewToSemanticMap inside #cleanCanonicalSemanticChildren
-					«IF childrenShareSameMetaclass-»
-					} else {
-						potentialMatch.add(childView);
-					«ENDIF-»
-					}
-					«REM» do not break, loop through all potential view children in hope there would be precise match«ENDREM»«-»
-				}
-			}
-			if (perfectMatch.size() > 0) {
-				descriptorsIterator.remove(); // precise match found no need to create anything for the NodeDescriptor
-				// use only one view (first or last?), keep rest as orphaned for further consideration
-				knownViewChildren.remove(perfectMatch.getFirst());
-			«IF childrenShareSameMetaclass-»
-			} else if (potentialMatch.size() > 0) {
-				«REM»
-					Bug 224206 -  Support switching figure of EditPart with domain element property change: need to create new view for the node descriptor and copy old attributes.
-					To address this, old implementation tries to change VID of the first View known to reference same semantic element
-					but it is possible some potentialMatch would be perfectMatch for later NodeDescriptor
-				«ENDREM»«-»
-				potentialViews.put(next, potentialMatch); 
-			«ENDIF-»
-			}
-		}
-		// those left in knownViewChildren are subject to removal - they are our diagram elements we didn't find match to,
-		// or those we have potential matches to, and thus need to be recreated, preserving size/location information.
-		orphaned.addAll(knownViewChildren);
-		//
-		«IF childrenShareSameMetaclass-»
-		org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand boundsCommand = new org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand(host().getEditingDomain(), org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages.SetLocationCommand_Label_Resize);
-		«ENDIF-»
-		«EXPAND CodeStyle::newGenericInstance('viewDescriptors', 'java.util.ArrayList', 'org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor')»(childDescriptors.size());		
-		«EXPAND CodeStyle::iterate('next', diagramUpdater.getNodeDescriptorQualifiedClassName(), 'childDescriptors')-»
-			String hint = «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall('next.getVisualID()')»;
-			org.eclipse.core.runtime.IAdaptable elementAdapter = new CanonicalElementAdapter(next.getModelElement(), hint);
-			org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor descriptor = new org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor(elementAdapter, org.eclipse.gmf.runtime.notation.Node.class, hint, org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.APPEND, false, host().getDiagramPreferencesHint());
-			viewDescriptors.add(descriptor);
-		«IF childrenShareSameMetaclass /*code to preserve bounds makes sense only when there are children of same metaclass that may have distinctive attribute changed */-»
-			«REM»XXX: IN FACT, we should generate this code IFF child nodes are shapes - no sense to expect bounds in comparments. ASK Vano«ENDREM»
-			«EXPAND CodeStyle::G('java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View')» possibleMatches = «EXPAND CodeStyle::castTyped('java.util.LinkedList')»potentialViews.get(next);
-			if (possibleMatches != null) {
-				// from potential matches, leave those that were not eventually used for some other NodeDescriptor (i.e. those left as orphaned)
-				possibleMatches.retainAll(knownViewChildren);
-			}
-			if (possibleMatches != null && !possibleMatches.isEmpty()) {
-				org.eclipse.gmf.runtime.notation.View originalView = «EXPAND CodeStyle::castTyped('org.eclipse.gmf.runtime.notation.View')»possibleMatches.getFirst();
-				knownViewChildren.remove(originalView); // remove not to copy properties of the same view again and again
-				// add command to copy properties
-				if (originalView instanceof org.eclipse.gmf.runtime.notation.Node) {
-					if (((org.eclipse.gmf.runtime.notation.Node) originalView).getLayoutConstraint() instanceof org.eclipse.gmf.runtime.notation.Bounds) {
-						org.eclipse.gmf.runtime.notation.Bounds b = (org.eclipse.gmf.runtime.notation.Bounds) ((org.eclipse.gmf.runtime.notation.Node) originalView).getLayoutConstraint();
-						boundsCommand.add(new org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new org.eclipse.draw2d.geometry.Rectangle(b.getX(), b.getY(), b.getWidth(), b.getHeight())));
-					} else if (((org.eclipse.gmf.runtime.notation.Node) originalView).getLayoutConstraint() instanceof org.eclipse.gmf.runtime.notation.Location) {
-						org.eclipse.gmf.runtime.notation.Location l = (org.eclipse.gmf.runtime.notation.Location) ((org.eclipse.gmf.runtime.notation.Node) originalView).getLayoutConstraint();
-						boundsCommand.add(new org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new org.eclipse.draw2d.geometry.Point(l.getX(), l.getY())));
-					} else if (((org.eclipse.gmf.runtime.notation.Node) originalView).getLayoutConstraint() instanceof org.eclipse.gmf.runtime.notation.Size) {
-						org.eclipse.gmf.runtime.notation.Size s = (org.eclipse.gmf.runtime.notation.Size) ((org.eclipse.gmf.runtime.notation.Node) originalView).getLayoutConstraint();
-						boundsCommand.add(new org.eclipse.gmf.runtime.diagram.ui.commands.SetBoundsCommand(boundsCommand.getEditingDomain(), boundsCommand.getLabel(), descriptor, new org.eclipse.draw2d.geometry.Dimension(s.getWidth(), s.getHeight())));
-					}
-					«REM»
-					   Note, we don't support Ratio update (as it was done in #populateViewProperties). 
-					   First, SetCompartmentRatioCommand is internal; second reason - I don't believe we generate CEP to update compartments
-					   
-					   FIXME However, makes sense to extract this piece for potential extensions.
-					«ENDREM»«-»
-				}
-			}
-		«ENDIF-»
-		}
-
-		boolean changed = deleteViews(orphaned.iterator());
-		//
-		org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest request = getCreateViewRequest(viewDescriptors);
-		org.eclipse.gef.commands.Command cmd = getCreateViewCommand(request);
-		if (cmd != null && cmd.canExecute() ) {
-			org.eclipse.gmf.runtime.diagram.ui.commands.SetViewMutabilityCommand.makeMutable(new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(host().getNotationView())).execute();
-			executeCommand(cmd);
-			«IF childrenShareSameMetaclass»if (boundsCommand.canExecute()) {
-				executeCommand(new org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy(boundsCommand.reduce()));
-			}
-			«ENDIF-»
-			«EXPAND CodeStyle::SuppressWarnings('"unchecked"')»
-			«EXPAND CodeStyle::G('java.util.List', 'org.eclipse.core.runtime.IAdaptable')» nl = («EXPAND CodeStyle::G('java.util.List', 'org.eclipse.core.runtime.IAdaptable')») request.getNewObject();
-			«createdViewsVar».addAll(nl);
-		}
-		if (changed || «createdViewsVar».size() > 0) {
-			postProcessRefreshSemantic(createdViews);
-		}
-«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE executeLayoutCommand(String createdViewsVar) FOR gmfgen::GenContainerBase-»
-	if («createdViewsVar».size() > 1) {
-		// perform a layout of the container
-		org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand layoutCmd = new org.eclipse.gmf.runtime.diagram.ui.commands.DeferredLayoutCommand(host().getEditingDomain(), «createdViewsVar», host());
-		executeCommand(new org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy(layoutCmd));
-	}
-«ENDDEFINE»
-
-«DEFINE refreshConnectionsBody FOR gmfgen::GenDiagram-»
-	«EXPAND _Domain2Notation» domain2NotationMap = new «EXPAND _Domain2Notation»();
-	«EXPAND CodeStyle::G('java.util.Collection', editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())» linkDescriptors = collectAllLinks(getDiagram(), domain2NotationMap);
-	java.util.Collection existingLinks = new java.util.LinkedList(getDiagram().getEdges());
-	for (java.util.Iterator linksIterator = existingLinks.iterator(); linksIterator.hasNext();) {
-		org.eclipse.gmf.runtime.notation.Edge nextDiagramLink = (org.eclipse.gmf.runtime.notation.Edge) linksIterator.next();
-		int diagramLinkVisualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(nextDiagramLink);
-		if (diagramLinkVisualID == -1«EXPAND _compareLinkVisualID FOREACH links->select(gl | gl.modelFacet.oclIsUndefined())») {
-			if (nextDiagramLink.getSource() != null && nextDiagramLink.getTarget() != null) {
-				linksIterator.remove();
-			}
-			continue;
-		}
-		org.eclipse.emf.ecore.EObject diagramLinkObject = nextDiagramLink.getElement();
-		org.eclipse.emf.ecore.EObject diagramLinkSrc = nextDiagramLink.getSource().getElement();
-		org.eclipse.emf.ecore.EObject diagramLinkDst = nextDiagramLink.getTarget().getElement();
-		«EXPAND CodeStyle::iterate('nextLinkDescriptor', editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName(), 'linkDescriptorsIterator', 'linkDescriptors.iterator()')-»
-			if (diagramLinkObject == nextLinkDescriptor.getModelElement() && diagramLinkSrc == nextLinkDescriptor.getSource() && diagramLinkDst == nextLinkDescriptor.getDestination() && diagramLinkVisualID == nextLinkDescriptor.getVisualID()) {
-				linksIterator.remove();
-				linkDescriptorsIterator.remove();
-				break;
-			}
-		}
-	}
-	deleteViews(existingLinks.iterator());
-	return createConnections(linkDescriptors, domain2NotationMap);
-«ENDDEFINE»
-
-«DEFINE refreshConnectionsAuxMethods FOR gmfgen::GenDiagram-»
-	«EXPAND collectAllLinksMethod-»
-	«EXPAND createConnectionsMethod-»
-	«EXPAND getEditPartMethod-»
-	«EXPAND getDiagramMethod-»
-	«EXPAND getSourceEditPartMethod-»
-	«EXPAND getTargetEditPartMethod-»
-	«EXPAND getHintedEditPartMethod-»
-«ENDDEFINE»
-
-«DEFINE collectAllLinksMethod FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())» collectAllLinks(org.eclipse.gmf.runtime.notation.View view, «EXPAND _Domain2Notation» domain2NotationMap) {
-	if (!«EXPAND xpt::editor::VisualIDRegistry::modelID».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(view))) {
-		return «EXPAND CodeStyle::emptyList»;
-	}
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())»();
-	switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(view)) {
-		«EXPAND _caseSemanticElement FOREACH getAllSemanticElements(self)-»
-	}
-	for (java.util.Iterator children = view.getChildren().iterator(); children.hasNext();) {
-		result.addAll(collectAllLinks((org.eclipse.gmf.runtime.notation.View) children.next(), domain2NotationMap));
-	}
-	for (java.util.Iterator edges = view.getSourceEdges().iterator(); edges.hasNext();) {
-		result.addAll(collectAllLinks((org.eclipse.gmf.runtime.notation.View) edges.next(), domain2NotationMap));
-	}
-	return result;
-}
-«ENDDEFINE»
-
-«DEFINE createConnectionsMethod FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.core.runtime.IAdaptable')»  createConnections(«EXPAND CodeStyle::G('java.util.Collection', editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())» linkDescriptors, «EXPAND _Domain2Notation» domain2NotationMap) {
-	«EXPAND CodeStyle::newGenericInstance('adapters', 'java.util.LinkedList', 'org.eclipse.core.runtime.IAdaptable')»();
-	«EXPAND CodeStyle::iterate('nextLinkDescriptor', editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName(), 'linkDescriptors')-»
-		org.eclipse.gef.EditPart sourceEditPart = getSourceEditPart(nextLinkDescriptor, domain2NotationMap);
-		org.eclipse.gef.EditPart targetEditPart = getTargetEditPart(nextLinkDescriptor, domain2NotationMap);
-		if (sourceEditPart == null || targetEditPart == null) {
-			continue;
-		}
-		org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor descriptor = new org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest.ConnectionViewDescriptor(nextLinkDescriptor.getSemanticAdapter(), «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall('nextLinkDescriptor.getVisualID()')», org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.APPEND, false, ((org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) getHost()).getDiagramPreferencesHint());
-		org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest ccr = new org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewRequest(descriptor);
-		ccr.setType(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_CONNECTION_START);
-		ccr.setSourceEditPart(sourceEditPart);
-		sourceEditPart.getCommand(ccr);
-		ccr.setTargetEditPart(targetEditPart);
-		ccr.setType(org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants.REQ_CONNECTION_END);
-		org.eclipse.gef.commands.Command cmd = targetEditPart.getCommand(ccr);
-		if (cmd != null && cmd.canExecute()) {
-			executeCommand(cmd);
-			org.eclipse.core.runtime.IAdaptable viewAdapter = (org.eclipse.core.runtime.IAdaptable) ccr.getNewObject();
-			if (viewAdapter != null) {
-				adapters.add(viewAdapter);
-			}
-		}
-	}
-	return adapters;
-}
-«ENDDEFINE»
-
-«DEFINE getEditPartMethod FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.gef.EditPart getEditPart(org.eclipse.emf.ecore.EObject domainModelElement, «EXPAND _Domain2Notation» domain2NotationMap) {
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) domain2NotationMap.get(domainModelElement);
-	if (view != null) {
-		return (org.eclipse.gef.EditPart) getHost().getViewer().getEditPartRegistry().get(view);
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getHintedEditPartMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected final org.eclipse.gef.EditPart getHintedEditPart(org.eclipse.emf.ecore.EObject domainModelElement, «EXPAND _Domain2Notation» domain2NotationMap, int hintVisualId) { 
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) domain2NotationMap.getHinted(domainModelElement, «-»
-											«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall('hintVisualId')»);
-	if (view != null) {
-		return (org.eclipse.gef.EditPart) getHost().getViewer().getEditPartRegistry().get(view);
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getSourceEditPartMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.gef.EditPart getSourceEditPart(org.eclipse.gmf.tooling.runtime.update.UpdaterLinkDescriptor descriptor, «EXPAND _Domain2Notation» domain2NotationMap) { 
-	return getEditPart(descriptor.getSource(), domain2NotationMap);
-}
-«ENDDEFINE»
-
-«DEFINE getTargetEditPartMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.gef.EditPart getTargetEditPart(org.eclipse.gmf.tooling.runtime.update.UpdaterLinkDescriptor descriptor, «EXPAND _Domain2Notation» domain2NotationMap) { 
-	return getEditPart(descriptor.getDestination(), domain2NotationMap);
-}
-«ENDDEFINE»
-
-
-«DEFINE getDiagramMethod FOR gmfgen::GenContainerBase-»
-«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.gmf.runtime.notation.Diagram getDiagram() {
-	return ((org.eclipse.gmf.runtime.notation.View) getHost().getModel()).getDiagram();
-}
-«ENDDEFINE»
-
-
-
-//
-// privates
-
-«DEFINE _Domain2Notation FOR gmfgen::GenDiagram»«EXPAND impl::diagram::update::domain2notation::DomainToNotationClassName»«ENDDEFINE»
-
-«DEFINE _addContainmentFeature FOR genmodel::GenFeature-»
-myFeaturesToSynchronize.add(«EXPAND MetaModel::MetaFeature»);
-«ENDDEFINE»
-
-«DEFINE _compareLinkVisualID FOR gmfgen::GenLink» || diagramLinkVisualID == «EXPAND xpt::editor::VisualIDRegistry::visualID»«ENDDEFINE»
-
-«REM»GMF has no links to "leaf" child nodes.«ENDREM»
-«DEFINE _caseSemanticElement FOR gmfgen::GenChildLabelNode»«ENDDEFINE»
-«DEFINE _caseSemanticElement FOR gmfgen::GenCommonBase-»
-«EXPAND xpt::Common::caseVisualID» {
-	if (!domain2NotationMap.containsKey(view.getElement())) {
-«REM»
-	Processing each domain element only once. Prevents us from 
-	having duplicated links if a shortcut to one of the "main"
-	diagram elements present on diagram.
-«ENDREM»«-»
-		result.addAll(«EXPAND xpt::diagram::updater::DiagramUpdater::getContainedLinksMethodCall»(view));
-	}
-	domain2NotationMap.putView(view.getElement(), view);
-	break;	
-}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/update/domain2notation.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/update/domain2notation.xpt
deleted file mode 100644
index a52096ecc02..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/diagram/update/domain2notation.xpt
+++ /dev/null
@@ -1,130 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2012, 2020 Montages AG, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::GenEditorGenerator»
-
-«DEFINE DomainToNotationClassName FOR gmfgen::GenDiagram»Domain2Notation«ENDDEFINE»
-
-«DEFINE DomainToNotationClass FOR gmfgen::GenDiagram-»
-	«EXPAND DomainToNotationClass_One2One-»
-«ENDDEFINE»
-
-«DEFINE DomainToNotationClass_One2One FOR gmfgen::GenDiagram-»
-    «EXPAND xpt::Common::generatedMemberComment»
-	@SuppressWarnings("serial")
-	protected static class «EXPAND DomainToNotationClassName» extends «EXPAND CodeStyle::G2('java.util.HashMap', 'org.eclipse.emf.ecore.EObject', 'org.eclipse.gmf.runtime.notation.View')» {
-	    «EXPAND xpt::Common::generatedMemberComment»
-		public boolean containsDomainElement(org.eclipse.emf.ecore.EObject domainElement){
-			return this.containsKey(domainElement);
-		}
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.gmf.runtime.notation.View getHinted(org.eclipse.emf.ecore.EObject domainEObject, String hint) {
-			return «IF self.jdkComplianceLevel() < 5»(org.eclipse.gmf.runtime.notation.View)«ENDIF»this.get(domainEObject);
-		}
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void putView(org.eclipse.emf.ecore.EObject domainElement, org.eclipse.gmf.runtime.notation.View view) {
-			«REM»
-			Before GMFT 3.0 the call to put() was guarded by the same check in order to store element only once and to prefer non-shortcuts to shortcuts
-			As part of the #389368, we moved this guard to callee implementation, to optionally allow *_One2Many case
-			«ENDREM»«-»
-			if (!containsKey(view.getElement()) «IF getDiagram().containsShortcutsTo->notEmpty()»|| !isShortcut(view)«ENDIF») {
-				this.put(domainElement, view);
-			}
-		}
-		
-	}
-«ENDDEFINE»
-
-«DEFINE DomainToNotationClass_One2Many FOR gmfgen::GenDiagram»
-    «EXPAND xpt::Common::generatedMemberComment»
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	protected static class «EXPAND DomainToNotationClassName» {
-	    «EXPAND xpt::Common::generatedMemberComment»
-		private final java.util.HashMap myMap = new java.util.HashMap();
-		
-	    «EXPAND xpt::Common::generatedMemberComment»
-		public boolean containsDomainElement(org.eclipse.emf.ecore.EObject domainElement){
-			return myMap.containsKey(domainElement);
-		}
-
-	    «EXPAND xpt::Common::generatedMemberComment»
-		public boolean containsKey(org.eclipse.emf.ecore.EObject domainElement){
-			return containsDomainElement(domainElement);
-		}
-		
-	    «EXPAND xpt::Common::generatedMemberComment»
-		public void putView(org.eclipse.emf.ecore.EObject domainElement, org.eclipse.gmf.runtime.notation.View view){
-			Object viewOrList = myMap.get(domainElement);
-			if (viewOrList instanceof org.eclipse.gmf.runtime.notation.View){
-				myMap.remove(domainElement);
-				java.util.List<org.eclipse.gmf.runtime.notation.View> list = new java.util.LinkedList<org.eclipse.gmf.runtime.notation.View>();
-				list.add((org.eclipse.gmf.runtime.notation.View)viewOrList);
-				myMap.put(domainElement, list);
-				list.add(view);
-			} else if (viewOrList instanceof java.util.List){
-				((java.util.List)viewOrList).add(view);
-			} else {
-				myMap.put(domainElement, view);
-			}
-		}
-		
-	    «EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.gmf.runtime.notation.View get(org.eclipse.emf.ecore.EObject domainEObject){
-			Object viewOrList = myMap.get(domainEObject);
-			if (viewOrList instanceof org.eclipse.gmf.runtime.notation.View){
-				return (org.eclipse.gmf.runtime.notation.View)viewOrList;
-			}
-			if (viewOrList instanceof java.util.List){
-				// preferring not-shortcut to shortcut -- important for cases when links arr to/from 
-				// the element that is additionally shortcutted to the same diagram
-				for (Object next : (java.util.List)viewOrList){
-					org.eclipse.gmf.runtime.notation.View nextView = (org.eclipse.gmf.runtime.notation.View)next;
-					if (nextView.getEAnnotation("Shortcut") == null) { «EXPAND xpt::Common::nonNLS»
-						return nextView;
-					}
-				}
-				return (org.eclipse.gmf.runtime.notation.View)((java.util.List)viewOrList).get(0);
-			}
-			return null;
-		}
-		
-	    «EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.gmf.runtime.notation.View getHinted(org.eclipse.emf.ecore.EObject domainEObject, String hint){
-			if (hint == null){
-				return get(domainEObject);
-			}
-			Object viewOrList = myMap.get(domainEObject);
-			if (viewOrList instanceof org.eclipse.gmf.runtime.notation.View){
-				//no choice, will return what we have
-				return (org.eclipse.gmf.runtime.notation.View)viewOrList;
-			}
-			if (viewOrList instanceof java.util.List){ 
-				for (Object next : (java.util.List)viewOrList){
-					org.eclipse.gmf.runtime.notation.View nextView = (org.eclipse.gmf.runtime.notation.View)next;
-					if (hint.equals(nextView.getType())){
-						return nextView;
-					}
-				}
-				//hint not found -- return what we have
-				return (org.eclipse.gmf.runtime.notation.View)((java.util.List)viewOrList).get(0);
-			}
-			return null;
-		}
-	}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/editor/Editor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/editor/Editor.xpt
deleted file mode 100644
index 7058184c275..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/editor/Editor.xpt
+++ /dev/null
@@ -1,19 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010, 2020 Artem Tikhomirov, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (independent) - Initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«DEFINE _atLeastSomething FOR gmfgen::GenCommonBase»«ENDDEFINE»
-
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/AbstractParser.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/AbstractParser.xpt
deleted file mode 100644
index fd63dcf3f76..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/AbstractParser.xpt
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - [235113] alternative parser access
- *                                 [244419] custom parsers
- *	  Michael Golubev (Montages) - [368169] extract not-generated shared code to GMF-T runtime
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«REM»
-Since GMFT 3.1 we don't generate class AbstractParser into every diagram, by extending the 
-org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser.
-If you want to extends other custom implementation you may change the className and quialifiedClassName DEFINE's 
-which are still used in the extend's clauses for generated PredefinedParser's
-«ENDREM»
-«DEFINE className FOR gmfgen::GenParsers»AbstractAttributeParser«ENDDEFINE»
-«DEFINE qualifiedClassName FOR gmfgen::GenParsers»org.eclipse.gmf.tooling.runtime.parsers.«EXPAND className»«ENDDEFINE»
-
-«REM»
-However, for 3.1 release we still will generate empty file (without any java content), 
-to ensure that the old code, including calls to non existing i18n fields in Messages is cleaned up.
-«ENDREM»
-
-«DEFINE deprecatedQualifiedClassName FOR gmfgen::GenParsers»«implPackageName».AbstractParser«ENDDEFINE»
-«DEFINE Main FOR gmfgen::GenParsers-»
-//Since GMFT 3.1 we don't generate class AbstractParser into every diagram, instead extend org.eclipse.gmf.tooling.runtime.parsers.AbstractAttributeParser.
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/ExpressionLabelParser.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/ExpressionLabelParser.xpt
deleted file mode 100644
index b1a9e397a9b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/ExpressionLabelParser.xpt
+++ /dev/null
@@ -1,98 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010, 2020 Artem Tikhomirov, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (independent) - Initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE fields FOR gmfgen::ExpressionLabelParser»«ENDDEFINE»
-
-«DEFINE cons(String name) FOR gmfgen::ExpressionLabelParser-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «name»() {
-	}
-«ENDDEFINE»
-
-«DEFINE accessEditExpression FOR gmfgen::ExpressionLabelParser-»
-«IF editExpression.oclIsUndefined()-»
-	return getPrintString(element, flags);
-«ELSE-»
-«EXPAND _evaluateAndReturnExpressionResult(self, 'evaluateEditExpression', editExpression) FOR editExpression.provider-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE accessViewExpression FOR gmfgen::ExpressionLabelParser-»
-«IF viewExpression.oclIsUndefined()-»
-	// TODO
-	throw new UnsupportedOperationException();
-«ELSE-»
-«EXPAND _evaluateAndReturnExpressionResult(self, 'evaluatePrintExpression', viewExpression) FOR viewExpression.provider-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getExpression(gmfgen::ExpressionLabelParser parser, ValueExpression expression) FOR gmfgen::GenExpressionProviderBase»«ERROR 'Abstract template call: getExpression'»«ENDDEFINE»
-«DEFINE getExpression(gmfgen::ExpressionLabelParser parser, ValueExpression expression) FOR gmfgen::GenExpressionInterpreter-»
-	«EXPAND xpt::expressions::getExpression::getExpression(expression, parser.expressionContext)-»
-«ENDDEFINE»
-
-«DEFINE _evaluateAndReturnExpressionResult(gmfgen::ExpressionLabelParser parser, String javaMethodName, ValueExpression expression) FOR gmfgen::GenExpressionProviderBase»«ERROR 'Abstract template call: _evaluateAndReturnExpressionResult'»«ENDDEFINE»
-«DEFINE _evaluateAndReturnExpressionResult(gmfgen::ExpressionLabelParser parser, String javaMethodName, ValueExpression expression) FOR gmfgen::GenExpressionInterpreter-»
-org.eclipse.emf.ecore.EObject target = (org.eclipse.emf.ecore.EObject) element.getAdapter(org.eclipse.emf.ecore.EObject.class);
-Object result =  «EXPAND getExpression(parser, expression)».evaluate(target);
-return String.valueOf(result);
-«ENDDEFINE»
-«DEFINE _evaluateAndReturnExpressionResult(gmfgen::ExpressionLabelParser parser, String javaMethodName, ValueExpression expression) FOR gmfgen::GenJavaExpressionProvider-»
-return «javaMethodName»((org.eclipse.emf.ecore.EObject) element.getAdapter(org.eclipse.emf.ecore.EObject.class));
-«ENDDEFINE»
-«DEFINE _evaluateAndReturnExpressionResult(gmfgen::ExpressionLabelParser parser, String javaMethodName, ValueExpression expression) FOR gmfgen::GenLiteralExpressionProvider-»
-return «expression.body»;
-«ENDDEFINE»
-
-
-«DEFINE accessValidateExpression FOR gmfgen::ExpressionLabelParser-»
-«IF not validateExpression.oclIsUndefined() -»
-	if («IF validateExpression.provider.getLanguage() = gmfgen::GenLanguage::_literal»!«validateExpression.body»«ELSE-»
-	Boolean.FALSE.equals(«IF validateExpression.provider.oclIsKindOf(gmfgen::GenExpressionInterpreter)»«EXPAND xpt::expressions::getExpression::getExpression(validateExpression, 'org.eclipse.emf.ecore.EcorePackage.eINSTANCE.getEString()') FOR validateExpression.provider.oclAsType(gmfgen::GenExpressionInterpreter)».evaluate(editString)«-»
-	«ELSEIF validateExpression.provider.oclIsKindOf(gmfgen::GenJavaExpressionProvider)»evaluateValidateExpression(editString)«ENDIF»)«ENDIF») {
-		return org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus.UNEDITABLE_STATUS;
-	} // else fall-through
-«ENDIF-»
-	return org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus.EDITABLE_STATUS;
-«ENDDEFINE»
-
-«DEFINE extraMethods FOR gmfgen::ExpressionLabelParser-»
-«IF not viewExpression.oclIsUndefined() and viewExpression.provider.oclIsKindOf(gmfgen::GenJavaExpressionProvider)»
-	«EXPAND _javaMethod('evaluatePrintExpression', 'String', 'org.eclipse.emf.ecore.EObject', viewExpression) FOR viewExpression.provider.oclAsType(gmfgen::GenJavaExpressionProvider)-»
-«ENDIF-»
-«IF not editExpression.oclIsUndefined() and editExpression.provider.oclIsKindOf(gmfgen::GenJavaExpressionProvider)»
-	«EXPAND _javaMethod('evaluateEditExpression', 'String', 'org.eclipse.emf.ecore.EObject', editExpression) FOR editExpression.provider.oclAsType(gmfgen::GenJavaExpressionProvider)-»
-«ENDIF-»
-«IF not validateExpression.oclIsUndefined() and validateExpression.provider.oclIsKindOf(gmfgen::GenJavaExpressionProvider)»
-	«EXPAND _javaMethod('evaluateValidateExpression', 'Boolean', 'String', validateExpression) FOR validateExpression.provider.oclAsType(gmfgen::GenJavaExpressionProvider)-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE _javaMethod(String methodName, String returnType, String paramType, ValueExpression expression) FOR gmfgen::GenJavaExpressionProvider-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «returnType» «methodName»(«paramType» self) {
-«IF injectExpressionBody and (expression.body <> null and expression.body.size() > 0)-»
-		«expression.body»
-«ELSEIF throwException or (injectExpressionBody and (expression.body = null or expression.body.size() = 0))-»
-		// TODO: implement this method to return «returnType» value  
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new java.lang.UnsupportedOperationException("No user java implementation provided in '«methodName»' operation");«EXPAND xpt::Common::nonNLS»
-«ELSE-»
-		return null;
-«ENDIF-»	
-	}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/ParserProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/ParserProvider.xpt
deleted file mode 100644
index 5661040010b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/ParserProvider.xpt
+++ /dev/null
@@ -1,327 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - [235113] alternative parser access
- *                                 [244419] custom parsers
- *                                 [138179] expression-backed labels
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-«EXTENSION xpt::providers::ParserUtils»
-«EXTENSION impl::parsers::expression»
-«EXTENSION xpt::expressions::OclTracker»
-
-«DEFINE accessorMethod_delegate2providers FOR gmfgen::GenParsers-»
-	«EXPAND xpt::Common::generatedMemberComment('Utility method that consults ParserService')»
-	public static org.eclipse.gmf.runtime.common.ui.services.parser.IParser getParser(org.eclipse.gmf.runtime.emf.type.core.IElementType type, org.eclipse.emf.ecore.EObject object, String parserHint) {
-		return org.eclipse.gmf.runtime.common.ui.services.parser.ParserService.getInstance().getParser(new HintAdapter(type, object, parserHint));
-	}
-«ENDDEFINE»
-
-// invokes method generated with accessorMethod_delegate2providers template
-«DEFINE accessorCall_delegate2providers(elementTypeHolder : gmfgen::GenCommonBase, labelModelFacet : gmfgen::LabelModelFacet, parsedElement : String) FOR gmfgen::GenCommonBase-»
-«getDiagram().editorGen.labelParsers.getQualifiedClassName()».getParser(«EXPAND xpt::providers::ElementTypes::accessElementType FOR elementTypeHolder», «parsedElement», «IF labelModelFacet = null»«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»«ELSE»«EXPAND _parserHint(labelModelFacet, self) FOR labelModelFacet.parser»«ENDIF»)«-»
-«ENDDEFINE»
-
-«DEFINE _parserHint(labelFacet : gmfgen::LabelModelFacet, hintHolder : gmfgen::GenCommonBase) FOR gmfgen::GenParserImplementation»«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall FOR hintHolder»«ENDDEFINE»
-// ExternalParser may override hint
-«DEFINE _parserHint(labelFacet : gmfgen::LabelModelFacet, hintHolder : gmfgen::GenCommonBase) FOR gmfgen::ExternalParser-»
-«IF hint = null-»
-«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall FOR hintHolder-»
-«ELSE»«hint»«ENDIF-»
-«ENDDEFINE»
-«DEFINE _parserHint(labelFacet : gmfgen::DesignLabelModelFacet, hintHolder : gmfgen::GenCommonBase) FOR gmfgen::ExternalParser-»
-«IF hint = null»org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint.DESCRIPTION«ELSE»«hint»«ENDIF-»
-«ENDDEFINE»
-«DEFINE _parserHint(labelFacet : gmfgen::DesignLabelModelFacet, hintHolder : gmfgen::GenCommonBase) FOR gmfgen::GenParserImplementation»org.eclipse.gmf.runtime.common.ui.services.parser.CommonParserHint.DESCRIPTION«ENDDEFINE»
-
-// FIXME refactor static field to an instance registered within Activator
-«REM»Complementary method to accessorMethod_delegate2providers, although for direct access need an instance of this class«ENDREM»
-«DEFINE accessorMethod_direct FOR gmfgen::GenParsers-»
-	private static «getQualifiedClassName()» ourInstance;
-
-	public static «getQualifiedClassName()» get() {
-		if (ourInstance == null) {
-			ourInstance = new «getQualifiedClassName()»();
-		}
-		return ourInstance;
-	}
-«ENDDEFINE»
-
-// XXX consider adding #getDescriptionParser() method to control that kind of parser access? 
-// XXX do I really need GenCommonBase elementTypeHolder, why not use elementType reference directly?
-«DEFINE accessorCall_direct(elementTypeHolder : gmfgen::GenCommonBase, labelModelFacet : gmfgen::LabelModelFacet, parsedElement : String) FOR gmfgen::GenCommonBase-»
-«IF labelModelFacet = null or (Sequence { labelModelFacet.parser })[gmfgen::ExternalParser]->size() = 1-»
-org.eclipse.gmf.runtime.common.ui.services.parser.ParserService.getInstance().getParser(new org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter(/*«EXPAND xpt::providers::ElementTypes::accessElementType FOR elementTypeHolder», */«parsedElement», «IF labelModelFacet = null»«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»«ELSE»«EXPAND _parserHint(labelModelFacet, self) FOR labelModelFacet.parser»«ENDIF»))«-»
-«ELSE-»
-«getDiagram().editorGen.labelParsers.getQualifiedClassName()».get().«parserAccessorName(self)»()«-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE provider_getParserMethod FOR gmfgen::GenParsers-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.ui.services.parser.IParser getParser(
-			org.eclipse.core.runtime.IAdaptable hint) {
-		String vid = (String) hint.getAdapter(String.class);
-		if (vid != null) {
-			return getParser(«EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»(vid));
-		}
-		org.eclipse.gmf.runtime.notation.View view =
-				(org.eclipse.gmf.runtime.notation.View) hint.getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-		if (view != null) {
-			return getParser(«EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»(view));
-		}
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE provider_providesMethod FOR gmfgen::GenParsers-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean provides(org.eclipse.gmf.runtime.common.core.service.IOperation operation) {
-		if (operation instanceof org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation) {
-			org.eclipse.core.runtime.IAdaptable hint =
-					((org.eclipse.gmf.runtime.common.ui.services.parser.GetParserOperation) operation).getHint();
-			if («editorGen.diagram.getElementTypesQualifiedClassName()».getElement(hint) == null) {
-				return false;
-			}
-			return getParser(hint) != null;
-		}
-		return false;
-	}
-«ENDDEFINE»
-
-«DEFINE HintAdapterClass FOR gmfgen::GenParsers-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static class HintAdapter extends org.eclipse.gmf.runtime.emf.ui.services.parser.ParserHintAdapter {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private final org.eclipse.gmf.runtime.emf.type.core.IElementType elementType;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public HintAdapter(org.eclipse.gmf.runtime.emf.type.core.IElementType type,
-				org.eclipse.emf.ecore.EObject object, String parserHint) {
-			super(object, parserHint);
-			«EXPAND xpt::Common::_assert('type != null')-»
-			elementType = type;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public Object getAdapter(Class adapter) {
-			if (org.eclipse.gmf.runtime.emf.type.core.IElementType.class.equals(adapter)) {
-				return elementType;
-			}
-			return super.getAdapter(adapter);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE getParserByVisualIdMethod FOR gmfgen::GenParsers-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.common.ui.services.parser.IParser getParser(int visualID) {
-		switch (visualID) {
-		«EXPAND _getParsers FOREACH editorGen.diagram.topLevelNodes-»
-		«EXPAND _getParsers FOREACH editorGen.diagram.childNodes-»
-		«EXPAND _getParsers FOREACH editorGen.diagram.links-»
-		}
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE _getParsers FOR gmfgen::GenNode»«EXPAND _getParser FOREACH labels»«ENDDEFINE»
-«DEFINE _getParsers FOR gmfgen::GenLink»«EXPAND _getParser FOREACH labels»«ENDDEFINE»
-«DEFINE _getParsers FOR gmfgen::GenChildLabelNode»«EXPAND _getParser(self) FOR labelModelFacet»«ENDDEFINE»
-«DEFINE _getParser FOR gmfgen::GenLabel»«EXPAND _getParser(self) FOR modelFacet»«ENDDEFINE»
-
-«DEFINE _getParser(element : gmfgen::GenCommonBase) FOR gmfgen::LabelModelFacet»«EXPAND _getParser(self, element) FOR parser»«ENDDEFINE»
-
-«DEFINE _getParser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::GenParserImplementation»«ERROR 'Abstract template for ' + self.repr()»«ENDDEFINE»
-«DEFINE _getParser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::ExternalParser»«REM»NOTHING TO DO«ENDREM»«ENDDEFINE»
-
-«DEFINE _getParser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::PredefinedParser-»
-	«EXPAND _doGetParser(element)-»
-«ENDDEFINE»
-
-«DEFINE _getParser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::PredefinedEnumParser»
-	«EXPAND _doGetParser(element)-»
-«ENDDEFINE»
-
-«DEFINE _getParser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::OclChoiceParser»
-	«EXPAND _doGetParser(element)-»
-«ENDDEFINE»
-
-«DEFINE _getParser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::CustomParser-»
-	«EXPAND _doGetParser(element)-»
-«ENDDEFINE»
-
-«DEFINE _getParser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::ExpressionLabelParser-»
-	«EXPAND _doGetParser(element)-»
-«ENDDEFINE»
-
-«DEFINE _doGetParser(element : gmfgen::GenCommonBase) FOR gmfgen::GenParserImplementation-»
-	«EXPAND xpt::Common::caseVisualID FOR element» return «parserAccessorName(element)»();
-«ENDDEFINE»
-
-«DEFINE parsers FOR gmfgen::GenNode»«EXPAND _parser FOREACH labels»«ENDDEFINE»
-«DEFINE parsers FOR gmfgen::GenLink»«EXPAND _parser FOREACH labels»«ENDDEFINE»
-«DEFINE parsers FOR gmfgen::GenChildLabelNode»«EXPAND _parser(self) FOR labelModelFacet»«ENDDEFINE»
-
-«DEFINE _parser FOR gmfgen::GenLabel»«EXPAND _parser(self) FOR modelFacet»«ENDDEFINE»
-«DEFINE _parser(element : gmfgen::GenCommonBase) FOR gmfgen::LabelModelFacet»«EXPAND _parser(self, element) FOR parser»«ENDDEFINE»
-
-«DEFINE _parser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::GenParserImplementation»«ERROR 'Abstract template for ' + self.repr()»«ENDDEFINE»
-
-«DEFINE _parser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::CustomParser»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «qualifiedName» «parserFieldName(element)»;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	«IF holder.extensibleViaService»private«ELSE»public«ENDIF» org.eclipse.gmf.runtime.common.ui.services.parser.IParser «parserAccessorName(element)»() {
-		if («parserFieldName(element)» == null) {
-			«parserFieldName(element)» = new «qualifiedName»();
-		}
-		return «parserFieldName(element)»;
-	}	
-«ENDDEFINE»
-
-«DEFINE _parser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::ExternalParser-»
-«REM»NO-OP«ENDREM»«-»
-«ENDDEFINE»
-
-«DEFINE _parser(modelFacet : gmfgen::FeatureLabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::PredefinedParser»
-	«EXPAND _predefinedParser(modelFacet, element)»
-«ENDDEFINE»
-
-«DEFINE _parser(modelFacet : gmfgen::FeatureLabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::PredefinedEnumParser»
-	«EXPAND _predefinedParser(modelFacet, element)»
-«ENDDEFINE»
-
-«DEFINE _parser(modelFacet : gmfgen::FeatureLabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::OclChoiceParser»
-	«EXPAND _predefinedParser(modelFacet, element)»
-«ENDDEFINE»
-
-«DEFINE _predefinedParser(modelFacet : gmfgen::FeatureLabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::GenParserImplementation»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.common.ui.services.parser.IParser «parserFieldName(element)»;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	«IF holder.extensibleViaService»private«ELSE»public«ENDIF» org.eclipse.gmf.runtime.common.ui.services.parser.IParser «parserAccessorName(element)»() {
-		if («parserFieldName(element)» == null) {
-			«EXPAND _createPredefinedParser(modelFacet, 'parser')-»		
-			«parserFieldName(element)» = parser;
-		}
-		return «parserFieldName(element)»;
-	}
-«ENDDEFINE»
-
-«DEFINE _createPredefinedParser(modelFacet : gmfgen::FeatureLabelModelFacet, parserVar : String) FOR gmfgen::GenParserImplementation-»
-	«ERROR 'PredefinedParser, PredefinedEnumParser or OclChoiceParser expected but occured: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE _createPredefinedParser(modelFacet : gmfgen::FeatureLabelModelFacet, parserVar : String) FOR gmfgen::PredefinedParser-»	
-			org.eclipse.emf.ecore.EAttribute[] features = new org.eclipse.emf.ecore.EAttribute[] {
-				«EXPAND MetaModel::MetaFeature FOREACH modelFacet.metaFeatures SEPARATOR ', ' »
-			};
-		«IF modelFacet.editableMetaFeatures->size() > 0-»
-			org.eclipse.emf.ecore.EAttribute[] editableFeatures = new org.eclipse.emf.ecore.EAttribute[] {
-				«EXPAND MetaModel::MetaFeature FOREACH modelFacet.editableMetaFeatures SEPARATOR ', '»
-			};
-		«ENDIF-»
-		«getQualifiedClassName()» «parserVar» = new «getQualifiedClassName()»(features«IF modelFacet.editableMetaFeatures->size() > 0», editableFeatures«ENDIF»);
-		«EXPAND _setPatterns(viewMethod, editMethod, parserVar) FOR modelFacet-»		
-«ENDDEFINE»
-
-«DEFINE _createPredefinedParser(modelFacet : gmfgen::FeatureLabelModelFacet, parserVar : String) FOR gmfgen::PredefinedEnumParser-»
-	«LET if modelFacet.editableMetaFeatures->isEmpty() then modelFacet.metaFeatures->first() else modelFacet.editableMetaFeatures->first() endif AS feature-»
-			org.eclipse.emf.ecore.EAttribute editableFeature = «EXPAND MetaModel::MetaFeature FOR feature»;
-	«ENDLET-»
-			«getQualifiedClassName()» «parserVar» = new «getQualifiedClassName()»(editableFeature);
-«ENDDEFINE»
-
-«DEFINE _createPredefinedParser(modelFacet : gmfgen::FeatureLabelModelFacet, parserVar : String) FOR gmfgen::OclChoiceParser-»
-			«LET modelFacet.editableMetaFeatures->first() AS feature-»		
-			org.eclipse.emf.ecore.EStructuralFeature editableFeature = «EXPAND MetaModel::MetaFeature FOR feature»;
-			«LET feature.genClass AS context-»
-				org.eclipse.gmf.tooling.runtime.parsers.ChoiceParserBase «parserVar» = «-»
-				«IF showExpression <> null-»
-					new org.eclipse.gmf.tooling.runtime.parsers.OclTrackerChoiceParser( // 	
-						editableFeature «-»
-						, «EXPAND _safeItemExpression(feature)-» 
-						, «EXPAND xpt::expressions::getExpression::getExpressionBody FOR showExpression-»
-						, «holder.editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getItemProvidersAdapterFactory()«-»
-						«EXPAND _optionalOclTrackerFactoryTypeHint FOR showExpression-»
-					); 
-				«ELSE-»
-					new org.eclipse.gmf.tooling.runtime.parsers.OclChoiceParser( // 	
-						editableFeature «-»
-						, «EXPAND _safeItemExpression(feature)-» 
-						, null «-»
-						, «holder.editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getItemProvidersAdapterFactory()«-»
-					); 
-				«ENDIF-»
-			«ENDLET-»
-			«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE _safeItemExpression(feature : genmodel::GenFeature) FOR gmfgen::OclChoiceParser-»
-	«IF itemsExpression = null-»
-		"«feature.ecoreFeature.eType.name».allInstances()"«-» 
-	«ELSE-»
-		«EXPAND xpt::expressions::getExpression::getExpressionBody FOR itemsExpression-»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE _optionalOclTrackerFactoryTypeHint FOR gmfgen::ValueExpression-»
-«IF isForcedImpactAnalyzerKind(body)», org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTrackerFactory.Type.IMPACT_ANALYZER«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE _setPatterns(viewMethod : gmfgen::LabelTextAccessMethod, editMethod : gmfgen::LabelTextAccessMethod, parserVar : String) FOR gmfgen::FeatureLabelModelFacet-»
-«IF viewMethod <> gmfgen::LabelTextAccessMethod::NATIVE-»
-	«IF isPatternSpecified(viewPattern)-»
-		«parserVar».setViewPattern("«viewPattern»");«EXPAND xpt::Common::nonNLS(1)»
-	«ENDIF-»
-	«IF isPatternSpecified(editorPattern)-»
-		«parserVar».setEditorPattern("«editorPattern»");«EXPAND xpt::Common::nonNLS(1)»
-	«ELSEIF isPatternSpecified(viewPattern)-»
-		«parserVar».setEditorPattern("«viewPattern»");«EXPAND xpt::Common::nonNLS(1)»
-	«ENDIF-»
-«ENDIF-»
-«IF editMethod <> gmfgen::LabelTextAccessMethod::NATIVE-»
-	«IF isPatternSpecified(editPattern)-»
-		«parserVar».setEditPattern("«editPattern»");«EXPAND xpt::Common::nonNLS(1)»
-	«ELSEIF isPatternSpecified(viewPattern)-»
-		«parserVar».setEditPattern("«viewPattern»");«EXPAND xpt::Common::nonNLS(1)»
-	«ENDIF-»
-«ENDIF-»
-«ENDDEFINE»
-
-/*Intentionally modelFacet typed as general LMF, because ExpressionLabelModelFacet is merely a marker*/
-«DEFINE _parser(modelFacet : gmfgen::LabelModelFacet, element : gmfgen::GenCommonBase) FOR gmfgen::ExpressionLabelParser»
-«IF isViewExpressionDefinedAndOcl()-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«IF holder.extensibleViaService»private«ELSE»public«ENDIF» org.eclipse.gmf.runtime.common.ui.services.parser.IParser «parserAccessorName(element)»() {
-		return new «getQualifiedClassName()»();
-	}
-«ELSE-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «getQualifiedClassName()» «parserFieldName(element)»;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	«IF holder.extensibleViaService»private«ELSE»public«ENDIF» org.eclipse.gmf.runtime.common.ui.services.parser.IParser «parserAccessorName(element)»() {
-		if («parserFieldName(element)» == null) {
-			«parserFieldName(element)» = new «getQualifiedClassName()»();
-		}
-		return «parserFieldName(element)»;
-	}
-«ENDIF-»	
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/expression.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/expression.qvto
deleted file mode 100644
index 2af16b9be26..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/expression.qvto
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Montages) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.diagram.Utils;
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-library expression;
-
-helper gmfgen::ExpressionLabelParser::isViewExpressionDefinedAndOcl() : Boolean {
-	return not(self.viewExpression.oclIsUndefined()) and self.viewExpression.provider.oclIsKindOf(gmfgen::GenExpressionInterpreter);
-}
-
-helper gmfgen::GenParserImplementation::isViewExpressionDefinedAndOcl() : Boolean {
-	return false;
-}	
-
-helper gmfgen::GenCommonBase::isViewExpressionDefiedAndOcl() : Boolean {
-	return let labelModelFacet : gmfgen::LabelModelFacet 
-		= if self.oclIsKindOf(gmfgen::GenChildLabelNode) then self.oclAsType(gmfgen::GenChildLabelNode).labelModelFacet 
-	      else (if self.oclIsKindOf(gmfgen::GenLabel) then self.oclAsType(gmfgen::GenLabel).modelFacet 
-	 	  else null 
-	 	  endif)
-	 	  endif	 	      
-	in if labelModelFacet = null 
-			   then false 
-			   else labelModelFacet.parser.isViewExpressionDefinedAndOcl()
-		  	   endif;
-}
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/i18n.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/i18n.qvto
deleted file mode 100644
index 684149f5d9c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/parsers/i18n.qvto
+++ /dev/null
@@ -1,19 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Anna Karjakina (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-library i18n;
-
-helper i18nKeyForMessageFormatParserInvalidInputError() : String {
-	return 'MessageFormatParser.InvalidInputError'
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/preferences/CustomPage.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/preferences/CustomPage.xpt
deleted file mode 100644
index c28566a9029..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/preferences/CustomPage.xpt
+++ /dev/null
@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenCustomPreferencePage-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «(if qualifiedClassName = getClassName() then getDiagram().preferencesPackageName else qualifiedClassName.substring(1 + 0, qualifiedClassName.size() - getClassName().size() - 1) endif)»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «getClassName()»«EXPAND extendsList»«EXPAND implementsList» {
-
-«EXPAND _constant FOREACH preferences-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «getClassName()»() {
-		setPreferenceStore(«getDiagram().editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getPreferenceStore());
-	}
-«EXPAND methods»
-«EXPAND initDefaultsMethod»
-«EXPAND additions»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenCustomPreferencePage» extends org.eclipse.gmf.runtime.common.ui.preferences.AbstractPreferencePage«ENDDEFINE»
-«DEFINE implementsList FOR gmfgen::GenCustomPreferencePage»«REM»no-op«ENDREM»«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenCustomPreferencePage»«ENDDEFINE»
-
-// the reason I didn't split this template up into two distinct, addFieldsMethod and initHelpMethod, is that
-// using superclass other than oe.gmf...AbstractPreferencePage may require implementation of completely different
-// set of methods. Besides, there's not to much generated, anyway.
-«DEFINE methods FOR gmfgen::GenCustomPreferencePage»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void addFields(org.eclipse.swt.widgets.Composite parent) {
-		// TODO  Provide method implementation
-		throw new UnsupportedOperationException();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void initHelp() {
-		// TODO implement this method if needed, or leave as no-op
-	}
-«ENDDEFINE»
-
-
-«DEFINE initDefaultsMethod FOR gmfgen::GenCustomPreferencePage-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void initDefaults(org.eclipse.jface.preference.IPreferenceStore store) {
-«IF preferences->isEmpty() or preferences->exists(p | p.defaultValue = null)-»
-		// TODO this code is invoked during preference store initialization, please fill
-		// the store passed with default preference values.
-«ENDIF-»
-«EXPAND _setDefaultValue('store') FOREACH preferences->select(p | p.defaultValue <> null)-»
-	}
-«ENDDEFINE»
-
-// pair template to initDefaultsMethod, allows external templates invoke generated initDefaults method
-// Note, CustomPage::Main is expected to be invoked only for templates with generateBoilerplate == true,
-// hence no extra check when generating with initDefaultsMethod,
-// however, call_initDefaults may get invoked for any CustomPreferencePage
-«DEFINE call_initDefaults(storeVarName : String) FOR gmfgen::GenCustomPreferencePage-»
-«IF generateBoilerplate»«qualifiedClassName».initDefaults(«storeVarName»);«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE _constant FOR gmfgen::GenPreference-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static final String «name» = "«key»";«EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«DEFINE _setDefaultValue(store : String) FOR gmfgen::GenPreference-»
-		«store».setDefault(«name», «defaultValue»);
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/preferences/StandardPage.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/preferences/StandardPage.xpt
deleted file mode 100644
index 9b95a2a1db0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/impl/preferences/StandardPage.xpt
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenStandardPreferencePage-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().preferencesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «getClassName()»«EXPAND extendsList»«EXPAND implementsList» {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «getClassName()»() {
-		setPreferenceStore(«getDiagram().editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getPreferenceStore());
-	}
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenStandardPreferencePage-»
-«IF gmfgen::StandardPreferencePages::General = kind-»
- extends org.eclipse.gmf.runtime.diagram.ui.preferences.DiagramsPreferencePage«-»
-«ELSEIF gmfgen::StandardPreferencePages::Appearance = kind-»
- extends org.eclipse.gmf.runtime.diagram.ui.preferences.AppearancePreferencePage«-»
-«ELSEIF gmfgen::StandardPreferencePages::Connections = kind-»
- extends org.eclipse.gmf.runtime.diagram.ui.preferences.ConnectionsPreferencePage«-»
-«ELSEIF gmfgen::StandardPreferencePages::Printing = kind-»
- extends org.eclipse.gmf.runtime.diagram.ui.preferences.PrintingPreferencePage«-»
-«ELSEIF gmfgen::StandardPreferencePages::RulersAndGrid = kind-»
- extends org.eclipse.gmf.runtime.diagram.ui.preferences.RulerGridPreferencePage«-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenStandardPreferencePage»«REM»no-op«ENDREM»«ENDDEFINE»
-
-«DEFINE call_initDefaults(storeVarName : String) FOR gmfgen::GenStandardPreferencePage»«IF kind <> gmfgen::StandardPreferencePages::Pathmaps»«getQualifiedClassName()».initDefaults(«storeVarName»);«ENDIF»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/CustomParser.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/CustomParser.xpt
deleted file mode 100644
index 31e9bd08bf6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/CustomParser.xpt
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - [244419] custom parsers
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::StringOperations»
-
-«DEFINE Main FOR gmfgen::CustomParser»
-«EXPAND xpt::Common::copyright FOR holder.editorGen-»
-«EXPAND xpt::Common::packageStatement FOR qualifiedName»
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «qualifiedName.xpandSplit('\\.')->last()»«EXPAND extendsList»«EXPAND implementsList» {
-«EXPAND body»
-«EXPAND additions»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::CustomParser»«ENDDEFINE»
-«DEFINE extendsList FOR gmfgen::CustomParser»«ENDDEFINE»
-«DEFINE implementsList FOR gmfgen::CustomParser» implements org.eclipse.gmf.runtime.common.ui.services.parser.IParser«ENDDEFINE»
-
-«DEFINE body FOR gmfgen::CustomParser»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getEditString(org.eclipse.core.runtime.IAdaptable element, int flags) {
-		return "";
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus isValidEditString(org.eclipse.core.runtime.IAdaptable element, String editString) {
-		// TODO change to EDITABLE_STATUS as appropriate
-		return org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus.UNEDITABLE_STATUS;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.core.command.ICommand getParseCommand(org.eclipse.core.runtime.IAdaptable element, String newString, int flags) {
-		// TODO
-		throw new UnsupportedOperationException(); 
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getPrintString(org.eclipse.core.runtime.IAdaptable element, int flags) {
-		return "";
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean isAffectingEvent(Object event, int flags) {
-		return false;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.jface.text.contentassist.IContentAssistProcessor getCompletionProcessor(org.eclipse.core.runtime.IAdaptable element) {
-    	return null;
-	}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/ExpressionLabelParser.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/ExpressionLabelParser.xpt
deleted file mode 100644
index a7bfa19594e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/ExpressionLabelParser.xpt
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010 Artem Tikhomirov and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (independent) - Initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-
-«EXTENSION xpt::StringOperations»
-
-«EXTENSION impl::parsers::expression»
-
-«DEFINE Main FOR gmfgen::ExpressionLabelParser-»
-«EXPAND xpt::Common::copyright FOR holder.editorGen-»
-«EXPAND xpt::Common::packageStatement FOR self.getQualifiedClassName()»
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «self.getQualifiedClassName().xpandSplit('\\.')->last()»«EXPAND extendsList»«EXPAND implementsList» {
-«EXPAND impl::parsers::ExpressionLabelParser::fields-»
-«EXPAND impl::parsers::ExpressionLabelParser::cons(getQualifiedClassName().xpandSplit('\\.')->last())-»
-«EXPAND body»
-«EXPAND additions»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::ExpressionLabelParser»«ENDDEFINE»
-«DEFINE extendsList FOR gmfgen::ExpressionLabelParser»
-	«IF isViewExpressionDefinedAndOcl()-»
-		extends org.eclipse.gmf.tooling.runtime.parsers.ExpressionLabelParserBase		
-	«ENDIF-»
-«ENDDEFINE»
-«DEFINE implementsList FOR gmfgen::ExpressionLabelParser-»
-	«IF not(isViewExpressionDefinedAndOcl())-»
-		implements org.eclipse.gmf.runtime.common.ui.services.parser.IParser	    
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE body FOR gmfgen::ExpressionLabelParser»
-
-«IF isViewExpressionDefinedAndOcl()-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override FOR self.holder.editorGen.diagram»
-	protected String getExpressionBody() {
-		return «EXPAND impl::parsers::ExpressionLabelParser::getExpression(self, viewExpression) FOR viewExpression.provider».body();
-	}
-«ELSE-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getPrintString(org.eclipse.core.runtime.IAdaptable element, int flags) {
-		«EXPAND impl::parsers::ExpressionLabelParser::accessViewExpression-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean isAffectingEvent(Object event, int flags) {
-		// XXX Any event is recognized as important, unless there's a way to extract this information from expression itself.
-		// TODO analyze expressions (e.g. using OCL parser) to find out structural features in use  
-		return true;
-	}
-«ENDIF-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getEditString(org.eclipse.core.runtime.IAdaptable element, int flags) {
-		«EXPAND impl::parsers::ExpressionLabelParser::accessEditExpression-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus isValidEditString(org.eclipse.core.runtime.IAdaptable element, String editString) {
-		«EXPAND impl::parsers::ExpressionLabelParser::accessValidateExpression-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.core.command.ICommand getParseCommand(org.eclipse.core.runtime.IAdaptable element, final String newString, int flags) {
-		final org.eclipse.emf.ecore.EObject target = (org.eclipse.emf.ecore.EObject) element.getAdapter(org.eclipse.emf.ecore.EObject.class);
-		if (!validateValues(target, newString)) {
-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-		}
-		org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain = org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(target);
-		if (editingDomain == null) {
-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-		}
-		org.eclipse.core.resources.IFile affectedFile = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(target.eResource());
-		return new org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand(editingDomain, "Set Values", affectedFile == null ? null : java.util.Collections.singletonList(affectedFile)) {«EXPAND xpt::Common::nonNLS» 
-			protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-				return new org.eclipse.gmf.runtime.common.core.command.CommandResult(updateValues(target, newString));
-			}
-		};
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.jface.text.contentassist.IContentAssistProcessor getCompletionProcessor(org.eclipse.core.runtime.IAdaptable element) {
-    	return null;
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	private boolean validateValues(org.eclipse.emf.ecore.EObject target, String newString) {
-		// TODO implement as needed«REM»with default 'true' I assume isValidEditString() has been called prior to getParseCommand and generally I don't need to do anything else here«ENDREM»
-		return true;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.core.runtime.IStatus updateValues(org.eclipse.emf.ecore.EObject target, String newString) throws org.eclipse.core.commands.ExecutionException {
-		// TODO implement this method
-		// DO NOT FORGET to remove @generated tag or mark method @generated NOT
-		throw new org.eclipse.core.commands.ExecutionException("Please implement parsing and value modification"); 
-	}
-«EXPAND impl::parsers::ExpressionLabelParser::extraMethods-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/ParserProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/ParserProvider.xpt
deleted file mode 100644
index 1ba02191501..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/ParserProvider.xpt
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - [235113] alternative parser access
- *                                 [244419] custom parsers
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Main FOR gmfgen::GenParsers-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «className»«EXPAND extendsList»«EXPAND implementsList» {
-	«EXPAND impl::parsers::ParserProvider::parsers FOREACH editorGen.diagram.topLevelNodes»
-	«EXPAND impl::parsers::ParserProvider::parsers FOREACH editorGen.diagram.childNodes»
-	«EXPAND impl::parsers::ParserProvider::parsers FOREACH editorGen.diagram.links»
-
-«IF extensibleViaService-»
-	«EXPAND impl::parsers::ParserProvider::getParserByVisualIdMethod-»
-	«EXPAND impl::parsers::ParserProvider::accessorMethod_delegate2providers-»
-	«EXPAND impl::parsers::ParserProvider::provider_getParserMethod»
-	«EXPAND impl::parsers::ParserProvider::provider_providesMethod»
-	«EXPAND impl::parsers::ParserProvider::HintAdapterClass»
-«ELSE-»
-	«EXPAND impl::parsers::ParserProvider::accessorMethod_direct-»
-«ENDIF-»
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenParsers»«IF extensibleViaService» extends org.eclipse.gmf.runtime.common.core.service.AbstractProvider«ENDIF»«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenParsers»«IF extensibleViaService» implements org.eclipse.gmf.runtime.common.ui.services.parser.IParserProvider«ENDIF»«ENDDEFINE»
-
-/*
- * this/self - aka hintHolder, visual element to present a text (i.e. one of Node's labels)
- * elementTypeHolder - model element being displayed
- * modelFacet - may be null
- * parsedElement - accessor to EObject being edited 
- */
-«DEFINE accessorCall(elementTypeHolder : gmfgen::GenCommonBase, labelModelFacet : gmfgen::LabelModelFacet, parsedElement : String) FOR gmfgen::GenCommonBase-»
-«IF getDiagram().editorGen.labelParsers.extensibleViaService-»
-«EXPAND impl::parsers::ParserProvider::accessorCall_delegate2providers(elementTypeHolder, labelModelFacet, parsedElement)-»
-«ELSE-»
-«EXPAND impl::parsers::ParserProvider::accessorCall_direct(elementTypeHolder, labelModelFacet, parsedElement)-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenParsers»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/PredefinedParser.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/PredefinedParser.xpt
deleted file mode 100644
index cfb4b04bc10..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/parsers/PredefinedParser.xpt
+++ /dev/null
@@ -1,324 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial implementation
- *    Artem Tikhomirov (Borland) - [235113] alternative parser access
- *                                 [244419] custom parsers
- *                                 initial API
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION impl::parsers::i18n»
-
-«DEFINE Main FOR gmfgen::PredefinedParser»
-«EXPAND xpt::Common::copyright FOR holder.editorGen-»
-package «holder.implPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «className» extends «EXPAND impl::parsers::AbstractParser::qualifiedClassName FOR holder» {
-
-«EXPAND fields»
-«EXPAND cons»
-«EXPAND aux_methods»
-«EXPAND parser_getEditStringMethod»
-«EXPAND parser_isValidEditStringMethod»
-«EXPAND parser_getParseCommandMethod»
-«EXPAND parser_getPrintStringMethod»
-«EXPAND parser_isAffectingEventMethod»
-«EXPAND parser_getCompletionProcessorMethod»
-«EXPAND additions»
-}
-«ENDDEFINE» 
-
-«DEFINE additions FOR gmfgen::PredefinedParser»«ENDDEFINE»
-
-«DEFINE fields FOR gmfgen::PredefinedParser-»
-«IF viewMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT or viewMethod = gmfgen::LabelTextAccessMethod::PRINTF-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private String defaultPattern;
-«ENDIF-»
-«IF viewMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT or viewMethod = gmfgen::LabelTextAccessMethod::PRINTF or editMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT or editMethod = gmfgen::LabelTextAccessMethod::PRINTF-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private String defaultEditablePattern;
-«ENDIF-»
-«IF viewMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private java.text.MessageFormat viewProcessor;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private java.text.MessageFormat editorProcessor;
-«ENDIF-»
-«IF editMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private java.text.MessageFormat editProcessor;
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE cons FOR gmfgen::PredefinedParser-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «className»(org.eclipse.emf.ecore.EAttribute[] features) {
-		super(features);
-«IF viewMethod = gmfgen::LabelTextAccessMethod::NATIVE or editMethod = gmfgen::LabelTextAccessMethod::NATIVE-»
-		if (features.length != 1) {
-			throw new IllegalArgumentException(java.util.Arrays.toString(features));
-		}
-«ENDIF-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «className»(org.eclipse.emf.ecore.EAttribute[] features, org.eclipse.emf.ecore.EAttribute[] editableFeatures) {
-		super(features, editableFeatures);
-«IF viewMethod = gmfgen::LabelTextAccessMethod::NATIVE or editMethod = gmfgen::LabelTextAccessMethod::NATIVE-»
-		if (features.length != 1) {
-			throw new IllegalArgumentException(java.util.Arrays.toString(features));
-		}
-		if (editableFeatures.length != 1) {
-			throw new IllegalArgumentException(java.util.Arrays.toString(editableFeatures));
-		}
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE aux_methods FOR gmfgen::PredefinedParser-»
-«IF viewMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected String getDefaultPattern() {
-		if (defaultPattern == null) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < features.length; i++) {
-				if (i > 0) {
-					sb.append(' ');
-				}
-				sb.append('{');
-				sb.append(i);
-				sb.append('}');
-			}
-			defaultPattern = sb.toString();
-		}
-		return defaultPattern;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setViewPattern(String viewPattern) {
-		super.setViewPattern(viewPattern);
-		viewProcessor = null;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setEditorPattern(String editorPattern) {
-		super.setEditorPattern(editorPattern);
-		editorProcessor = null;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected java.text.MessageFormat getViewProcessor() {
-		if (viewProcessor == null) {
-			viewProcessor = new java.text.MessageFormat(getViewPattern() == null ? getDefaultPattern() : getViewPattern());
-		}
-		return viewProcessor;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected java.text.MessageFormat getEditorProcessor() {
-		if (editorProcessor == null) {
-			editorProcessor = new java.text.MessageFormat(getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern());
-		}
-		return editorProcessor;
-	}
-«ELSEIF viewMethod = gmfgen::LabelTextAccessMethod::PRINTF-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected String getDefaultPattern() {
-		if (defaultPattern == null) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < features.length; i++) {
-				if (i > 0) {
-					sb.append(' ');
-				}
-				sb.append('%');
-				sb.append(i + 1);
-				sb.append('$');
-				sb.append('s');
-			}
-			defaultPattern = sb.toString();
-		}
-		return defaultPattern;
-	}
-«ENDIF-»
-«IF viewMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT or editMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected String getDefaultEditablePattern() {
-		if (defaultEditablePattern == null) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < editableFeatures.length; i++) {
-				if (i > 0) {
-					sb.append(' ');
-				}
-				sb.append('{');
-				sb.append(i);
-				sb.append('}');
-			}
-			defaultEditablePattern = sb.toString();
-		}
-		return defaultEditablePattern;
-	}
-«ENDIF-»
-«IF viewMethod = gmfgen::LabelTextAccessMethod::PRINTF or editMethod = gmfgen::LabelTextAccessMethod::PRINTF-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected String getDefaultEditablePattern() {
-		if (defaultEditablePattern == null) {
-			StringBuffer sb = new StringBuffer();
-			for (int i = 0; i < editableFeatures.length; i++) {
-				if (i > 0) {
-					sb.append(' ');
-				}
-				sb.append('%');
-				sb.append(i + 1);
-				sb.append('$');
-				sb.append('s');
-			}
-			defaultEditablePattern = sb.toString();
-		}
-		return defaultEditablePattern;
-	}
-«ENDIF-»
-«IF editMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setEditPattern(String editPattern) {
-		super.setEditPattern(editPattern);
-		editProcessor = null;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected java.text.MessageFormat getEditProcessor() {
-		if (editProcessor == null) {
-			editProcessor = new java.text.MessageFormat(getEditPattern() == null ? getDefaultEditablePattern() : getEditPattern());
-		}
-		return editProcessor;
-	}
-«ELSEIF editMethod = gmfgen::LabelTextAccessMethod::REGEXP-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getEditPattern() {
-		String pattern = super.getEditPattern();
-		return pattern != null ? pattern : " ";«EXPAND xpt::Common::nonNLS»
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE parser_getEditStringMethod FOR gmfgen::PredefinedParser-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getEditString(org.eclipse.core.runtime.IAdaptable adapter, int flags) {
-«IF viewMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT-»
-		org.eclipse.emf.ecore.EObject element =	(org.eclipse.emf.ecore.EObject) adapter.getAdapter(org.eclipse.emf.ecore.EObject.class);
-		return getEditorProcessor().format(getEditableValues(element), new StringBuffer(),	new java.text.FieldPosition(0)).toString();
-«ELSEIF viewMethod = gmfgen::LabelTextAccessMethod::PRINTF-»
-		org.eclipse.emf.ecore.EObject element = (org.eclipse.emf.ecore.EObject) adapter.getAdapter(org.eclipse.emf.ecore.EObject.class);
-		String pattern = getEditorPattern() == null ? getDefaultEditablePattern() : getEditorPattern();
-		return String.format(pattern, getEditableValues(element));
-«ELSEIF viewMethod = gmfgen::LabelTextAccessMethod::REGEXP-»
-		return "";«EXPAND xpt::Common::nonNLS»
-«ELSEIF viewMethod = gmfgen::LabelTextAccessMethod::NATIVE-»
-		org.eclipse.emf.ecore.EObject element = (org.eclipse.emf.ecore.EObject) adapter.getAdapter(org.eclipse.emf.ecore.EObject.class);
-		String s = org.eclipse.emf.ecore.util.EcoreUtil.convertToString(editableFeatures[0].getEAttributeType(), element.eGet(editableFeatures[0]));
-		return s != null ? s : "";«EXPAND xpt::Common::nonNLS»
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE parser_isValidEditStringMethod FOR gmfgen::PredefinedParser-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus isValidEditString(org.eclipse.core.runtime.IAdaptable adapter, String editString) {
-«IF editMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT-»
-		java.text.ParsePosition pos = new java.text.ParsePosition(0);
-		Object[] values = getEditProcessor().parse(editString, pos);
-		if (values == null) {
-			return new org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus(
-					«holder.editorGen.plugin.getActivatorQualifiedClassName()».ID,
-					org.eclipse.gmf.runtime.common.ui.services.parser.IParserEditStatus.UNEDITABLE,
-					org.eclipse.osgi.util.NLS.bind(
-							«EXPAND xpt::Externalizer::accessorCall(i18nKeyForMessageFormatParserInvalidInputError()) FOR holder.editorGen»,
-							new Integer(pos.getErrorIndex())));
-		}
-		return validateNewValues(values);
-«ELSEIF editMethod = gmfgen::LabelTextAccessMethod::PRINTF-»
-		return org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus.UNEDITABLE_STATUS;
-«ELSEIF editMethod = gmfgen::LabelTextAccessMethod::REGEXP-»
-		if (editString == null) {
-			return org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus.UNEDITABLE_STATUS;
-		}
-		Object[] values = editString.split(getEditPattern());
-		return validateNewValues(values);
-«ELSEIF editMethod = gmfgen::LabelTextAccessMethod::NATIVE-»
-		return org.eclipse.gmf.runtime.common.ui.services.parser.ParserEditStatus.EDITABLE_STATUS;
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE parser_getParseCommandMethod FOR gmfgen::PredefinedParser-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.common.core.command.ICommand getParseCommand(org.eclipse.core.runtime.IAdaptable adapter, String newString, int flags) {
-«IF editMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT-»
-		Object[] values = getEditProcessor().parse(newString, new java.text.ParsePosition(0));
-		return getParseCommand(adapter, values, flags);
-«ELSEIF editMethod = gmfgen::LabelTextAccessMethod::PRINTF-»
-		return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-«ELSEIF editMethod = gmfgen::LabelTextAccessMethod::REGEXP-»
-		if (newString == null) {
-			return org.eclipse.gmf.runtime.common.core.command.UnexecutableCommand.INSTANCE;
-		}
-		Object[] values = newString.split(getEditPattern());
-		return super.getParseCommand(adapter, values, flags);
-«ELSEIF editMethod = gmfgen::LabelTextAccessMethod::NATIVE-»
-		Object value = org.eclipse.emf.ecore.util.EcoreUtil.createFromString(editableFeatures[0].getEAttributeType(), newString);
-		return getParseCommand(adapter, new Object[] { value }, flags);
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE parser_getPrintStringMethod FOR gmfgen::PredefinedParser-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getPrintString(org.eclipse.core.runtime.IAdaptable adapter, int flags) {
-«IF viewMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT-»
-		org.eclipse.emf.ecore.EObject element = (org.eclipse.emf.ecore.EObject) adapter.getAdapter(org.eclipse.emf.ecore.EObject.class);
-		return getViewProcessor().format(getValues(element), new StringBuffer(), new java.text.FieldPosition(0)).toString();
-«ELSEIF viewMethod = gmfgen::LabelTextAccessMethod::PRINTF-»
-		org.eclipse.emf.ecore.EObject element = (org.eclipse.emf.ecore.EObject) adapter.getAdapter(org.eclipse.emf.ecore.EObject.class);
-		return String.format(getViewPattern() == null ? getDefaultPattern() : getViewPattern(), getValues(element));
-«ELSEIF viewMethod = gmfgen::LabelTextAccessMethod::REGEXP-»
-		return "";«EXPAND xpt::Common::nonNLS»
-«ELSEIF viewMethod = gmfgen::LabelTextAccessMethod::NATIVE-»
-		org.eclipse.emf.ecore.EObject element = (org.eclipse.emf.ecore.EObject) adapter.getAdapter(org.eclipse.emf.ecore.EObject.class);
-		String s = org.eclipse.emf.ecore.util.EcoreUtil.convertToString(features[0].getEAttributeType(), element.eGet(features[0]));
-		return s != null ? s : "";«EXPAND xpt::Common::nonNLS»
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE parser_isAffectingEventMethod FOR gmfgen::PredefinedParser-»
-«REM»NO-OP, rely on superclass for now«ENDREM-»
-«ENDDEFINE»
-
-«DEFINE parser_getCompletionProcessorMethod FOR gmfgen::PredefinedParser-»
-«REM»NO-OP, rely on superclass for now«ENDREM-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenParsers-»
-«IF (implementations)[gmfgen::PredefinedParser]->exists(p | p.editMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT)»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForMessageFormatParserInvalidInputError(), 'Invalid input at {0}')-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenParsers-»
-«IF (implementations)[gmfgen::PredefinedParser]->exists(p | p.editMethod = gmfgen::LabelTextAccessMethod::MESSAGE_FORMAT)»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForMessageFormatParserInvalidInputError())-»
-«ENDIF-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/plugin/Activator.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/plugin/Activator.xpt
deleted file mode 100644
index 0233c19aeb2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/plugin/Activator.xpt
+++ /dev/null
@@ -1,25 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2010, 2020 Artem Tikhomirov, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (independent) - Initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-// FIXME For 2.3, delegates to legacy xpt::plugin::Activator template.
-// Refactoring (moving templates out from xpt) pending.
-«DEFINE Main FOR gmfgen::GenPlugin-»
-«EXPAND xpt::plugin::Activator::Activator-»
-«ENDDEFINE»
-
-// access to the sole Activator instance
-«DEFINE instanceAccess FOR gmfgen::GenEditorGenerator»«plugin.getActivatorQualifiedClassName()».getInstance()«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/Common.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/Common.xpt
deleted file mode 100644
index 143b2652319..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/Common.xpt
+++ /dev/null
@@ -1,97 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::NonNLSUtils»
-«EXTENSION xpt::StringOperations»
-
-«DEFINE copyright FOR gmfgen::GenEditorGenerator-»
-«IF copyrightText <> null-»
-/*
- * «copyrightText.xpandReplaceAll('\n', '\n * ')»
- */
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE xcopyright FOR gmfgen::GenEditorGenerator-»
-«IF copyrightText <> null-»
-<!--
-«copyrightText»
--->
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE generatedClassComment FOR OclAny»«EXPAND generatedClassComment('')»«ENDDEFINE»
-«DEFINE generatedClassComment(comment : String) FOR OclAny-»
-/**
-«IF comment.size() > 0-»
- * «comment.xpandReplaceAll('\n', '\n * ')»
-«ENDIF-»
- * @generated
- */«ENDDEFINE»
-
-«DEFINE generatedMemberComment FOR Collection(OclAny)»«EXPAND generatedMemberComment('') FOR ''»«ENDDEFINE»
-«DEFINE generatedMemberComment FOR OclAny»«EXPAND generatedMemberComment('')»«ENDDEFINE»
-«DEFINE generatedMemberComment(comment : String) FOR OclAny-»
-/**
-«IF comment.size() > 0-»
- * «comment.xpandReplaceAll('\n', '\n * ')»
-«ENDIF-»
- * @generated
- */«ENDDEFINE»
-
-«DEFINE xmlGeneratedTag FOR OclAny»<?gmfgen generated="true"?>«ENDDEFINE»
-
-«DEFINE getSaveOptions FOR gmfgen::GenDiagram»«getDiagramEditorUtilQualifiedClassName()».getSaveOptions()«ENDDEFINE»
-
-«DEFINE setCharset(varName : String) FOR gmfgen::GenDiagram-»
-«getDiagramEditorUtilQualifiedClassName()».setCharset(«varName»);
-«ENDDEFINE»
-
-«DEFINE nonNLS FOR OclAny»«EXPAND nonNLS(1)»«ENDDEFINE»
-
-«DEFINE nonNLS FOR Collection(OclAny)»«EXPAND nonNLS FOR getNonNLSCounter(self)»«ENDDEFINE»
-
-«DEFINE nonNLS FOR Collection(Integer)»«EXPAND nonNLS FOREACH self»«ENDDEFINE»
-
-«DEFINE nonNLS(i : Integer) FOR OclAny»«EXPAND nonNLS FOR i»«ENDDEFINE»
-
-«DEFINE nonNLS FOR Integer» //$NON-NLS-«self»$«ENDDEFINE»
-
-«DEFINE caseVisualID FOR gmfgen::GenCommonBase»case «EXPAND xpt::editor::VisualIDRegistry::visualID»:«ENDDEFINE»
-
-«DEFINE addShortcutAnnotation(viewVar : String) FOR gmfgen::GenDiagram-»
-	org.eclipse.emf.ecore.EAnnotation shortcutAnnotation = org.eclipse.emf.ecore.EcoreFactory.eINSTANCE.createEAnnotation();
-	shortcutAnnotation.setSource("Shortcut");«EXPAND xpt::Common::nonNLS»
-	shortcutAnnotation.getDetails().put("modelID", «EXPAND xpt::editor::VisualIDRegistry::modelID»);«EXPAND xpt::Common::nonNLS»
-	«viewVar».getEAnnotations().add(shortcutAnnotation);
-«ENDDEFINE»
-
-
-«DEFINE packageStatement FOR String-»
-«IF self.xpandSplit('\\.')->size() > 1-»
-package «LET self.xpandSplit('\\.') AS tmpVar»«FOREACH if tmpVar->size() < 2 then Sequence{}[String] else tmpVar->subSequence(1, tmpVar->size() - 1) endif AS s SEPARATOR '.'»«s»«ENDFOREACH»;«ENDLET»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE disqualifiedClassName FOR String-»
-«self.xpandSplit('\\.')->last()»
-«ENDDEFINE»
-
-// Provides handy single point to override generation of assert statements
-// TODO refactor this Common.xpt into different flavours - like CommonCodeStyle (nls, assert), CommonSnippets(pkgStmt, setCharset, getSaveOptions) and so on
-// TODO condition.xpandToCharList()->count('"') / 2 gives better guess about number of nonNLS to generate 
-«DEFINE _assert(condition : String) FOR OclAny-»
-assert «condition»;«IF condition.indexOf('\"') > 0»«EXPAND nonNLS»«ENDIF»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/ConstraintProviders.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/ConstraintProviders.xpt
deleted file mode 100644
index 616ed6fb0ec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/ConstraintProviders.xpt
+++ /dev/null
@@ -1,103 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::GenAuditRoot»
-«EXTENSION xpt::GenEditorGenerator»
-«EXTENSION gmf::CodeGenerationUtils»
-
-«DEFINE extensions FOR gmfgen::GenEditorGenerator-»
-«IF hasAudits(self)»«EXPAND extensions FOR audits»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE extensions FOR gmfgen::GenAuditRoot-»
-«EXPAND extensions_emfv_constraintProviders»
-«EXPAND extensions_emfv_constraintBindings»
-«EXPAND extensions_emfv_uiContexts»
-«ENDDEFINE»
-
-//
-// Extension point: org.eclipse.emf.validation.constraintProviders
-//
-«DEFINE extensions_emfv_constraintProviders FOR gmfgen::GenAuditRoot-»
-   <extension point="org.eclipse.emf.validation.constraintProviders">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      «EXPAND declareCategory FOREACH categories-»
-      <constraintProvider cache="true">
-«FOREACH getAllTargetedModelPackages(self) AS p-»
-         <package namespaceUri="«p.ecorePackage.nsURI»"/>
-«ENDFOREACH-»
-      «EXPAND defineCategory FOREACH categories-»
-      </constraintProvider>
-   </extension>
-«ENDDEFINE»
-
-//
-// Extension point: org.eclipse.emf.validation.constraintBindings
-//
-«DEFINE extensions_emfv_constraintBindings FOR gmfgen::GenAuditRoot-»
-   <extension point="org.eclipse.emf.validation.constraintBindings">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-«FOREACH clientContexts->asSequence() AS ctx-»
-      <clientContext default="false" id="«getQualifiedIdentity(ctx)»">
-         <selector class="«ctx.getQualifiedClassName()»"/>
-      </clientContext>
-      <binding context="«getQualifiedIdentity(ctx)»">
-         «FOREACH rules->select(r | r.target <> null and r.target.contextSelector = ctx)->asSequence() /*alternative: ctx.ruleTargets.contains(r.target)*/ AS rule-»
-         <constraint ref="«editorGen.plugin.iD».«escapeXML(rule.id)»"/>
-         «ENDFOREACH-»
-      </binding>
-
-«ENDFOREACH-»
-   </extension>
-«ENDDEFINE»
-
-//
-// Extension point: org.eclipse.emf.validation.ui.UIRegisteredClientContext
-//
-«DEFINE extensions_emfv_uiContexts FOR gmfgen::GenAuditRoot-»
-«IF editorGen.diagram.liveValidationUIFeedback»
-   <extension point="org.eclipse.emf.validation.ui.UIRegisteredClientContext">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-«FOREACH clientContexts->asSequence() AS ctx-»
-      <clientContext id="«getQualifiedIdentity(ctx)»"/>
-«ENDFOREACH-»
-   </extension>
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE declareCategory FOR gmfgen::GenAuditContainer-»
-      <category id="«EXPAND _pathMap»" mandatory="false" name="«IF name <> null»«escapeXML(name)»«ELSE»«EXPAND _pathMap»«ENDIF»">
-         <![CDATA[«(if description <> null then description else '' endif)»]]>
-      </category>
-«ENDDEFINE»
-
-«DEFINE defineCategory FOR gmfgen::GenAuditContainer-»
-         <constraints categories="«EXPAND _pathMap»">
-         «FOREACH audits->select(a | a.target <> null and a.target.getTargetClass() <> null)->asSequence() AS audit-»
-         <constraint id="«escapeXML(audit.id)»"
-            «IF audit.requiresConstraintAdapter»lang="Java" class="«audit.getConstraintAdapterQualifiedClassName()»"«ELSE»lang="OCL"«ENDIF»
-            name="«escapeXML((if audit.name <> null then audit.name else audit.id endif))»"
-            mode="«IF audit.useInLiveMode»Live«ELSE»Batch«ENDIF»"
-            severity="«audit.severity.repr()»" statusCode="200">
-            «IF not audit.requiresConstraintAdapter»<![CDATA[«(if audit.rule <> null then audit.rule.body else '' endif)»]]>«ENDIF»
-            <description><![CDATA[«(if audit.description <> null then audit.description else '' endif)»]]></description>
-            <message><![CDATA[«IF audit.message <> null»«audit.message»«ELSE»«(if audit.name <> null then audit.name else audit.id endif)» audit violated«ENDIF»]]></message>
-            <target class="«audit.target.getTargetClassModelQualifiedName()»"/>
-         </constraint>
-         «ENDFOREACH-»
-         </constraints>
-«ENDDEFINE»
-
-«DEFINE _pathMap FOR gmfgen::GenAuditContainer»«FOREACH path->asSequence() AS p SEPARATOR '/' »«escapeXML(p.id)»«ENDFOREACH»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/Externalizer.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/Externalizer.xpt
deleted file mode 100644
index 50185fd678b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/Externalizer.xpt
+++ /dev/null
@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Anna Karjakina (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::ExternalizerUtils»
-
-«DEFINE Access FOR gmfgen::GenEditorGenerator-»
-«EXPAND xpt::Common::copyright-»
-package «getExternalizerPackageName(self)»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «getExternalizerClassName()» extends org.eclipse.osgi.util.NLS {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	static {
-		org.eclipse.osgi.util.NLS.initializeMessages("«getExternalizerClassName().toLower()»", «getExternalizerClassName()».class); «EXPAND xpt::Common::nonNLS»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «getExternalizerClassName()»() {
-	}
-
-	«EXPAND Fields»
-    //TODO: put accessor fields manually	
-}
-«ENDDEFINE»
-
-«DEFINE Fields FOR gmfgen::GenEditorGenerator»
-	«EXPAND impl::actions::CreateShortcutAction::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::CreationWizard::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::CreationWizardPage::i18nAccessors FOR diagram-»
-    «EXPAND xpt::editor::DiagramEditorUtil::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::DocumentProvider::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::InitDiagramFileAction::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::NewDiagramFileWizard::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::Editor::i18nAccessors FOR editor-»
-	«EXPAND xpt::editor::ElementChooser::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::ShortcutCreationWizard::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::ModelElementSelectionPage::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::ValidateAction::i18nAccessors FOR diagram-»
-	«EXPAND xpt::editor::palette::PaletteFactory::i18nAccessors FOR diagram.palette-»
-	«EXPAND xpt::application::ActionBarAdvisor::i18nAccessors FOR application-»
-    «EXPAND xpt::application::WorkbenchWindowAdvisor::i18nAccessors FOR application-»
-    «EXPAND xpt::application::WizardNewFileCreationPage::i18nAccessors FOR application-»
-    «EXPAND impl::diagram::editparts::CompartmentEditPart::i18nAccessors FOR diagram-»
-    «EXPAND xpt::diagram::editpolicies::OpenDiagram::i18nAccessors FOR diagram-»
-    «EXPAND xpt::navigator::NavigatorContentProvider::i18nAccessors FOR navigator-»
-    «EXPAND xpt::navigator::NavigatorActionProvider::i18nAccessors FOR navigator-»
-	«EXPAND parsers::PredefinedParser::i18nAccessors FOR labelParsers-»
-	«EXPAND xpt::providers::ModelingAssistantProvider::i18nAccessors FOR diagram-»
-«ENDDEFINE»
-
-«DEFINE Values FOR gmfgen::GenEditorGenerator»
-# TODO: manually put keys and values
-«EXPAND impl::actions::CreateShortcutAction::i18nValues FOR diagram-»
-«EXPAND xpt::editor::CreationWizard::i18nValues FOR diagram-»
-«EXPAND xpt::editor::CreationWizardPage::i18nValues FOR diagram-»
-«EXPAND xpt::editor::DiagramEditorUtil::i18nValues FOR diagram-»
-«EXPAND xpt::editor::DocumentProvider::i18nValues FOR diagram-»
-«EXPAND xpt::editor::InitDiagramFileAction::i18nValues FOR diagram-»
-«EXPAND xpt::editor::NewDiagramFileWizard::i18nValues FOR diagram-»
-«EXPAND xpt::editor::Editor::i18nValues FOR editor-»
-«EXPAND xpt::editor::ElementChooser::i18nValues FOR diagram-»
-«EXPAND xpt::editor::ShortcutCreationWizard::i18nValues FOR diagram-»
-«EXPAND xpt::editor::ModelElementSelectionPage::i18nValues FOR diagram-»
-«EXPAND xpt::editor::ValidateAction::i18nValues FOR diagram-»
-«EXPAND xpt::editor::palette::PaletteFactory::i18nValues FOR diagram.palette-»
-«EXPAND xpt::application::ActionBarAdvisor::i18nValues FOR application-»
-«EXPAND xpt::application::WorkbenchWindowAdvisor::i18nValues FOR application-»
-«EXPAND xpt::application::WizardNewFileCreationPage::i18nValues FOR application-»
-«EXPAND impl::diagram::editparts::CompartmentEditPart::i18nValues FOR diagram-»
-«EXPAND xpt::diagram::editpolicies::OpenDiagram::i18nValues FOR diagram-»
-«EXPAND xpt::navigator::NavigatorContentProvider::i18nValues FOR navigator-»
-«EXPAND xpt::navigator::NavigatorActionProvider::i18nValues FOR navigator-»
-«EXPAND parsers::PredefinedParser::i18nValues FOR labelParsers-»
-«EXPAND xpt::providers::ModelingAssistantProvider::i18nValues FOR diagram-»
-«ENDDEFINE»
-
-«DEFINE accessorField(key : String) FOR OclAny»
-	«EXPAND xpt::Common::generatedMemberComment»
-    public static String «escapeIllegalKeySymbols(key)»;
-«ENDDEFINE»
-
-«DEFINE messageEntry(key : String, message : String) FOR OclAny-»
-«escapeIllegalKeySymbols(key)»=«escapeIllegalMessageSymbols(message)»
-«ENDDEFINE»
-
-«DEFINE accessorCall(key : String) FOR gmfgen::GenEditorGenerator-»
-«getExternalizerPackageName(self)».«getExternalizerClassName()».«escapeIllegalKeySymbols(key)»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/ExternalizerUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/ExternalizerUtils.qvto
deleted file mode 100644
index 2c5a7170948..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/ExternalizerUtils.qvto
+++ /dev/null
@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Anna Karjakina (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import xpt.StringOperations;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library ExternalizerUtils;
-
-helper getExternalizerPackageName(generator : gmfgen::GenEditorGenerator) : String { return generator.editor.packageName }
-
-helper getExternalizerClassName() : String { return 'Messages' }
-
-helper escapeIllegalKeySymbols(key : String) : String {
-	return key.xpandReplaceAll('[=&\"]', '').xpandReplaceAll('[ .]', '_')
-}
-
-helper escapeIllegalMessageSymbols(message : String) : String {
-	return message.xpandReplaceAll('!', '\\\\!')
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenAuditRoot.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenAuditRoot.qvto
deleted file mode 100644
index 36bc98fc26b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenAuditRoot.qvto
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import xpt.GenEditorGenerator;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-
-library GenAuditRoot;
-
-helper getAllTargetedModelPackages(root : gmfgen::GenAuditRoot) : Sequence(genmodel::GenPackage) {
-	return root.rules->select(r | r.target <> null and r.target.getTargetClass() <> null)->collect(r | r.target.getTargetClass().genPackage)->asOrderedSet()->asSequence()
-}
-
-helper getQualifiedIdentity(ctx : gmfgen::GenAuditContext) : String {
-	return ctx.root.editorGen.plugin.iD + ctx.id
-}
-
-helper hasDiagramElementTargetRule(audits : gmfgen::GenAuditRoot) : Boolean {
-	return audits <> null and (audits.rules.target)[gmfgen::GenDiagramElementTarget]->size() > 0
-}
-
--- MODIFIERS: private
-helper hasAnyNotationElementTargetRule(audits : gmfgen::GenAuditRoot) : Boolean {
-	return audits <> null and (audits.rules.target)[gmfgen::GenNotationElementTarget]->size() > 0
-}
-
-helper shouldRunValidateOnDiagram(audits : gmfgen::GenAuditRoot) : Boolean {
-	return hasDiagramElementTargetRule(audits) or hasAnyNotationElementTargetRule(audits)
-}
-
-helper getTargetDiagramElements(ctx : gmfgen::GenAuditContext) : Sequence(gmfgen::GenCommonBase) {
-	return (ctx.ruleTargets)[gmfgen::GenDiagramElementTarget].element->asOrderedSet()->asSequence()
-}
-
-helper getAllTargetDiagramElements(root : gmfgen::GenAuditRoot) : Sequence(gmfgen::GenCommonBase) {
-	return root.clientContexts->collect(it | getTargetDiagramElements(it))->asOrderedSet()->asSequence()
-}
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenEditorGenerator.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenEditorGenerator.qvto
deleted file mode 100644
index 8a22ab05997..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenEditorGenerator.qvto
+++ /dev/null
@@ -1,33 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.GenModelUtils;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library GenEditorGenerator;
-
--- FIXME remove java-only GenEditorGenerator#hasAudits or declare it in metamodel
-helper hasAudits(editorGen : gmfgen::GenEditorGenerator) : Boolean {
-	return editorGen.audits <> null and editorGen.audits.rules->notEmpty()
-}
--- see GenModelUtils#jdkComplianceLevel
-query gmfgen::GenEditorGenerator::jdkComplianceLevel() : Integer {
-	-- TODO honest field in the GenEditorGenerator instead of hardcoded value
-	return if self.diagram.domainDiagramElement.oclIsUndefined() then 4 else self.diagram.domainDiagramElement.jdkComplianceLevel()	endif;
-}
---convenience
-query gmfgen::GenCommonBase::jdkComplianceLevel() : Integer {
-	return self.getDiagram().editorGen.jdkComplianceLevel()
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenModelUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenModelUtils.qvto
deleted file mode 100644
index 3b6594c1d24..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/GenModelUtils.qvto
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import gmf.GenModelUtils;
-
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-library GenModelUtils;
-
-/*
- * GenModel functionality unrelated to EMF generated code
- * or metamodel access only.
- */
-
---GenFeature#getReverse
-helper getReverse(feature : genmodel::GenFeature) : genmodel::GenFeature {
-	return (if isReferenceType(feature) then let eReverseFeature = feature.ecoreFeature.oclAsType(ecore::EReference).eOpposite in (if eReverseFeature <> null then let genClass = findGenClassifier(feature.genClass.genPackage.genModel, eReverseFeature.eContainingClass).oclAsType(genmodel::GenClass) in (if genClass <> null then genClass.genFeatures->select(e | e.ecoreFeature = eReverseFeature)->first() else null endif) else null endif) else null endif)
-}
-
--- For primitive types, return their java.lang wrappers, for non-primitive
--- types returns instanceClassName as is
-helper getObjectCompatibleClassName(dt : ecore::EDataType) : String {
-	return (if dt.instanceClassName.indexOf('.') > 0 then dt.instanceClassName else 
-		switch { 
-		case (dt.instanceClassName = 'boolean') 'java.lang.Boolean'; 
-		case (dt.instanceClassName = 'byte') 'java.lang.Byte'; 
-		case (dt.instanceClassName = 'char') 'java.lang.Character'; 
-		case (dt.instanceClassName = 'double') 'java.lang.Double'; 
-		case (dt.instanceClassName = 'float') 'java.lang.Float'; 
-		case (dt.instanceClassName = 'int') 'java.lang.Integer'; 
-		case (dt.instanceClassName = 'long') 'java.lang.Long'; 
-		case (dt.instanceClassName = 'short') 'java.lang.Short'; 
-		else 'java.lang.Object'; 
-		} 
-		endif)
-}
-
---GenFeature#getTypeGenClassifier()
-helper getTypeGenClassifier(feature : genmodel::GenFeature) : genmodel::GenClassifier {
-	return findGenClassifier(feature.genClass.genPackage.genModel, feature.ecoreFeature.eType)
-}
-
--- FIXME: for models loaded from generated package (e.g. gmf tests often
--- refer to EClass/EOperation directly from EcorePackage) instanceClassName
--- is always set and thus all metamodel types are treated as external interfaces,
--- with useless casts to EObject
---
--- GenClass#isExternalInterface()
-helper isExternalInterface(genClass : genmodel::GenClass) : Boolean {
-	return null <> genClass.ecoreClass.instanceClassName
-}
-
--- GenFeatureImpl#isContains
-helper isContains(gf : genmodel::GenFeature) : Boolean {
-	return isReferenceType(gf) and gf.ecoreFeature.oclAsType(ecore::EReference).containment
-}
-
-helper isPrimitiveType(gf : genmodel::GenFeature) : Boolean {
-	return Sequence { 'boolean', 'byte', 'char', 'double', 'float', 'int', 'long', 'short' }->includes(gf.ecoreFeature.eType.instanceClassName)
-}
--- Workaround for EMF 2.5M4 change (bug #255469) - always assume implicit EObject supertype.
-helper GenClass::isSuperTypeOf(subclassCandidate : GenClass) : Boolean {
-	return self.ecoreClass.isSuperTypeOf(subclassCandidate.ecoreClass) or (self.ecoreClass.name = 'EObject' and self.ecoreClass.ePackage.nsURI = 'http://www.eclipse.org/emf/2002/Ecore')
-}
-
--- @returns 4 for Java1.4, 5 for JDK 5.0 and 6 for JDK6.0 
-helper GenClass::jdkComplianceLevel() : Integer {
-	return let l = self.genPackage.genModel.complianceLevel in 
-		if l = GenJDKLevel::JDK14 then 4 
-			else (if l = GenJDKLevel::JDK50 then 5 
-			else (if l = GenJDKLevel::JDK60 then 6
-			else (if l = GenJDKLevel::JDK70 then 7 endif )
-		endif) 
-		endif) 
-		endif; 
-}
-
--- MODIFIERS:private
-helper isReferenceType(gf : genmodel::GenFeature) : Boolean {
-	return gf.ecoreFeature.oclIsKindOf(ecore::EReference)
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/NonNLSUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/NonNLSUtils.qvto
deleted file mode 100644
index 219ff9a4cd1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/NonNLSUtils.qvto
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-library NonNLSUtils;
-
-property counter : Sequence(Integer) = Sequence{};
-
-helper incrementNonNLSCounter() : OclVoid {
-	counter := counter->including(counter->size() + 1);
-	return null
-}
-
-helper resetNonNLSCounter() : OclVoid {
-	counter := Sequence {  };
-	return null
-}
-
-helper getNonNLSCounter() : Sequence(Integer) {
-	return counter;
-}
-
-helper getNonNLSCounter(collection : Collection(OclAny)) : Sequence(Integer) {
-	return collection->iterate(element : OclAny; acc : Sequence(Integer) = Sequence{} | acc->including(acc->size() + 1))
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/OclMigrationProblems.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/OclMigrationProblems.qvto
deleted file mode 100644
index ac4e2cd8d3c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/OclMigrationProblems.qvto
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2011, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-library OclMigrationProblems;
-
-helper isUnbounded(typedElement : ecore::ETypedElement) : Boolean {
-	return typedElement.upperBound = *
-}
-
-helper isSingleValued(typedElement : ecore::ETypedElement) : Boolean {
-	return typedElement.upperBound = 1 or typedElement.upperBound = -2
-}
-
-helper firstOrNull(oSet : OrderedSet(gmfgen::DefaultSizeAttributes)) : gmfgen::DefaultSizeAttributes {
-	return (if oSet->isEmpty() then null else oSet->first() endif)
-} 
-
-helper firstOrNull(oSet : OrderedSet(gmfgen::ResizeConstraints)) : gmfgen::ResizeConstraints {
-	return (if oSet->isEmpty() then null else oSet->first() endif)
-} 
-
-helper firstOrNull(oSet : OrderedSet(gmfgen::LabelOffsetAttributes)) : gmfgen::LabelOffsetAttributes {
-	return (if oSet->isEmpty() then null else oSet->first() endif)
-} 
-
-helper undefinedAsFalse(param : Boolean) : Boolean {
-	return if param.oclIsUndefined() then false else param endif 
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
deleted file mode 100644
index 102d1f02431..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/ActionBarAdvisor.xpt
+++ /dev/null
@@ -1,268 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::application::i18n»
-
-«DEFINE ActionBarAdvisor FOR gmfgen::GenApplication-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «actionBarAdvisorClassName» extends org.eclipse.ui.application.ActionBarAdvisor {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.actions.ActionFactory.IWorkbenchAction lockToolBarAction;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-    private org.eclipse.ui.actions.ActionFactory.IWorkbenchAction toggleCoolbarAction;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «actionBarAdvisorClassName»(org.eclipse.ui.application.IActionBarConfigurer configurer) {
-		super(configurer);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.IWorkbenchWindow getWindow() {
-		return getActionBarConfigurer().getWindowConfigurer().getWindow();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void makeActions(org.eclipse.ui.IWorkbenchWindow window) {
-		toggleCoolbarAction = org.eclipse.ui.actions.ActionFactory.TOGGLE_COOLBAR.create(window);
-        register(toggleCoolbarAction);
-        lockToolBarAction = org.eclipse.ui.actions.ActionFactory.LOCK_TOOL_BAR.create(window);
-        register(lockToolBarAction);
-		«EXPAND makeAction('window') FOREACH sharedContributionItems-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void fillMenuBar(org.eclipse.jface.action.IMenuManager menu) {
-		«EXPAND fill('menu') FOR mainMenu-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void fillCoolBar(org.eclipse.jface.action.ICoolBarManager toolBar) {
-		org.eclipse.jface.action.IMenuManager popUpMenu = new org.eclipse.jface.action.MenuManager();
-		popUpMenu.add(new org.eclipse.jface.action.ActionContributionItem(lockToolBarAction));
-		popUpMenu.add(new org.eclipse.jface.action.ActionContributionItem(toggleCoolbarAction));
-		toolBar.setContextMenuManager(popUpMenu);
-		«EXPAND fill('toolBar') FOR mainToolBar-»
-	}
-
-	«EXPAND openEditor FOR editorGen.editor-»
-
-	«EXPAND actions-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE openEditor FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static boolean openEditor(org.eclipse.ui.IWorkbench workbench, org.eclipse.emf.common.util.URI fileURI) {
-		org.eclipse.ui.IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-		org.eclipse.ui.IWorkbenchPage page = workbenchWindow.getActivePage();
-		org.eclipse.ui.IEditorDescriptor editorDescriptor =
-			workbench.getEditorRegistry().getDefaultEditor(fileURI.toFileString());
-		if (editorDescriptor == null) {
-			org.eclipse.jface.dialogs.MessageDialog.openError(workbenchWindow.getShell(), 
-                «EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForDefaultFileEditorErrorDialog(editorGen.application))) FOR editorGen»,
-				org.eclipse.osgi.util.NLS.bind(
-				    «EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForDefaultFileEditorErrorDialog(editorGen.application))) FOR editorGen», 
-				    fileURI.toFileString()));
-			return false;
-		} else {
-			try {
-				page.openEditor(new org.eclipse.emf.common.ui.URIEditorInput(fileURI), editorDescriptor.getId());
-			} catch (org.eclipse.ui.PartInitException exception) {
-				org.eclipse.jface.dialogs.MessageDialog.openError(
-					workbenchWindow.getShell(), 
-					«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForDefaultEditorOpenErrorDialog(editorGen.application))) FOR editorGen»,
-					exception.getMessage());
-				return false;
-			}
-		}
-		return true;
-	}
-«ENDDEFINE»
-
-«DEFINE makeAction(windowVar : String) FOR gmfgen::GenContributionItem»
-	«ERROR 'Can not make action for ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE makeAction(windowVar : String) FOR gmfgen::GenActionFactoryContributionItem»
-	register(org.eclipse.ui.actions.ActionFactory.«name».create(«windowVar»));
-«ENDDEFINE»
-
-«DEFINE fill(managerVar : String) FOR gmfgen::GenContributionManager»
-	«EXPAND contribute(managerVar) FOREACH items-»
-«ENDDEFINE»
-
-«DEFINE contribute(managerVar : String) FOR gmfgen::GenContributionItem»
-	«ERROR 'Can not contribute item: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE contribute(managerVar : String) FOR gmfgen::GenGroupMarker»
-	«managerVar».add(new org.eclipse.jface.action.GroupMarker(«groupName»));
-«ENDDEFINE»
-
-«DEFINE contribute(managerVar : String) FOR gmfgen::GenSeparator»
-	«managerVar».add(new org.eclipse.jface.action.Separator(«IF null <> groupName»«groupName»«ENDIF»));
-«ENDDEFINE»
-
-«DEFINE contribute(managerVar : String) FOR gmfgen::GenMenuManager»
-	«LET managerVar + 'X' AS menuVar-»
-	{
-		org.eclipse.jface.action.IMenuManager «menuVar» = new  org.eclipse.jface.action.MenuManager(
-		«IF null <> name»«EXPAND xpt::Externalizer::accessorCall(i18nKeyForMenu(self)) FOR editorGen»«ELSE»null«ENDIF»«IF null <> iD», «iD»«ENDIF»);
-		«EXPAND contribute(menuVar) FOREACH items-»
-		«managerVar».add(«menuVar»);
-	}
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE contribute(managerVar : String) FOR gmfgen::GenToolBarManager»
-	«LET managerVar + 'X' AS toolBarVar-»
-	{
-		org.eclipse.jface.action.IToolBarManager «toolBarVar» = new  org.eclipse.jface.action.ToolBarManager();
-		«EXPAND contribute(toolBarVar) FOREACH items-»
-		«managerVar».add(new org.eclipse.jface.action.ToolBarContributionItem(«toolBarVar»«IF null <> iD», «iD»«ENDIF»));
-	}
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE contribute(managerVar : String) FOR gmfgen::GenSharedContributionItem»
-	«EXPAND contributeShared(managerVar) FOR actualItem-»
-«ENDDEFINE»
-
-«DEFINE contributeShared(managerVar : String) FOR gmfgen::GenContributionItem»
-	«ERROR 'Can not contribute shared item: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE contributeShared(managerVar : String) FOR gmfgen::GenActionFactoryContributionItem»
-	«managerVar».add(getAction(org.eclipse.ui.actions.ActionFactory.«name».getId()));
-«ENDDEFINE»
-
-«DEFINE actions FOR gmfgen::GenApplication»
-«EXPAND NewDiagramAction-»
-«EXPAND OpenUriAction-»
-«EXPAND OpenAction-»
-«EXPAND AboutAction-»
-«ENDDEFINE»
-
-«DEFINE NewDiagramAction FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedClassComment»
-	public static class NewDiagramAction extends org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void run(org.eclipse.jface.action.IAction action) {
-			«editorGen.diagram.getCreationWizardQualifiedClassName()» wizard =
-				new «editorGen.diagram.getCreationWizardQualifiedClassName()»();
-			wizard.init(getWindow().getWorkbench(), org.eclipse.jface.viewers.StructuredSelection.EMPTY);
-			org.eclipse.jface.wizard.WizardDialog wizardDialog =
-				new org.eclipse.jface.wizard.WizardDialog(getWindow().getShell(), wizard);
-			wizardDialog.open();
-		}
-	}
-
-«ENDDEFINE»
-
-«DEFINE OpenUriAction FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedClassComment»
-	public static class OpenURIAction extends org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void run(org.eclipse.jface.action.IAction action) {
-			org.eclipse.emf.edit.ui.action.LoadResourceAction.LoadResourceDialog loadResourceDialog =
-				new org.eclipse.emf.edit.ui.action.LoadResourceAction.LoadResourceDialog(getWindow().getShell());
-			if (org.eclipse.jface.dialogs.Dialog.OK == loadResourceDialog.open()) {
-				for (java.util.Iterator i = loadResourceDialog.getURIs().iterator(); i.hasNext();) {
-					openEditor(getWindow().getWorkbench(), (org.eclipse.emf.common.util.URI) i.next());
-				}
-			}
-		}
-	}
-
-«ENDDEFINE»
-
-«DEFINE OpenAction FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedClassComment»
-	public static class OpenAction extends org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void run(org.eclipse.jface.action.IAction action) {
-			org.eclipse.swt.widgets.FileDialog fileDialog =
-				new org.eclipse.swt.widgets.FileDialog(getWindow().getShell(), org.eclipse.swt.SWT.OPEN);
-			fileDialog.open();
-			if (fileDialog.getFileName() != null && fileDialog.getFileName().length() > 0) {
-				openEditor(getWindow().getWorkbench(), org.eclipse.emf.common.util.URI.createFileURI(
-					fileDialog.getFilterPath() + java.io.File.separator + fileDialog.getFileName()));
-			}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE AboutAction FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedClassComment»
-	public static class AboutAction extends org.eclipse.emf.common.ui.action.WorkbenchWindowActionDelegate {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void run(org.eclipse.jface.action.IAction action) {
-			org.eclipse.jface.dialogs.MessageDialog.openInformation(getWindow().getShell(), 
-                «EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForAboutDialog(self))) FOR editorGen»,
-                «EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForAboutDialog(self))) FOR editorGen»
-				);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenApplication-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenApplication-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForDefaultFileEditorErrorDialog(self)))-»
-«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForDefaultFileEditorErrorDialog(self)))-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForDefaultEditorOpenErrorDialog(self)))-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForAboutDialog(self)))-»
-«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForAboutDialog(self)))-»
-«IF null <> mainMenu-»
-«EXPAND internal_i18nAccessors FOR mainMenu-»
-«EXPAND internal_i18nAccessors FOREACH collectGenMenuManagers(mainMenu.items)-»
-«ENDIF»
-«EXPAND internal_i18nAccessors FOREACH collectGenMenuManagers(sharedContributionItems)-»
-«ENDDEFINE»
-
-«DEFINE internal_i18nAccessors FOR gmfgen::GenMenuManager-»
-«IF null <> name»«EXPAND xpt::Externalizer::accessorField(i18nKeyForMenu(self))»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenApplication-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForDefaultFileEditorErrorDialog(self)), 'Error')-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForDefaultFileEditorErrorDialog(self)), 'There is no editor registered for the file \"{0}\"')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForDefaultEditorOpenErrorDialog(self)), 'Open Editor')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForAboutDialog(self)), 'About')-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForAboutDialog(self)), editorGen.modelID + ' Diagram Editor')-»
-«IF null <> mainMenu-»
-«EXPAND internal_i18nValues FOR mainMenu-»
-«EXPAND internal_i18nValues FOREACH collectGenMenuManagers(mainMenu.items)-»
-«ENDIF»
-«EXPAND internal_i18nValues FOREACH collectGenMenuManagers(sharedContributionItems)-»
-«ENDDEFINE»
-
-«DEFINE internal_i18nValues FOR gmfgen::GenMenuManager-»
-«IF null <> name»«EXPAND xpt::Externalizer::messageEntry(i18nKeyForMenu(self), name)»«ENDIF-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/Application.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/Application.xpt
deleted file mode 100644
index c65d1925370..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/Application.xpt
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Application FOR gmfgen::GenApplication-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «className» implements org.eclipse.equinox.app.IApplication {
-
-«EXPAND run-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void stop() {
-	}
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE run FOR gmfgen::GenApplication-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public Object start(org.eclipse.equinox.app.IApplicationContext context) throws Exception {
-		org.eclipse.swt.widgets.Display display = org.eclipse.ui.PlatformUI.createDisplay();
-		try {
-			int returnCode = org.eclipse.ui.PlatformUI.createAndRunWorkbench(display,
-				new «getWorkbenchAdvisorQualifiedClassName()»());
-			if (returnCode == org.eclipse.ui.PlatformUI.RETURN_RESTART) {
-				return org.eclipse.equinox.app.IApplication.EXIT_RESTART;
-			}
-			return org.eclipse.equinox.app.IApplication.EXIT_OK;
-		} finally {
-			display.dispose();
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenApplication-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/Perspective.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/Perspective.xpt
deleted file mode 100644
index efe3f51a450..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/Perspective.xpt
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Perspective FOR gmfgen::GenApplication-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «perspectiveClassName» implements org.eclipse.ui.IPerspectiveFactory {
-	«EXPAND createInitialLayout-»
-	«EXPAND additions-»
-«ENDDEFINE»
-«DEFINE createInitialLayout FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void createInitialLayout(org.eclipse.ui.IPageLayout layout) {
-		layout.setEditorAreaVisible(true);
-		layout.addPerspectiveShortcut(«getWorkbenchAdvisorQualifiedClassName()».PERSPECTIVE_ID);
-		org.eclipse.ui.IFolderLayout right = layout.createFolder(
-			"right", org.eclipse.ui.IPageLayout.RIGHT, 0.6f, layout.getEditorArea()); «EXPAND xpt::Common::nonNLS»
-		right.addView(org.eclipse.ui.IPageLayout.ID_OUTLINE);
-		org.eclipse.ui.IFolderLayout bottomRight = layout.createFolder(
-			"bottomRight", org.eclipse.ui.IPageLayout.BOTTOM, 0.6f, "right"); «EXPAND xpt::Common::nonNLS»	«EXPAND xpt::Common::nonNLS(2)»
-		bottomRight.addView(org.eclipse.ui.IPageLayout.ID_PROP_SHEET);
-		«EXPAND layoutAdditions-»
-	}
-}
-«ENDDEFINE»
-
-«DEFINE layoutAdditions FOR gmfgen::GenApplication-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenApplication-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt
deleted file mode 100644
index 922df831481..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WizardNewFileCreationPage.xpt
+++ /dev/null
@@ -1,208 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::application::i18n»
-
-«DEFINE WizardNewFileCreationPage FOR gmfgen::GenApplication-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class WizardNewFileCreationPage extends org.eclipse.jface.wizard.WizardPage {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.jface.viewers.IStructuredSelection currentSelection;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private String initialFileName;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.core.runtime.IPath initialContainerFullPath;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.swt.widgets.Text fileNameEditor;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public WizardNewFileCreationPage(String name, org.eclipse.jface.viewers.IStructuredSelection currentSelection) {
-		super(name);
-		this.currentSelection = currentSelection;
-		String home = System.getProperty("user.home"); //$NON-NLS-1$
-		if (home != null) {
-			initialContainerFullPath = new org.eclipse.core.runtime.Path(home);
-		}
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.jface.viewers.IStructuredSelection getSelection() {
-		return currentSelection;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getFileName() {
-		if (fileNameEditor == null) {
-			return initialFileName;
-		}
-		org.eclipse.core.runtime.IPath path = getFilePath();
-		if (path == null || path.isEmpty() || path.hasTrailingSeparator()) {
-			return null;
-		}
-		return path.lastSegment();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setFileName(String fileName) {
-		if (fileNameEditor == null) {
-			initialFileName = fileName;
-			return;
-		}
-		setFilePath(getContainerFullPath(), fileName);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.core.runtime.IPath getContainerFullPath() {
-		if (fileNameEditor == null) {
-			return initialContainerFullPath;
-		}
-		org.eclipse.core.runtime.IPath path = getFilePath();
-		if (path == null || path.isEmpty()) {
-			return null;
-		}
-		if (path.hasTrailingSeparator()) {
-			return path;
-		}
-		path = path.removeLastSegments(1);
-		if (path.isEmpty()) {
-			return null;
-		}
-		return path.addTrailingSeparator();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setContainerFullPath(org.eclipse.core.runtime.IPath containerPath) {
-		if (fileNameEditor == null) {
-			initialContainerFullPath = containerPath;
-			return;
-		}
-		setFilePath(containerPath, getFileName());
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.core.runtime.IPath getFilePath() {
-		String fileName = fileNameEditor.getText().trim();
-		if (fileName.length() == 0) {
-			return null;
-		}
-		return new org.eclipse.core.runtime.Path(fileNameEditor.getText());
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setFilePath(org.eclipse.core.runtime.IPath containerPath, String fileName) {
-		if (fileName == null) {
-			fileName = ""; //$NON-NLS-1$
-		} else {
-			fileName = fileName.trim();
-		}
-		if (containerPath == null) {
-			fileNameEditor.setText(fileName);
-		} else {
-			if (!containerPath.hasTrailingSeparator()) {
-				containerPath = containerPath.addTrailingSeparator();
-			}
-			org.eclipse.core.runtime.IPath path = fileName.length() == 0 ? containerPath : containerPath.append(fileName);
-			fileNameEditor.setText(path.toOSString());
-		}
-		setPageComplete(validatePage());
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void createControl(org.eclipse.swt.widgets.Composite parent) {
-		org.eclipse.swt.widgets.Composite plate = new org.eclipse.swt.widgets.Composite(parent, org.eclipse.swt.SWT.NONE);
-		plate.setLayout(new org.eclipse.swt.layout.GridLayout(2, false));
-		org.eclipse.swt.widgets.Label label = new org.eclipse.swt.widgets.Label(plate, org.eclipse.swt.SWT.NONE);
-		label.setText(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewFileWizardFileLabel(self)) FOR editorGen»);
-		label.setLayoutData(new org.eclipse.swt.layout.GridData(org.eclipse.swt.SWT.BEGINNING, org.eclipse.swt.SWT.CENTER, false, false, 2, 1));
-		fileNameEditor = new org.eclipse.swt.widgets.Text(plate, org.eclipse.swt.SWT.SINGLE | org.eclipse.swt.SWT.BORDER);
-		fileNameEditor.setLayoutData(new org.eclipse.swt.layout.GridData(org.eclipse.swt.SWT.FILL, org.eclipse.swt.SWT.CENTER, true, false));
-		org.eclipse.swt.widgets.Button button = new org.eclipse.swt.widgets.Button(plate, org.eclipse.swt.SWT.PUSH);
-		button.setText(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewFileWizardBrowseButton(self)) FOR editorGen»);
-		button.setLayoutData(new org.eclipse.swt.layout.GridData(org.eclipse.swt.SWT.BEGINNING, org.eclipse.swt.SWT.CENTER, false, false));
-
-		// logic
-		fileNameEditor.addModifyListener(new org.eclipse.swt.events.ModifyListener() {
-
-			public void modifyText(org.eclipse.swt.events.ModifyEvent e) {
-				setPageComplete(validatePage());
-			}
-		});
-		button.addSelectionListener(new org.eclipse.swt.events.SelectionListener() {
-
-			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
-				org.eclipse.swt.widgets.FileDialog dialog = new org.eclipse.swt.widgets.FileDialog(getShell(), org.eclipse.swt.SWT.SAVE);
-				dialog.setText(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewFileWizardSelectDialog(self)) FOR editorGen»);
-				dialog.setFileName(getFileName());
-				String fileName = dialog.open();
-				if (fileName != null) {
-					fileNameEditor.setText(fileName);
-					setPageComplete(validatePage());
-				}
-			}
-
-			public void widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent e) {
-			}
-		});
-
-		// init
-		setFilePath(initialContainerFullPath, initialFileName);
-		setControl(plate);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean validatePage() {
-		String fileName = fileNameEditor.getText().trim();
-		if (fileName.length() == 0) {
-			setErrorMessage(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewFileWizardEmpty(self)) FOR editorGen»);
-			return false;
-		}
-		if (!new org.eclipse.core.runtime.Path("").isValidPath(fileName)) { //$NON-NLS-1$
-			setErrorMessage(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewFileWizardInvalid(self)) FOR editorGen»);
-			return false;
-		}
-		setErrorMessage(null);
-		return true;
-	}
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenApplication-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenApplication-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewFileWizardFileLabel(self), 'File:')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewFileWizardBrowseButton(self), 'Browse')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewFileWizardSelectDialog(self), 'Select new file')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewFileWizardEmpty(self), 'Specify file name')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewFileWizardInvalid(self), 'Invalid file name')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewFileWizardFileLabel(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewFileWizardBrowseButton(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewFileWizardSelectDialog(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewFileWizardEmpty(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewFileWizardInvalid(self))-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
deleted file mode 100644
index 17a7ee2bc2f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WorkbenchAdvisor.xpt
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE WorkbenchAdvisor FOR gmfgen::GenApplication-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «workbenchAdvisorClassName» extends org.eclipse.ui.application.WorkbenchAdvisor {
-«EXPAND perspectiveId-»
-
-«EXPAND getInitialWindowPerspectiveId-»
-
-«EXPAND initialize-»
-
-«EXPAND createWorkbenchWindowAdvisor-»
-
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE perspectiveId FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static final String PERSPECTIVE_ID = "«perspectiveId»"; «EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«DEFINE getInitialWindowPerspectiveId FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getInitialWindowPerspectiveId() {
-		return PERSPECTIVE_ID;
-	}
-«ENDDEFINE»
-
-«DEFINE initialize FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void initialize(org.eclipse.ui.application.IWorkbenchConfigurer configurer) {
-		super.initialize(configurer);
-		configurer.setSaveAndRestore(true);
-	}
-«ENDDEFINE»
-
-«DEFINE createWorkbenchWindowAdvisor FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.ui.application.WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
-			org.eclipse.ui.application.IWorkbenchWindowConfigurer configurer) {
-		return new «getWorkbenchWindowAdvisorQualifiedClassName()»(configurer);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenApplication-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
deleted file mode 100644
index 01caeafcf0c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/WorkbenchWindowAdvisor.xpt
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::application::i18n»
-
-«DEFINE WorkbenchWindowAdvisor FOR gmfgen::GenApplication-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «workbenchWindowAdvisorClassName» extends org.eclipse.ui.application.WorkbenchWindowAdvisor {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «workbenchWindowAdvisorClassName»(org.eclipse.ui.application.IWorkbenchWindowConfigurer configurer) {
-		super(configurer);
-	}
-
-	«EXPAND createActionBarAdvisor-»
-
-	«EXPAND preWindowOpen-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE createActionBarAdvisor FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.ui.application.ActionBarAdvisor createActionBarAdvisor(org.eclipse.ui.application.IActionBarConfigurer configurer) {
-		return new «getActionBarAdvisorQualifiedClassName()»(configurer);
-	}
-«ENDDEFINE»
-
-«DEFINE preWindowOpen FOR gmfgen::GenApplication-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void preWindowOpen() {
-		org.eclipse.ui.application.IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-		configurer.setInitialSize(new org.eclipse.swt.graphics.Point(1000, 700));
-		configurer.setTitle(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForWindowTitle(self)) FOR editorGen»);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenApplication-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenApplication-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForWindowTitle(self))-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenApplication-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForWindowTitle(self), title)-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/extensions.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/extensions.xpt
deleted file mode 100644
index 5dd7f5546c3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/extensions.xpt
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE extensions FOR gmfgen::GenApplication-»
-
-   <extension id="«iD»" point="org.eclipse.core.runtime.applications">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <application>
-         <run class="«getQualifiedClassName()»"/>
-      </application>
-   </extension>
-
-   <extension point="org.eclipse.ui.perspectives" id="rcp-perspective">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <perspective
-            id="«perspectiveId»"
-            name="%perspectiveName"
-            class="«getPerspectiveQualifiedClassName()»">
-      </perspective>
-   </extension>
-
-   <extension point="org.eclipse.ui.commands" id="rcp-menu-commands">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <command
-            name="%openURIActionLabel"
-            description="%openURIActionDescription"
-            categoryId="org.eclipse.ui.category.file"
-            id="«editorGen.plugin.iD».OpenURICommand"/>  
-      <command
-            name="%openActionLabel"
-            description="%openActionDescription"
-            categoryId="org.eclipse.ui.category.file"
-            id="«editorGen.plugin.iD».OpenCommand"/>  
-   </extension>
-
-   <extension point="org.eclipse.ui.bindings" id="rcp-command-bindings">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <key
-            commandId="«editorGen.plugin.iD».OpenURICommand"
-            sequence="M1+U"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-      <key
-            commandId="«editorGen.plugin.iD».OpenCommand"
-            sequence="M1+O"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"/>
-   </extension>
-
-   <extension point="org.eclipse.ui.actionSets" id="rcp-actions">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <actionSet
-            label="%applicationActionSetLabel"
-            visible="true"
-            id="«editorGen.plugin.iD».ActionSet">
-         <action
-               label="%newDiagramActionLabel"
-               class="«getActionBarAdvisorQualifiedClassName()»$NewDiagramAction"
-               menubarPath="file/new/additions"
-               id="«editorGen.plugin.iD».NewDiagramAction">
-         </action>
-         <action
-               label="%aboutActionLabel"
-               class="«getActionBarAdvisorQualifiedClassName()»$AboutAction"
-               menubarPath="help/additions"
-               id="«editorGen.plugin.iD».AboutAction">
-         </action>
-         <action
-               label="%openURIActionLabel"
-               definitionId="«editorGen.plugin.iD».OpenURICommand"
-               class="«getActionBarAdvisorQualifiedClassName()»$OpenURIAction"
-               menubarPath="file/additions"
-               id="«editorGen.plugin.iD».OpenURIAction">
-         </action>
-         <action
-               label="%openActionLabel"
-               definitionId="«editorGen.plugin.iD».OpenCommand"
-               class="«getActionBarAdvisorQualifiedClassName()»$OpenAction"
-               menubarPath="file/additions"
-               id="«editorGen.plugin.iD».OpenAction">
-         </action>
-      </actionSet>
-   </extension>
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/i18n.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/i18n.qvto
deleted file mode 100644
index 83b2543c8ec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/application/i18n.qvto
+++ /dev/null
@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Anna Karjakina (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library i18n;
-
-helper i18nKeyForDefaultFileEditorErrorDialog(app : gmfgen::GenApplication) : String {
-	return app.actionBarAdvisorClassName + '.DefaultFileEditor'
-}
-
-helper i18nKeyForDefaultEditorOpenErrorDialog(app : gmfgen::GenApplication) : String {
-	return app.actionBarAdvisorClassName + '.DefaultEditorOpenError'
-}
-
-helper i18nKeyForWindowTitle(app : gmfgen::GenApplication) : String {
-	return app.workbenchWindowAdvisorClassName + '.Title'
-}
-
-helper i18nKeyForAboutDialog(app : gmfgen::GenApplication) : String {
-	return app.actionBarAdvisorClassName + '.AboutDialog'
-}
-
-helper titleKey(dialogKey : String) : String {
-	return dialogKey + 'Title'
-}
-
-helper messageKey(dialogKey : String) : String {
-	return dialogKey + 'Message'
-}
-
-helper i18nKeyForMenu(menuManager : gmfgen::GenMenuManager) : String {
-	return 'ApplicationMenuName.' + menuManager.name
-}
-
--- FIXME move out from i18n, has nothing to do with l10n
-helper collectGenMenuManagers(allItems : OrderedSet(gmfgen::GenContributionItem)) : Sequence(gmfgen::GenMenuManager) {
-	return collectAllContributionItems(allItems->asSequence())[gmfgen::GenMenuManager]
-}
-
-helper collectAllContributionItems(allItems : Sequence(gmfgen::GenContributionItem)) : Sequence(gmfgen::GenContributionManager) {
-	-- FIXME simplify the expression
-	return let managers = allItems[gmfgen::GenContributionManager] in managers->union(managers->collect(item | collectAllContributionItems(item.items->asSequence())))
-}
-
-helper i18nKeyForNewFileWizardFileLabel(app : gmfgen::GenApplication) : String {
-	return wizardNewFileCreationPageClassName(app) + '.FileLabel'
-}
-
-helper i18nKeyForNewFileWizardBrowseButton(app : gmfgen::GenApplication) : String {
-	return wizardNewFileCreationPageClassName(app) + '.BrowseButton'
-}
-
-helper i18nKeyForNewFileWizardSelectDialog(app : gmfgen::GenApplication) : String {
-	return wizardNewFileCreationPageClassName(app) + '.SelectNewFileDialog'
-}
-
-helper i18nKeyForNewFileWizardEmpty(app : gmfgen::GenApplication) : String {
-	return wizardNewFileCreationPageClassName(app) + '.EmptyFileNameError'
-}
-
-helper i18nKeyForNewFileWizardInvalid(app : gmfgen::GenApplication) : String {
-	return wizardNewFileCreationPageClassName(app) + '.InvalidFileNameError'
-}
-
-helper wizardNewFileCreationPageClassName(app : gmfgen::GenApplication) : String {
-	return 'WizardNewFileCreationPage'
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/Utils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/Utils.qvto
deleted file mode 100644
index 95580e32529..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/Utils.qvto
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import gmf.GenModelUtils;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype notation uses "http://www.eclipse.org/gmf/runtime/1.0.2/notation";
-
-library Utils;
-
--- all elements that may have element type: diagram, nodes and links
-helper GenDiagram::getAllTypedElements() : Sequence(gmfgen::GenCommonBase) {
-	return Sequence { self }[gmfgen::GenCommonBase]->union(self.getAllNodes()->asSequence())->union(self.links->asSequence());
-}
-
-helper hasExplicitChildFeature(facet : gmfgen::TypeModelFacet) : Boolean {
-	return not isDerived(facet.childMetaFeature) and facet.childMetaFeature <> facet.containmentMetaFeature
-}
-
--- true when link is contained in an object other than link's source,
--- (1) sourceMetaFeature is specified
--- (2) childMetaFeature is not the same as containment and belongs to a different class than container
--- for (2), consider scenario from bug #226882, container "A", that holds link "L" and link's source and target, 
--- "N1" and "N2". "N1" has a reference to "L" which is being used as childMetaFeature. Hence, link's container, "C"
--- is different from link's source, "N1". As nothing can prevent "C" from subclassing "N1", there's no sure way to
--- tell if container is really different from the source or not, and we'd better assume they are different.  
-helper hasContainerOtherThanSource(facet : gmfgen::TypeLinkModelFacet) : Boolean {
-	return facet.sourceMetaFeature <> null or facet.childMetaFeature <> facet.containmentMetaFeature
-}
-
-helper allPreferencePages(genDiagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenPreferencePage) {
-	return recursePages(genDiagram.preferencePages->asSequence())
-}
-
-helper recursePages(pages : Sequence(gmfgen::GenPreferencePage)) : Sequence(gmfgen::GenPreferencePage) {
-	return (if pages->isEmpty() then pages else pages->union(recursePages(pages.children))->asOrderedSet()->asSequence() endif)
-}
-
--- check if there's notation::FontStyle among diagram element's custom styles
--- XXX the reason this is not inlined mostly because of troubles importing notation model into xpt
-helper gmfgen::GenCommonBase::hasFontStyleInCustom() : Boolean {
-	return self.styles->exists(s | s.ecoreClass.oclIsKindOf(notation::FontStyle));
-} 
-
-helper gmfgen::GenCommonBase::hasLineStyleInCustom() : Boolean {
-	return self.styles->exists(s | s.ecoreClass.oclIsKindOf(notation::LineStyle));
-}
-
-helper gmfgen::GenCommonBase::hasFillStyleInCustom() : Boolean {
-	return self.styles->exists(s | s.ecoreClass.oclIsKindOf(notation::FillStyle));
-}
-
--- if diagram is in pixel map mode, no reason to use getMapMode()
-helper gmfgen::GenDiagram::isPixelMapMode() : Boolean {
-	return self.units = 'Pixel';
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.qvto
deleted file mode 100644
index 027bdd3a1b3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/ViewmapAttributesUtils.qvto
+++ /dev/null
@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
- 
-import xpt.OclMigrationProblems;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library ViewmapAttributesUtils;
-
-helper isStoringChildPositions(layoutType : gmfgen::ViewmapLayoutType) : Boolean {
-	return gmfgen::ViewmapLayoutType::XY_LAYOUT = layoutType
-}
-
-helper gmfgen::Viewmap::isFixedFont() : Boolean {
-	return self.attributes[gmfgen::StyleAttributes]->exists(fixedFont)
-}
-
-helper gmfgen::Viewmap::isFixedForeground() : Boolean {
-	return self.attributes[gmfgen::StyleAttributes]->exists(fixedForeground)
-}
-
-helper gmfgen::Viewmap::isFixedBackground() : Boolean {
-	return self.attributes[gmfgen::StyleAttributes]->exists(fixedBackground)
-}
-
-helper gmfgen::Viewmap::canUseShapeStyle() : Boolean {
-	return not (self.isFixedFont() or self.isFixedForeground() or self.isFixedBackground());
-}
-
-helper getResizeConstraints(viewmap : gmfgen::Viewmap) : gmfgen::ResizeConstraints {
-	return (if null = viewmap then null else firstOrNull(viewmap.attributes[gmfgen::ResizeConstraints]) endif)
-}
-
-helper getDefaultSizeAttributes(viewmap : gmfgen::Viewmap) : gmfgen::DefaultSizeAttributes {
-	return (if null = viewmap then null else firstOrNull(viewmap.attributes[gmfgen::DefaultSizeAttributes]) endif)
-}
-
-helper defaultSizeWidth(viewmap : gmfgen::Viewmap, defaultValue : Integer) : Integer {
-	return let a = getDefaultSizeAttributes(viewmap) in (if null = a then defaultValue else a.width endif)
-}
-
-helper defaultSizeHeight(viewmap : gmfgen::Viewmap, defaultValue : Integer) : Integer {
-	return let a = getDefaultSizeAttributes(viewmap) in (if null = a then defaultValue else a.height endif)
-}
-
-helper getLabelOffsetAttributes(viewmap : gmfgen::Viewmap) : gmfgen::LabelOffsetAttributes {
-	return (if null = viewmap then null else firstOrNull(viewmap.attributes[gmfgen::LabelOffsetAttributes]) endif)
-}
-
-helper labelOffsetX(viewmap : gmfgen::Viewmap, defaultValue : Integer) : Integer {
-	return let a = getLabelOffsetAttributes(viewmap) in (if null = a then defaultValue else a.x endif)
-}
-
-helper labelOffsetY(viewmap : gmfgen::Viewmap, defaultValue : Integer) : Integer {
-	return let a = getLabelOffsetAttributes(viewmap) in (if null = a then defaultValue else a.y endif)
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt
deleted file mode 100644
index 5d0af8a8051..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateLinkCommand.xpt
+++ /dev/null
@@ -1,122 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::Utils»
-
-«DEFINE CreateLinkCommand FOR gmfgen::GenLink»«EXPAND Main»«ENDDEFINE»
-
-«DEFINE Main FOR gmfgen::GenLink-»
-«EXPAND xpt::Common::copyright FOR diagram.editorGen-»
-package «diagram.editCommandsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «createCommandClassName» extends org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand {
-	«EXPAND xpt::diagram::commands::CreateLinkUtils::fields FOR modelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «createCommandClassName»(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest request, org.eclipse.emf.ecore.EObject source, org.eclipse.emf.ecore.EObject target) {
-		super(request.getLabel(), null, request);
-		«EXPAND xpt::diagram::commands::CreateLinkUtils::_init FOR modelFacet-»
-	}
-	«EXPAND xpt::diagram::commands::CreateLinkUtils::canCreate(self) FOR modelFacet-»
-
-	«EXPAND doExecuteWithResultMethod»
-
-	«EXPAND doConfigure(self) FOR modelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setElementToEdit(org.eclipse.emf.ecore.EObject element) {
-		throw new UnsupportedOperationException();
-	}
-	«EXPAND xpt::diagram::commands::CreateLinkUtils::accessors FOR modelFacet-»
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenLink»«ENDDEFINE»
-
-«DEFINE doExecuteWithResultMethod FOR gmfgen::GenLink»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-		if (!canExecute()) {
-			throw new org.eclipse.core.commands.ExecutionException("Invalid arguments in create link command");«EXPAND xpt::Common::nonNLS»
-		}
-		«EXPAND execute(self) FOR modelFacet»
-	}
-«ENDDEFINE»
-
-«DEFINE execute(link : gmfgen::GenLink) FOR gmfgen::LinkModelFacet»«ENDDEFINE»
-
-«DEFINE execute(link : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet»
-«IF (if sourceMetaFeature = null then containmentMetaFeature.ecoreFeature.changeable else sourceMetaFeature.ecoreFeature.changeable endif) and targetMetaFeature.ecoreFeature.changeable-»
-		«EXPAND MetaModel::NewInstance('newElement') FOR metaClass-»
-		«EXPAND MetaModel::modifyFeature((if hasContainerOtherThanSource(self) then 'getContainer()' else 'getSource()' endif), containmentMetaFeature.genClass, 'newElement') FOR containmentMetaFeature-»
-		«IF sourceMetaFeature <> null-»
-			«EXPAND MetaModel::modifyFeature('newElement', metaClass, 'getSource()') FOR sourceMetaFeature-»
-		«ENDIF-»
-		«EXPAND MetaModel::modifyFeature('newElement', metaClass, 'getTarget()') FOR targetMetaFeature-»
-		«IF hasExplicitChildFeature(self)-»
-			«IF sourceMetaFeature <> null-»
-				«EXPAND MetaModel::modifyFeature('getContainer()', containmentMetaFeature.genClass, 'newElement') FOR childMetaFeature-»
-			«ELSE-»
-				«EXPAND MetaModel::modifyFeature('getSource()', getSourceType(), 'newElement') FOR childMetaFeature-»
-			«ENDIF-»
-		«ENDIF-»
-		«EXPAND initialize(link, 'newElement')-»
-		doConfigure(newElement, monitor, info);
-		((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).setNewElement(«EXPAND MetaModel::DowncastToEObject('newElement') FOR metaClass»);
-		return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult(newElement);
-«ELSE-»
-		throw new UnsupportedOperationException();
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE initialize(gmfgen::GenLink link, String newElementVar) FOR gmfgen::TypeModelFacet»«EXPAND xpt::providers::ElementInitializers::initMethodCall(self, newElementVar) FOR link»«ENDDEFINE»
-
-«DEFINE execute(link : gmfgen::GenLink) FOR gmfgen::FeatureLinkModelFacet»
-«IF metaFeature.ecoreFeature.changeable-»
-	if (getSource() != null && getTarget() != null) {
-		«EXPAND MetaModel::modifyFeature('getSource()', getSourceType(), 'getTarget()') FOR metaFeature-»
-	}
-	return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
-«ELSE-»
-	throw new UnsupportedOperationException();
-«ENDIF-»
-«ENDDEFINE»
-
-
-«DEFINE doConfigure(link : gmfgen::GenLink) FOR gmfgen::LinkModelFacet»«ENDDEFINE»
-
-/*
- * TODO invocation of configure command should be optional, and better yet, 
- * configuration should rather happen from EditPolicy then from within creation command 
- */
-«DEFINE doConfigure(link : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void doConfigure(«EXPAND MetaModel::QualifiedClassName FOR metaClass» newElement, org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-		org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = ((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).getElementType();
-		org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest configureRequest = new org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest(getEditingDomain(), «EXPAND MetaModel::DowncastToEObject('newElement') FOR metaClass», elementType);
-		configureRequest.setClientContext(((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		configureRequest.setParameter(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest.SOURCE, getSource());
-		configureRequest.setParameter(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest.TARGET, getTarget());
-		org.eclipse.gmf.runtime.common.core.command.ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt
deleted file mode 100644
index 4eb28076d23..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateLinkUtils.xpt
+++ /dev/null
@@ -1,144 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::Utils»
-
-«REM»
-	Check whether link may be created.
-«ENDREM»
-«DEFINE canCreate(link : gmfgen::GenLink) FOR gmfgen::LinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean canExecute() {
-		if (source == null && target == null) {
-			return false;
-		}
-		if (source != null && «EXPAND MetaModel::NotInstance('source') FOR getSourceType()») {
-			return false;
-		}
-		if (target != null && «EXPAND MetaModel::NotInstance('target') FOR getTargetType()») {
-			return false;
-		}
-		if (getSource() == null) {
-			return true; // link creation is in progress; source is not defined yet
-		}
-		// target may be null here but it's possible to check constraint
-		«EXPAND canCreateElement(link)-»
-	}
-«ENDDEFINE»
-
-«DEFINE canCreateElement(link : gmfgen::GenLink) FOR gmfgen::LinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE canCreateElement(link : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-«IF hasContainerOtherThanSource(self)-»
-	if (getContainer() == null) {
-		return false;
-	}
-«ENDIF-»
-	return «EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::canCreateCall(link, 'getContainer()', 'getSource()', 'getTarget()')»;
-«ENDDEFINE»
-
-«DEFINE canCreateElement(link : gmfgen::GenLink) FOR gmfgen::FeatureLinkModelFacet-»
-	return «EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::canCreateCall(link, 'getSource()', 'getTarget()')»;
-«ENDDEFINE»
-
-«REM»
-	Fields of command that creates link.
-«ENDREM»
-«DEFINE fields FOR gmfgen::LinkModelFacet»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject source;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject target;
-«ENDDEFINE»
-
-«DEFINE fields FOR gmfgen::TypeLinkModelFacet»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject source;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject target;
-«IF hasContainerOtherThanSource(self)»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final «EXPAND MetaModel::QualifiedClassName FOR containmentMetaFeature.genClass» container;
-«ENDIF-»
-«ENDDEFINE»
-
-«REM»
-	Field accessors of command that creates link.
-«ENDREM»
-«DEFINE accessors FOR gmfgen::LinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «EXPAND MetaModel::QualifiedClassName FOR getSourceType()» getSource() {
-		return «EXPAND MetaModel::CastEObject('source') FOR getSourceType()»;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «EXPAND MetaModel::QualifiedClassName FOR getTargetType()» getTarget() {
-		return «EXPAND MetaModel::CastEObject('target') FOR getTargetType()»;
-	}
-	«EXPAND containerAccessor-»
-«ENDDEFINE»
-
-«DEFINE containerAccessor FOR gmfgen::LinkModelFacet»«ENDDEFINE»
-
-«DEFINE containerAccessor FOR gmfgen::TypeLinkModelFacet-»
-«IF hasContainerOtherThanSource(self)-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «EXPAND MetaModel::QualifiedClassName FOR containmentMetaFeature.genClass» getContainer() {
-		return container;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment(
-		'Default approach is to traverse ancestors of the source to find instance of container.\n' + 
-		'Modify with appropriate logic.'
-	)»
-	private static «EXPAND MetaModel::QualifiedClassName FOR containmentMetaFeature.genClass» deduceContainer(org.eclipse.emf.ecore.EObject source, org.eclipse.emf.ecore.EObject target) {
-		// Find container element for the new link.
-		// Climb up by containment hierarchy starting from the source
-		// and return the first element that is instance of the container class.
-		for (org.eclipse.emf.ecore.EObject element = source; element != null; element = element.eContainer()) {
-			if («EXPAND MetaModel::IsInstance('element') FOR containmentMetaFeature.genClass») {
-				return «EXPAND MetaModel::CastEObject('element') FOR containmentMetaFeature.genClass»;
-			}
-		}
-		return null;
-	}
-«ENDIF-»
-
-«ENDDEFINE»
-
-«REM»
-	Part of the constructor that performs initialization.
-«ENDREM»
-«DEFINE _init FOR gmfgen::LinkModelFacet-»
-	this.source = source;
-	this.target = target;
-«ENDDEFINE»
-
-«DEFINE _init FOR gmfgen::TypeLinkModelFacet-»
-	this.source = source;
-	this.target = target;
-«IF hasContainerOtherThanSource(self)-»
-	container = deduceContainer(source, target);
-«ENDIF-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt
deleted file mode 100644
index d7280fcced5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateNodeCommand.xpt
+++ /dev/null
@@ -1,164 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::Utils»
-«EXTENSION xpt::OclMigrationProblems»
-
-«DEFINE CreateNodeCommand FOR gmfgen::GenNode-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editCommandsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «createCommandClassName» extends org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand {
-
-	«EXPAND _constructor-»
-
-	«EXPAND getElementToEdit-»
-
-	«EXPAND canExecuteMethod-»
-
-	«EXPAND doExecuteWithResultMethod»
-
-	«EXPAND doConfigureMethod»
-	
-	«EXPAND additions»	
-}
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «createCommandClassName»(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest req) {
-		super(req.getLabel(), null, req);
-	}
-«ENDDEFINE»
-
-/*
- * TODO: either use setElementToEdit, or generate downcasted version (which may be troublesome if containment and child features point to a different parent) 
- */
-«DEFINE getElementToEdit FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment('FIXME: replace with setElementToEdit()')»
-protected org.eclipse.emf.ecore.EObject getElementToEdit() {
-	org.eclipse.emf.ecore.EObject container = ((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).getContainer();
-	if (container instanceof org.eclipse.gmf.runtime.notation.View) {
-		container = ((org.eclipse.gmf.runtime.notation.View) container).getElement();
-	}
-	return container;
-}
-«ENDDEFINE»
-
-«DEFINE doExecuteWithResultMethod FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-«IF modelFacet.isPhantomElement()-»
-		«EXPAND phantomElementCreation(self, 'newElement') FOR modelFacet»
-«ELSE-»
-		«EXPAND normalElementCreation(self, 'newElement') FOR modelFacet»
-«ENDIF»
-		«EXPAND initialize(self, 'newElement') FOR modelFacet-»
-«IF true/*FIXME boolean needsExternalConfiguration*/»
-		doConfigure(newElement, monitor, info);
-«ENDIF»
-		((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).setNewElement(«EXPAND MetaModel::DowncastToEObject('newElement') FOR modelFacet.metaClass»);
-		return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult(newElement);
-	}
-«ENDDEFINE»
-
-/*
- * Unlike original CreateElementCommand, we don't keep track of IStatus from configureCommand.execute,
- * nor allow status setting from doDefaultCreation. The reason is ICommandProxy#execute implementation,
- * which ignores any status from wrapped ICommand. Besides, both CommandResult and IStatus seems too much to me.
- */
-«DEFINE doConfigureMethod FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void doConfigure(«EXPAND MetaModel::QualifiedClassName FOR modelFacet.metaClass» newElement, org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-		org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = ((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).getElementType();
-		org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest configureRequest = new org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest(getEditingDomain(), «EXPAND MetaModel::DowncastToEObject('newElement') FOR modelFacet.metaClass», elementType);
-		configureRequest.setClientContext(((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).getClientContext());
-		configureRequest.addParameters(getRequest().getParameters());
-		org.eclipse.gmf.runtime.common.core.command.ICommand configureCommand = elementType.getEditCommand(configureRequest);
-		if (configureCommand != null && configureCommand.canExecute()) {
-			configureCommand.execute(monitor, info);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE canExecuteMethod FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean canExecute() {
-«IF modelFacet.isPhantomElement()-»
-		return true;
-«ELSE-»
-	«EXPAND canExecute_Normal FOR modelFacet»
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE canExecute_Normal FOR gmfgen::TypeModelFacet-»
-«IF not isUnbounded(containmentMetaFeature.ecoreFeature) or (childMetaFeature <> containmentMetaFeature and not isUnbounded(childMetaFeature.ecoreFeature))-»
-	«EXPAND MetaModel::DeclareAndAssign('container', 'getElementToEdit()') FOR containmentMetaFeature.genClass-»
-	«IF not isUnbounded(containmentMetaFeature.ecoreFeature)-»
-			«IF isSingleValued(containmentMetaFeature.ecoreFeature)»
-		if («EXPAND MetaModel::getFeatureValue('container', containmentMetaFeature.genClass) FOR containmentMetaFeature» != null) {
-			«ELSE-»
-		if («EXPAND MetaModel::getFeatureValue('container', containmentMetaFeature.genClass) FOR containmentMetaFeature».size() >= «containmentMetaFeature.ecoreFeature.upperBound») {
-			«ENDIF-»
-			return false;
-		}
-		«ENDIF-»
-		«IF childMetaFeature <> containmentMetaFeature and not isUnbounded(childMetaFeature.ecoreFeature)-»
-			«IF isSingleValued(childMetaFeature.ecoreFeature)-»
-		if («EXPAND MetaModel::getFeatureValue('container', containmentMetaFeature.genClass) FOR childMetaFeature» != null) {
-			«ELSE-»
-		if («EXPAND MetaModel::getFeatureValue('container', containmentMetaFeature.genClass) FOR childMetaFeature».size() >= «childMetaFeature.ecoreFeature.upperBound») {
-			«ENDIF-»
-			return false;
-		}
-	«ENDIF-»
-«ENDIF-»
-	return true;
-«ENDDEFINE»
-
-«DEFINE phantomElementCreation(node : gmfgen::GenNode, varName : String) FOR gmfgen::TypeModelFacet-»
-	// Uncomment to put "phantom" objects into the diagram file.		
-	// org.eclipse.emf.ecore.resource.Resource resource = 
-	// 		((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) getRequest()).getContainer().eResource();
-	// if (resource == null) {
-	// 	return null;
-	// }
-	org.eclipse.emf.ecore.resource.Resource resource = getElementToEdit().eResource();
-	«EXPAND MetaModel::NewInstance(varName) FOR metaClass»
-	resource.getContents().add(«EXPAND MetaModel::DowncastToEObject(varName) FOR metaClass»);
-«ENDDEFINE»
-
-«DEFINE normalElementCreation(node : gmfgen::GenNode, varName : String) FOR gmfgen::TypeModelFacet-»
-	«EXPAND MetaModel::NewInstance(varName) FOR metaClass»
-«IF containmentMetaFeature <> null-»
-	«EXPAND MetaModel::DeclareAndAssign('owner', 'getElementToEdit()') FOR containmentMetaFeature.genClass»
-	«EXPAND MetaModel::modifyFeature('owner', containmentMetaFeature.genClass, varName) FOR containmentMetaFeature-»
-«ELSE-»
-	//
-	// FIXME no containment feature found in the genmodel, toolsmith need to manually write code here to add «varName» to a parent
-	//
-«ENDIF»
-«IF hasExplicitChildFeature(self)-»
-	«EXPAND MetaModel::DeclareAndAssign('childHolder', 'getElementToEdit()') FOR childMetaFeature.genClass»
-	«EXPAND MetaModel::modifyFeature('childHolder', childMetaFeature.genClass, varName) FOR childMetaFeature»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE initialize(node : gmfgen::GenNode, newElementVar : String) FOR gmfgen::TypeModelFacet»«EXPAND xpt::providers::ElementInitializers::initMethodCall(self, newElementVar) FOR node»«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNode»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt
deleted file mode 100644
index 25323fa3bb7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateRefLinkCommand.xpt
+++ /dev/null
@@ -1,21 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-/*
- * TODO: remove the template, as it's no longer in use
- */
-«DEFINE CreateRefLinkCommand FOR gmfgen::GenLink»«EXPAND CreateLinkCommand::Main»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt
deleted file mode 100644
index 25579f59136..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/CreateShortcutDecorationsCommand.xpt
+++ /dev/null
@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE CreateShortcutDecorationsCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editCommandsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «createShortcutDecorationsCommandClassName»
-		extends org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private java.util.List myDescriptors;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «createShortcutDecorationsCommandClassName»(
-			org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain,
-			org.eclipse.gmf.runtime.notation.View parentView,
-			java.util.List viewDescriptors) {
-		super(editingDomain, "Create Shortcuts", getWorkspaceFiles(parentView)); //$NON-NLS-1$
-		myDescriptors = viewDescriptors;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «createShortcutDecorationsCommandClassName»(
-			org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain,
-			org.eclipse.gmf.runtime.notation.View parentView,
-			org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor viewDescriptor) {
-		this(editingDomain, parentView, java.util.Collections.singletonList(viewDescriptor));
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(
-			org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info)
-			throws org.eclipse.core.commands.ExecutionException {
-		for (java.util.Iterator it = myDescriptors.iterator(); it.hasNext();) {
-			org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor nextDescriptor =
-					(org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor) it.next();
-			org.eclipse.gmf.runtime.notation.View view =
-					(org.eclipse.gmf.runtime.notation.View) nextDescriptor.getAdapter(
-							org.eclipse.gmf.runtime.notation.View.class);
-			if (view != null && view.getEAnnotation("Shortcut") == null) { //$NON-NLS-1$
-				«EXPAND xpt::Common::addShortcutAnnotation('view')-»
-			}
-		}
-		return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
-	}
-}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt
deleted file mode 100644
index a4764b72807..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkCommand.xpt
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE ReorientLinkCommand FOR gmfgen::GenLink-»
-«EXPAND xpt::Common::copyright FOR diagram.editorGen-»
-package «diagram.editCommandsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «reorientCommandClassName» extends org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final int reorientDirection;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject oldEnd;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject newEnd;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «reorientCommandClassName»(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest request) {
-		super(request.getLabel(), request.getRelationship(), request);
-		reorientDirection = request.getDirection();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-	«EXPAND xpt::diagram::commands::ReorientLinkUtils::canReorient(self) FOR modelFacet-»
-	«EXPAND xpt::diagram::commands::ReorientLinkUtils::reorient FOR modelFacet-»
-	«EXPAND xpt::diagram::commands::ReorientLinkUtils::accessors-»
-}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt
deleted file mode 100644
index 1b8be5bf6f2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkUtils.xpt
+++ /dev/null
@@ -1,295 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION xpt::diagram::Utils»
-
-«REM»
-	Expands to all accessor methods for link and it's ends.
-«ENDREM»
-«DEFINE accessors FOR gmfgen::GenLink-»
-	«EXPAND linkAccessor FOR modelFacet-»
-	«EXPAND oldSourceAccessor FOR modelFacet-»
-	«EXPAND newSourceAccessor FOR modelFacet-»
-	«EXPAND oldTargetAccessor FOR modelFacet-»
-	«EXPAND newTargetAccessor FOR modelFacet-»
-«ENDDEFINE»
-
-«DEFINE linkAccessor FOR gmfgen::LinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE linkAccessor FOR gmfgen::TypeLinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «EXPAND MetaModel::QualifiedClassName FOR metaClass» getLink() {
-		return «EXPAND MetaModel::CastEObject('getElementToEdit()') FOR metaClass»;
-	}
-«ENDDEFINE»
-
-«DEFINE oldSourceAccessor FOR gmfgen::LinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE oldSourceAccessor FOR gmfgen::TypeLinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «EXPAND MetaModel::QualifiedClassName FOR getSourceType()» getOldSource() {
-		return «EXPAND MetaModel::CastEObject('oldEnd') FOR getSourceType()»;
-	}
-«ENDDEFINE»
-
-«DEFINE oldSourceAccessor FOR gmfgen::FeatureLinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «EXPAND MetaModel::QualifiedClassName FOR getSourceType()» getOldSource() {
-		return «EXPAND MetaModel::CastEObject('referenceOwner') FOR getSourceType()»;
-	}
-«ENDDEFINE»
-
-«DEFINE newSourceAccessor FOR gmfgen::LinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «EXPAND MetaModel::QualifiedClassName FOR getSourceType()» getNewSource() {
-		return «EXPAND MetaModel::CastEObject('newEnd') FOR getSourceType()»;
-	}
-«ENDDEFINE»
-
-«DEFINE oldTargetAccessor FOR gmfgen::LinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «EXPAND MetaModel::QualifiedClassName FOR getTargetType()» getOldTarget() {
-		return «EXPAND MetaModel::CastEObject('oldEnd') FOR getTargetType()»;
-	}
-«ENDDEFINE»
-
-«DEFINE newTargetAccessor FOR gmfgen::LinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «EXPAND MetaModel::QualifiedClassName FOR getTargetType()» getNewTarget() {
-		return «EXPAND MetaModel::CastEObject('newEnd') FOR getTargetType()»;
-	}
-«ENDDEFINE»
-
-«REM»
-	Generates canExecute() method for the command that reorients link.
-	Implementation should perform all static checks that command can be executed.
-«ENDREM»
-«DEFINE canReorient(link : gmfgen::GenLink) FOR gmfgen::LinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean canExecute() {
-		«EXPAND checkLinkValidity-»
-		if (reorientDirection == org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return canReorientSource();
-		}
-		if (reorientDirection == org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest.REORIENT_TARGET) {
-			return canReorientTarget();
-		}
-		return false;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean canReorientSource() {
-		«EXPAND checkSourceRequestValidity(link)-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean canReorientTarget() {
-		«EXPAND checkTargetRequestValidity(link)-»
-	}
-«ENDDEFINE»
-
-«DEFINE checkLinkValidity FOR gmfgen::LinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE checkLinkValidity FOR gmfgen::TypeLinkModelFacet-»
-	if («EXPAND MetaModel::NotInstance('getElementToEdit()') FOR metaClass») {
-		return false;
-	}
-«ENDDEFINE»
-
-«DEFINE checkLinkValidity FOR gmfgen::FeatureLinkModelFacet-»
-	if («EXPAND MetaModel::NotInstance('referenceOwner') FOR getSourceType()») {
-		return false;
-	}
-«ENDDEFINE»
-
-«DEFINE checkSourceRequestValidity(link : gmfgen::GenLink) FOR gmfgen::LinkModelFacet»«ENDDEFINE»
-
-«DEFINE checkSourceRequestValidity(link : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-	if (!(«EXPAND MetaModel::IsInstance('oldEnd') FOR getSourceType()» && «EXPAND MetaModel::IsInstance('newEnd') FOR getSourceType()»)) {
-		return false;
-	}
-	«EXPAND extractFeatureWithCheck('getLink()', metaClass, 'target', getTargetType()) FOR targetMetaFeature-»
-	«EXPAND checkLinkConstraint(link, 'getNewSource()', 'target')-»
-«ENDDEFINE»
-
-«REM»
-	When feature source is being reoriented oldEnd is the link target.
-«ENDREM»
-«DEFINE checkSourceRequestValidity(link : gmfgen::GenLink) FOR gmfgen::FeatureLinkModelFacet-»
-	if (!(«EXPAND MetaModel::IsInstance('oldEnd') FOR getTargetType()» && «EXPAND MetaModel::IsInstance('newEnd') FOR getSourceType()»)) {
-		return false;
-	}
-	return «EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::canExistCall(link, 'getNewSource()', 'getOldTarget()')»;
-«ENDDEFINE»
-
-«DEFINE checkTargetRequestValidity(link : gmfgen::GenLink) FOR gmfgen::LinkModelFacet»«ENDDEFINE»
-
-«DEFINE checkTargetRequestValidity(link : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-	if (!(«EXPAND MetaModel::IsInstance('oldEnd') FOR getTargetType()» && «EXPAND MetaModel::IsInstance('newEnd') FOR getTargetType()»)) {
-		return false;
-	}
-	«IF sourceMetaFeature <> null-»
-		«EXPAND extractFeatureWithCheck('getLink()', metaClass, 'source', getSourceType()) FOR sourceMetaFeature-»
-	«ELSE-»
-		if (!(«EXPAND MetaModel::IsContainerInstance('getLink()', metaClass) FOR getSourceType()»)) {
-			return false;
-		}
-		«EXPAND MetaModel::DeclareAndAssignContainer('source', 'getLink()', metaClass) FOR getSourceType()»
-	«ENDIF-»
-	«EXPAND checkLinkConstraint(link, 'source', 'getNewTarget()')-»
-«ENDDEFINE»
-
-«DEFINE checkTargetRequestValidity(link : gmfgen::GenLink) FOR gmfgen::FeatureLinkModelFacet-»
-	if (!(«EXPAND MetaModel::IsInstance('oldEnd') FOR getTargetType()» && «EXPAND MetaModel::IsInstance('newEnd') FOR getTargetType()»)) {
-		return false;
-	}
-	return «EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::canExistCall(link, 'getOldSource()', 'getNewTarget()')»;
-«ENDDEFINE»
-
-«DEFINE extractFeatureWithCheck(containerVar : String, containerMetaClass : genmodel::GenClass, _var : String, varMetaClass : genmodel::GenClass) FOR genmodel::GenFeature-»
-	«IF ecoreFeature.many-»
-		if («EXPAND MetaModel::getFeatureValue(containerVar, containerMetaClass)».size() != 1) {
-			return false;
-		}
-		«EXPAND MetaModel::DeclareAndAssign2(_var, containerVar, containerMetaClass, self, 'get(0)', true) FOR varMetaClass»
-	«ELSE-»
-		«EXPAND MetaModel::DeclareAndAssign(_var, containerVar, containerMetaClass, self) FOR varMetaClass»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE checkLinkConstraint(link : gmfgen::GenLink, sourceVar : String, targetVar : String) FOR gmfgen::TypeLinkModelFacet-»
-«IF hasContainerOtherThanSource(self)-»
-	if (!(«EXPAND MetaModel::IsContainerInstance('getLink()', metaClass) FOR containmentMetaFeature.genClass»)) {
-		return false;
-	}
-	«EXPAND MetaModel::DeclareAndAssignContainer('container', 'getLink()', metaClass) FOR containmentMetaFeature.genClass»
-«ENDIF-»
-	return «EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::canExistCall(link, 'container', 'getLink()', sourceVar, targetVar)»;
-«ENDDEFINE»
-
-«REM»
-	Generates doExecuteWithResult() method for the command that reorients link.
-	Implementation should throw ExecutionException if it can't execute the command.
-«ENDREM»
-«DEFINE reorient FOR gmfgen::LinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(
-			org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info)
-			throws org.eclipse.core.commands.ExecutionException {
-		if (!canExecute()) {
-			throw new org.eclipse.core.commands.ExecutionException("Invalid arguments in reorient link command"); «EXPAND xpt::Common::nonNLS»
-		}
-		if (reorientDirection == org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest.REORIENT_SOURCE) {
-			return reorientSource();
-		}
-		if (reorientDirection == org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest.REORIENT_TARGET) {
-			return reorientTarget();
-		}
-		throw new IllegalStateException();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.common.core.command.CommandResult reorientSource() throws org.eclipse.core.commands.ExecutionException {
-		«EXPAND reorientSource-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.common.core.command.CommandResult reorientTarget() throws org.eclipse.core.commands.ExecutionException {
-		«EXPAND reorientTarget-»
-	}
-«ENDDEFINE»
-
-«DEFINE reorientSource FOR gmfgen::LinkModelFacet-»
-«ENDDEFINE»
-
-«REM»
-	Shouldn't we change link container here?
-	[artem] especially when there's explicit childMetaFeature and 
-	we changed source to another, but didn't change the container. Perhaps,
-	makes sense to deduceContainer() using new source?
-«ENDREM»
-«DEFINE reorientSource FOR gmfgen::TypeLinkModelFacet-»
-«IF (if sourceMetaFeature = null then containmentMetaFeature.ecoreFeature.changeable else sourceMetaFeature.ecoreFeature.changeable endif)-»
-«IF sourceMetaFeature <> null-»
-	«EXPAND changeTarget('getLink()', metaClass, 'getOldSource()', 'getNewSource()') FOR sourceMetaFeature-»
-«ELSE-»
-	«EXPAND changeSource('getLink()', 'getOldSource()', 'getNewSource()', getSourceType()) FOR (if hasExplicitChildFeature(self) then childMetaFeature else containmentMetaFeature endif)-»
-«ENDIF-»
-	return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult(getLink());
-«ELSE-»
-	throw new UnsupportedOperationException();
-«ENDIF-»
-«ENDDEFINE»
-
-«REM»
-	When feature source is being reoriented oldEnd is the link target.
-«ENDREM»
-«DEFINE reorientSource FOR gmfgen::FeatureLinkModelFacet-»
-«IF metaFeature.ecoreFeature.changeable-»
-	«EXPAND changeSource('getOldTarget()', 'getOldSource()', 'getNewSource()', getSourceType()) FOR metaFeature-»
-	return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult(referenceOwner);
-«ELSE-»
-	throw new UnsupportedOperationException();
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE reorientTarget FOR gmfgen::LinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE reorientTarget FOR gmfgen::TypeLinkModelFacet-»
-«IF targetMetaFeature.ecoreFeature.changeable-»
-	«EXPAND changeTarget('getLink()', metaClass, 'getOldTarget()', 'getNewTarget()') FOR targetMetaFeature-»
-	return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult(getLink());
-«ELSE-»
-	throw new UnsupportedOperationException();
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE reorientTarget FOR gmfgen::FeatureLinkModelFacet-»
-«IF metaFeature.ecoreFeature.changeable-»
-	«EXPAND changeTarget('getOldSource()', getSourceType(), 'getOldTarget()', 'getNewTarget()') FOR metaFeature-»
-	return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult(referenceOwner);
-«ELSE-»
-	throw new UnsupportedOperationException();
-«ENDIF-»
-«ENDDEFINE»
-
-«REM»
-	Replace old target with the new one in the source.
-«ENDREM»
-«DEFINE changeTarget(sourceVar : String, sourceVarGenClass : genmodel::GenClass, oldTargetVar : String, newTargetVar : String) FOR genmodel::GenFeature-»
-«EXPAND MetaModel::replaceFeatureValue(sourceVar, sourceVarGenClass, oldTargetVar, newTargetVar)»
-«ENDDEFINE»
-
-«REM»
-	Move target from old source to the new one.
-«ENDREM»
-«DEFINE changeSource(targetVar : String, oldSourceVar : String, newSourceVar : String, sourceVarGenClass : genmodel::GenClass) FOR genmodel::GenFeature-»
-«EXPAND MetaModel::moveFeatureValue(oldSourceVar, newSourceVar, sourceVarGenClass, targetVar)»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt
deleted file mode 100644
index cf47833e3f7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientLinkViewCommand.xpt
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE ReorientLinkViewCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editCommandsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «reorientConnectionViewCommandClassName»
-		extends org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.core.runtime.IAdaptable edgeAdaptor;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «reorientConnectionViewCommandClassName»(
-			org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain, String label) {
-		super(editingDomain, label, null);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public java.util.List getAffectedFiles() {
-		org.eclipse.gmf.runtime.notation.View view =
-				(org.eclipse.gmf.runtime.notation.View) edgeAdaptor.getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-		if (view != null) {
-			return getWorkspaceFiles(view);
-		}
-		return super.getAffectedFiles();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.core.runtime.IAdaptable getEdgeAdaptor() {
-		return edgeAdaptor;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setEdgeAdaptor(org.eclipse.core.runtime.IAdaptable edgeAdaptor) {
-		this.edgeAdaptor = edgeAdaptor;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor progressMonitor, org.eclipse.core.runtime.IAdaptable info) {
-		«EXPAND xpt::Common::_assert('null != edgeAdaptor : \"Null child in ' + reorientConnectionViewCommandClassName + '\"')-»
-		org.eclipse.gmf.runtime.notation.Edge edge = (org.eclipse.gmf.runtime.notation.Edge) getEdgeAdaptor().getAdapter(org.eclipse.gmf.runtime.notation.Edge.class);
-		«EXPAND xpt::Common::_assert('null != edge : \"Null edge in ' + reorientConnectionViewCommandClassName + '\"')-»
-		org.eclipse.gmf.runtime.notation.View tempView = edge.getSource();
-		edge.setSource(edge.getTarget());
-		edge.setTarget(tempView);
-		return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
-	}
-}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt
deleted file mode 100644
index f9aa6c87a93..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/commands/ReorientRefLinkCommand.xpt
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE ReorientRefLinkCommand FOR gmfgen::GenLink-»
-«EXPAND xpt::Common::copyright FOR diagram.editorGen-»
-package «diagram.editCommandsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «reorientCommandClassName» extends org.eclipse.gmf.runtime.emf.type.core.commands.EditElementCommand {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final int reorientDirection;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject referenceOwner;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject oldEnd;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EObject newEnd;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «reorientCommandClassName»(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest request) {
-		super(request.getLabel(), null, request);
-		reorientDirection = request.getDirection();
-		referenceOwner = request.getReferenceOwner();
-		oldEnd = request.getOldRelationshipEnd();
-		newEnd = request.getNewRelationshipEnd();
-	}
-	«EXPAND xpt::diagram::commands::ReorientLinkUtils::canReorient(self) FOR modelFacet-»
-	«EXPAND xpt::diagram::commands::ReorientLinkUtils::reorient FOR modelFacet-»
-	«EXPAND xpt::diagram::commands::ReorientLinkUtils::accessors-»
-}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt
deleted file mode 100644
index c209e967558..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/BaseEditHelper.xpt
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- * 	  Michael Golubev (Montages) - #368169 - extract common code to GMFT-specific runtime
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE extendsClause FOR gmfgen::GenDiagram»extends «EXPAND superClass»«ENDDEFINE»
-«DEFINE superClass FOR gmfgen::GenDiagram»org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase«ENDDEFINE»
-
-«DEFINE BaseEditHelper FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editHelpersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «baseEditHelperClassName» «EXPAND extendsClause» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND getEditHelperAdvice-»
-	
-	«EXPAND getInsteadCommand-»
-
-	«EXPAND getCreateCommand-»
-
-	«EXPAND getCreateRelationshipCommand-»
-
-	«EXPAND getDestroyElementCommand-»
-
-	«EXPAND getDestroyReferenceCommand-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE editPolicyCommandConstant FOR gmfgen::GenDiagram»org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase.EDIT_POLICY_COMMAND«ENDDEFINE»
-
-«DEFINE contextElementTypeConstant FOR gmfgen::GenDiagram»org.eclipse.gmf.tooling.runtime.edit.helpers.GeneratedEditHelperBase.CONTEXT_ELEMENT_TYPE«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
-
-«REM»
-All empty DEFINE's below are still here for backward compatibilty of AROUND's. 
-However we don't have anything to generate here since common code had extracted to GMFT-runtime as part of #368169
-«ENDREM»
-«DEFINE getEditHelperAdvice FOR gmfgen::GenDiagram»«ENDDEFINE»
-«DEFINE getInsteadCommand FOR gmfgen::GenDiagram»«ENDDEFINE»
-«DEFINE getCreateCommand FOR gmfgen::GenDiagram»«ENDDEFINE»
-«DEFINE getCreateRelationshipCommand FOR gmfgen::GenDiagram»«ENDDEFINE»
-«DEFINE getDestroyElementCommand FOR gmfgen::GenDiagram»«ENDDEFINE»
-«DEFINE getDestroyReferenceCommand FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt
deleted file mode 100644
index af0ecd0f177..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelper.xpt
+++ /dev/null
@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE EditHelper FOR gmfgen::MetamodelType-»
-«EXPAND xpt::Common::copyright FOR diagramElement.getDiagram().editorGen-»
-package «diagramElement.getDiagram().editHelpersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editHelperClassName» extends «diagramElement.getDiagram().getBaseEditHelperQualifiedClassName()» {
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::MetamodelType»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt
deleted file mode 100644
index 93ed89894d1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/edithelpers/EditHelperAdvice.xpt
+++ /dev/null
@@ -1,28 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE EditHelperAdvice FOR gmfgen::SpecializationType-»
-«EXPAND xpt::Common::copyright FOR diagramElement.getDiagram().editorGen-»
-package «diagramElement.getDiagram().editHelpersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editHelperAdviceClassName» extends org.eclipse.gmf.runtime.emf.type.core.edithelper.AbstractEditHelperAdvice {
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::SpecializationType»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt
deleted file mode 100644
index bf1aa91ea86..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/Common.xpt
+++ /dev/null
@@ -1,196 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«DEFINE visualIDConstant FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static final int VISUAL_ID = «visualID»;
-«ENDDEFINE»
-
-«DEFINE behaviour FOR gmfgen::GenCommonBase-»
-	«EXPAND behaviour FOREACH behaviour-»
-«ENDDEFINE»
-
-«DEFINE behaviour FOR gmfgen::Behaviour-»
-«ENDDEFINE»
-
-«DEFINE behaviour FOR gmfgen::CustomBehaviour-»
-«IF editPolicyQualifiedClassName = null or editPolicyQualifiedClassName.trim().size() = 0-»
-	removeEditPolicy(«key»); «IF key.startsWith('\"') and key.endsWith('\"')»«EXPAND xpt::Common::nonNLS»«ENDIF»
-«ELSE-»
-	installEditPolicy(«key», new «getEditPolicyQualifiedClassName()»()); «IF key.startsWith('\"') and key.endsWith('\"')»«EXPAND xpt::Common::nonNLS»«ENDIF»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE behaviour FOR gmfgen::OpenDiagramBehaviour-»
-	installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.OPEN_ROLE,
-		new «getEditPolicyQualifiedClassName()»());«-»
-«ENDDEFINE»
-
-«DEFINE labelFigure FOR gmfgen::ParentAssignedViewmap-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure createFigure() {
-		// Parent should assign one using «EXPAND impl::diagram::editparts::TextAware::labelSetterName»() method
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE labelFigure FOR gmfgen::ModeledViewmap-»
-	«IF not self.figureModel.oclAsType(gmfgraph::DiagramLabel).accessor.oclIsUndefined()-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure createFigure() {
-		// Parent should assign one using «EXPAND impl::diagram::editparts::TextAware::labelSetterName»() method
-		return null;
-	}
-	«ELSE-»
-		«EXPAND _labelFigureDelegateToPrim-»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE labelFigure FOR gmfgen::Viewmap-»
-	«EXPAND _labelFigureDelegateToPrim-»
-«ENDDEFINE»
-
-«DEFINE _labelFigureDelegateToPrim FOR gmfgen::Viewmap-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure createFigure() {
-		org.eclipse.draw2d.IFigure label = createFigurePrim();
-		defaultText = getLabelTextHelper(label);
-		return label;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure createFigurePrim() {
-		«EXPAND labelFigurePrim FOR self-»
-«ENDDEFINE»
-
-«DEFINE labelFigurePrim FOR gmfgen::FigureViewmap-»
-«IF figureQualifiedClassName = null-»
-	return new org.eclipse.draw2d.Label();
-«ELSE-»
-	return new «figureQualifiedClassName»();
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE labelFigurePrim FOR gmfgen::SnippetViewmap-»
-	return «body»;
-	}
-«ENDDEFINE»
-
-«DEFINE labelFigurePrim FOR gmfgen::InnerClassViewmap-»
-	return new «className»();
-	}
-
-	«classBody»
-«ENDDEFINE»
-
-«DEFINE labelFigurePrim FOR gmfgen::ModeledViewmap-»
-	return new «EXPAND impl::diagram::editparts::viewmaps::modeledViewmapProducer::viewmapFigureFQN FOR self»(«EXPAND labelTextDefaultValue_ FOR self.figureModel»);
-	}
-«ENDDEFINE»
-
-«DEFINE labelTextDefaultValue_ FOR ecore::EObject»«ENDDEFINE»
-
-«DEFINE labelTextDefaultValue_ FOR gmfgraph::DiagramLabel-»
-«IF not self.figure.actualFigure.oclAsType(gmfgraph::Label).text.oclIsUndefined()-»
-"«self.figure.actualFigure.oclAsType(gmfgraph::Label).text»"«-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE labelFigurePrim FOR gmfgen::Viewmap-»
-	«ERROR 'Unknown viewmap: ' + self.repr()-»
-	}
-«ENDDEFINE»
-
-«DEFINE notationalListeners FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void addNotationalListeners() {
-		super.addNotationalListeners();
-		addListenerFilter("PrimaryView", this, getPrimaryView()); «EXPAND xpt::Common::nonNLS»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void removeNotationalListeners() {
-		super.removeNotationalListeners();
-		removeListenerFilter("PrimaryView"); «EXPAND xpt::Common::nonNLS»
-	}
-«ENDDEFINE»
-
-«DEFINE handleBounds FOR gmfgen::GenCommonBase-»
-	if (org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Width().equals(feature) ||
-			org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getSize_Height().equals(feature) ||
-			org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_X().equals(feature) ||
-			org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLocation_Y().equals(feature)) {
-		refreshBounds();
-	}
-«ENDDEFINE»
-
-«DEFINE handleText FOR gmfgen::GenCommonBase-»
-	if (org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_FontColor().equals(feature)) {
-		Integer c = (Integer) event.getNewValue();
-		setFontColor(org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramColorRegistry.getInstance().getColor(c));
-	} else if (org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_Underline().equals(feature)) {
-		refreshUnderline();
-	} else if (org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_StrikeThrough().equals(feature)) {
-		refreshStrikeThrough();
-	} else if (org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_FontHeight().equals(feature) ||
-			org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_FontName().equals(feature) ||
-			org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_Bold().equals(feature) ||
-			org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFontStyle_Italic().equals(feature)) {
-		refreshFont();
-	} else {
-		if (getParser() != null && getParser().isAffectingEvent(event, getParserOptions().intValue())) {
-			refreshLabel();
-		}
-		if (getParser() instanceof org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser) {
-			org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser modelParser =
-				(org.eclipse.gmf.runtime.emf.ui.services.parser.ISemanticParser) getParser();
-			if (modelParser.areSemanticElementsAffected(null, event)) {
-				removeSemanticListeners();
-				if (resolveSemanticElement() != null) {
-					addSemanticListeners();
-				}
-				refreshLabel();
-			}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE installSemanticEditPolicy FOR gmfgen::GenCommonBase-»
-	«IF sansDomain-»
-removeEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE);
-	«ELSE-»
-installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.SEMANTIC_ROLE, new «getItemSemanticEditPolicyQualifiedClassName()»());
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE installCanonicalEditPolicy FOR gmfgen::GenContainerBase-»
-	«IF needsCanonicalEditPolicy()-»
-installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CANONICAL_ROLE, new «getCanonicalEditPolicyQualifiedClassName()»());
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE installCreationEditPolicy FOR gmfgen::GenCommonBase-»
-installEditPolicy(org.eclipse.gmf.runtime.diagram.ui.editpolicies.EditPolicyRoles.CREATION_ROLE, «EXPAND _creationEditPolicyNewInstance»);
-«ENDDEFINE»
-
-«DEFINE _creationEditPolicyNewInstance FOR gmfgen::GenCommonBase-»
-new org.eclipse.gmf.tooling.runtime.edit.policies.reparent.CreationEditPolicyWithCustomReparent(«EXPAND xpt::editor::VisualIDRegistry::runtimeTypedInstanceCall FOR self.getDiagram()»)«-»
-«ENDDEFINE»
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt
deleted file mode 100644
index a4d39b4705d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/EditPartFactory.xpt
+++ /dev/null
@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE EditPartFactory FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «editPartsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartFactoryClassName» implements org.eclipse.gef.EditPartFactory {
-
-	«EXPAND createEditPartMethod-»
-	
-	«EXPAND createUnrecognizedEditPart-»
-	
-	«EXPAND getTextCellEditorLocator-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE createEditPartMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gef.EditPart createEditPart(org.eclipse.gef.EditPart context, Object model) {
-		if (model instanceof org.eclipse.gmf.runtime.notation.View) {
-			org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) model;
-			switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(view)) {
-				«EXPAND createEditPart FOR self-»
-				«FOREACH getAllNodes()->asSequence() AS node-»
-					«EXPAND createEditPart FOR node-»
-					«EXPAND createEditPart FOREACH node.labels-»
-				«ENDFOREACH-»
-				«EXPAND createEditPart FOREACH compartments-»
-				«FOREACH links->asSequence() AS link-»
-					«EXPAND createEditPart FOR link-»
-					«EXPAND createEditPart FOREACH link.labels»
-				«ENDFOREACH-»
-			}
-		}
-		return createUnrecognizedEditPart(context, model);
-	}
-«ENDDEFINE»
-
-«DEFINE createEditPart FOR gmfgen::GenCommonBase»
-	«EXPAND xpt::Common::caseVisualID»
-		return new «getEditPartQualifiedClassName()»(view);
-«ENDDEFINE»
-
-«DEFINE createUnrecognizedEditPart FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	 private org.eclipse.gef.EditPart createUnrecognizedEditPart(org.eclipse.gef.EditPart context, Object model) {
-	 	// Handle creation of unrecognized child node EditParts here
-	 	return null;
-	 }
-«ENDDEFINE»
-
-«DEFINE getTextCellEditorLocator FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static org.eclipse.gef.tools.CellEditorLocator getTextCellEditorLocator(
-			org.eclipse.gmf.runtime.diagram.ui.editparts.ITextAwareEditPart source) {
-		return org.eclipse.gmf.tooling.runtime.directedit.locator.CellEditorLocatorAccess.INSTANCE.getTextCellEditorLocator(source);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto
deleted file mode 100644
index 7f4d9d8d0c8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editparts/Utils.qvto
+++ /dev/null
@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype gmfgraph uses "http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition";
-
-library Utils;
-
-helper isStoringChildPositions(node : gmfgen::GenNode) : Boolean {
-	return node.getLayoutType() = gmfgen::ViewmapLayoutType::XY_LAYOUT
-}
-
-helper getExternalLabels(node : gmfgen::GenNode) : Sequence(gmfgen::GenExternalNodeLabel) {
-	return (node.labels)[gmfgen::GenExternalNodeLabel]->asSequence()
-}
-
-helper getSideAffixedChildren(node : gmfgen::GenNode) : Sequence(gmfgen::GenChildSideAffixedNode) {
-	return (node.childNodes)[gmfgen::GenChildSideAffixedNode]->asSequence()
-}
-
-helper getInnerFixedLabels(node : gmfgen::GenNode) : Sequence(gmfgen::GenLabel) {
-	return node.labels->asSequence()[not oclIsKindOf(gmfgen::GenExternalNodeLabel)]->select(e | e.oclAsType(gmfgen::GenLabel).viewmap.oclIsKindOf(gmfgen::ParentAssignedViewmap));
-}
-
-helper getInnerFixedLabelsWithModeledViewmaps(node : gmfgen::GenNode) : Sequence(gmfgen::GenLabel) {
-	return node.labels->asSequence()[not oclIsKindOf(gmfgen::GenExternalNodeLabel)]
-		->select(e | 
-			let modeledViewmap = e.oclAsType(gmfgen::GenLabel).viewmap.oclAsType(gmfgen::ModeledViewmap) in
-			let diagramLabel = modeledViewmap.figureModel.oclAsType(gmfgraph::DiagramLabel) in
-			not diagramLabel.accessor.oclIsUndefined()
-		);
-}
-
-helper getPinnedCompartments(node : gmfgen::GenNode) : Sequence(gmfgen::GenCompartment) {
-	return node.compartments->select(e | e.viewmap.oclIsKindOf(gmfgen::ParentAssignedViewmap))->asSequence()
-}
-
-helper getPinnedCompartmentsWithModeledViewmaps(node : gmfgen::GenNode) : Sequence(gmfgen::GenCompartment) {
-	return node.compartments->select(c | 
-			let modeledViewmap = c.viewmap.oclAsType(gmfgen::ModeledViewmap) in
-			let compartment = modeledViewmap.figureModel.oclAsType(gmfgraph::Compartment) in
-			not compartment.accessor.oclIsUndefined())
-		->asSequence()
-}
-
-helper hasFixedChildren(node : gmfgen::GenNode) : Boolean {
-	return 
-		getInnerFixedLabels(node)->size() > 0 
-		or getPinnedCompartments(node)->size() > 0
-		or getInnerFixedLabelsWithModeledViewmaps(node)->size() > 0
-		or getPinnedCompartmentsWithModeledViewmaps(node)->size() > 0
-}
-
-helper listCompartmentHasChildren(compartment : gmfgen::GenCompartment) : Boolean {
-	return compartment.listLayout and compartment.childNodes->size() > 0
-}
-
-helper hasChildrenInListCompartments(node : gmfgen::GenNode) : Boolean {
-	return node.compartments->exists(e | listCompartmentHasChildren(e))
-}
-
-helper hasBorderItems(node : gmfgen::GenNode) : Boolean {
-	return getSideAffixedChildren(node)->size() > 0 or getExternalLabels(node)->size() > 0
-}
-
-helper needsGraphicalNodeEditPolicy(node : gmfgen::GenNode) : Boolean {
-	return null <> node.modelFacet and node.reorientedIncomingLinks->size() > 0
-}
-
-helper i18nKeyForCompartmentTitle(compartment : gmfgen::GenCompartment) : String {
-	return compartment.editPartClassName + '.title'
-}
-
-helper shouldGenerateDiagramViewmap(genDiagram : gmfgen::GenDiagram) : Boolean {
-	return not Sequence { gmfgen::ViewmapLayoutType::UNKNOWN, gmfgen::ViewmapLayoutType::XY_LAYOUT }->includes(genDiagram.viewmap.layoutType)
-}
-
-helper getAssistantOutgoingLinks(node : gmfgen::GenNode) : Sequence(gmfgen::GenLink) {
-	return node.genOutgoingLinks->select(link | link.targets->exists(oclIsKindOf(GenNode)))->asSequence()
-}
-
-helper getAssistantIncomingLinks(node : gmfgen::GenNode) : Sequence(gmfgen::GenLink) {
-	return node.genIncomingLinks->select(link | link.sources->exists(oclIsKindOf(GenNode)))->asSequence()
-}
-
-helper selectGenNodes(ends : OrderedSet(gmfgen::GenLinkEnd)) : Sequence(gmfgen::GenLinkEnd) {
-	return ends->asSequence()[gmfgen::GenNode]
-}
-
-helper haveOneOfChildNodesIncomimgLinks(it : gmfgen::GenCompartment) : Boolean {
-	return it.childNodes->exists(n | getAssistantIncomingLinks(n)->notEmpty())
-}
-
-helper collectIncomingLinks(it : gmfgen::GenCompartment) : Sequence(gmfgen::GenLink) {
-	return it.childNodes->collect(n | getAssistantIncomingLinks(n))->flatten()->asSet()->asSequence()->sortedBy(n | n.visualID)
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt
deleted file mode 100644
index dc207efa9de..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/BaseItemSemanticEditPolicy.xpt
+++ /dev/null
@@ -1,519 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION xpt::diagram::editpolicies::Utils»
-«EXTENSION xpt::diagram::Utils»
-«EXTENSION xpt::GenModelUtils»
-«EXTENSION xpt::OclMigrationProblems»
-
-«DEFINE BaseItemSemanticEditPolicy FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «getDiagram().editPoliciesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «baseItemSemanticEditPolicyClassName» extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.SemanticEditPolicy {
-
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-
-	«EXPAND xpt::Common::generatedMemberComment(
-		'Extended request data key to hold editpart visual id.\n' + 
-		'Add visual id of edited editpart to extended data of the request\n' + 
-		'so command switch can decide what kind of diagram element is being edited.\n' + 
-		'It is done in those cases when it\'s not possible to deduce diagram\n' + 
-		'element kind from domain element.\n'
-	)»
-	public org.eclipse.gef.commands.Command getCommand(org.eclipse.gef.Request request) {
-		if (request instanceof org.eclipse.gef.requests.ReconnectRequest) {
-			Object view = ((org.eclipse.gef.requests.ReconnectRequest) request).getConnectionEditPart().getModel();
-			if (view instanceof org.eclipse.gmf.runtime.notation.View) {
-				Integer id = new Integer(«EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»((org.eclipse.gmf.runtime.notation.View) view));
-				request.getExtendedData().put(VISUAL_ID_KEY, id);
-			}
-		}
-		return super.getCommand(request);
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment('Returns visual id from request parameters.')»
-	protected int getVisualID(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest request) {
-		Object id = request.getParameter(VISUAL_ID_KEY);
-		return id instanceof Integer ? ((Integer) id).intValue() : -1;
-	}
-
-	«EXPAND semanticPart-»
-
-	«EXPAND xpt::Common::generatedMemberComment('Returns editing domain from the host edit part.')»
-	protected org.eclipse.emf.transaction.TransactionalEditingDomain getEditingDomain() {
-		return ((org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) getHost()).getEditingDomain();
-	}
-
-	«EXPAND addDestroyShortcutsCommand-»
-
-«IF links->exists(not sansDomain) -»
-	«EXPAND linkConstraints-»
-«ENDIF-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment('Extended request data key to hold editpart visual id.')»
-	public static final String VISUAL_ID_KEY = "visual_id"; «EXPAND xpt::Common::nonNLS»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.gmf.runtime.emf.type.core.IElementType myElementType;
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «baseItemSemanticEditPolicyClassName»(org.eclipse.gmf.runtime.emf.type.core.IElementType elementType) {
-		myElementType = elementType;
-	}
-«ENDDEFINE»
-
-«DEFINE addDestroyShortcutsCommand FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment('Clean all shortcuts to the host element from the same diagram')»
-	protected void addDestroyShortcutsCommand(org.eclipse.gmf.runtime.common.core.command.ICompositeCommand cmd, org.eclipse.gmf.runtime.notation.View view) {
-		«EXPAND xpt::Common::_assert('view.getEAnnotation(\"Shortcut\") == null')-»
-		for (java.util.Iterator it = view.getDiagram().getChildren().iterator(); it.hasNext();) {
-			org.eclipse.gmf.runtime.notation.View nextView = (org.eclipse.gmf.runtime.notation.View) it.next();
-			if (nextView.getEAnnotation("Shortcut") == null || !nextView.isSetElement() || nextView.getElement() != view.getElement()) {«EXPAND xpt::Common::nonNLS»
-				continue;
-			}
-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), nextView));
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE semanticPart FOR gmfgen::GenDiagram-»
-	«EXPAND getSemanticCommand-»
-	
-	«EXPAND addDeleteViewCommand-»
-	
-	«EXPAND getEditHelperCommand-»
-	
-	«EXPAND getContextElementType-»
-	
-	«EXPAND getSemanticCommandSwitch-»
-	
-	«EXPAND getConfigureCommand-»
-
-	«EXPAND getCreateRelationshipCommand-»
-
-	«EXPAND getCreateCommand-»
-
-	«EXPAND getSetCommand-»
-
-	«EXPAND getEditContextCommand-»
-
-	«EXPAND getDestroyElementCommand-»
-
-	«EXPAND getDestroyReferenceCommand-»
-
-	«EXPAND getDuplicateCommand-»
-
-	«EXPAND getMoveCommand-»
-
-	«EXPAND getReorientReferenceRelationshipCommand-»
-
-	«EXPAND getReorientRelationshipCommand-»
-	
-	«EXPAND getGEFWrapper-»
-«ENDDEFINE»
-
-«DEFINE getEditHelperCommand FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gef.commands.Command getEditHelperCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest request, org.eclipse.gef.commands.Command editPolicyCommand) {
-		if (editPolicyCommand != null) {
-			org.eclipse.gmf.runtime.common.core.command.ICommand command = editPolicyCommand instanceof org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy ? ((org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy) editPolicyCommand).getICommand() : new org.eclipse.gmf.runtime.diagram.ui.commands.CommandProxy(editPolicyCommand);
-			request.setParameter(«EXPAND xpt::diagram::edithelpers::BaseEditHelper::editPolicyCommandConstant», command);
-		}
-		org.eclipse.gmf.runtime.emf.type.core.IElementType requestContextElementType = getContextElementType(request);
-		request.setParameter(«EXPAND xpt::diagram::edithelpers::BaseEditHelper::contextElementTypeConstant», requestContextElementType);
-		org.eclipse.gmf.runtime.common.core.command.ICommand command = requestContextElementType.getEditCommand(request);
-		request.setParameter(«EXPAND xpt::diagram::edithelpers::BaseEditHelper::editPolicyCommandConstant», null);
-		request.setParameter(«EXPAND xpt::diagram::edithelpers::BaseEditHelper::contextElementTypeConstant», null);
-		if (command != null) {
-			if (!(command instanceof org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand)) {
-				command = new org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand(getEditingDomain(), command.getLabel()).compose(command);
-			}
-			return new org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy(command);
-		}
-		return editPolicyCommand;
-	}
-«ENDDEFINE»
-
-«DEFINE getContextElementType FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.emf.type.core.IElementType getContextElementType(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest request) {
-		org.eclipse.gmf.runtime.emf.type.core.IElementType requestContextElementType = «getElementTypesQualifiedClassName()».getElementType(getVisualID(request));
-		return requestContextElementType != null ? requestContextElementType : myElementType;
-	}
-«ENDDEFINE»
-
-«DEFINE getSemanticCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getSemanticCommand(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest request) {
-	org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest completedRequest = completeRequest(request);
-	org.eclipse.gef.commands.Command semanticCommand = getSemanticCommandSwitch(completedRequest);
-	semanticCommand = getEditHelperCommand(completedRequest, semanticCommand);
-	if (completedRequest instanceof org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest) {
-		org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest destroyRequest = (org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest) completedRequest;
-		return shouldProceed(destroyRequest) ? addDeleteViewCommand(semanticCommand, destroyRequest) : null;
-		}
-		return semanticCommand;
-	}
-«ENDDEFINE»
-
-«DEFINE addDeleteViewCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command addDeleteViewCommand(org.eclipse.gef.commands.Command mainCommand, org.eclipse.gmf.runtime.emf.type.core.requests.DestroyRequest completedRequest){
-		org.eclipse.gef.commands.Command deleteViewCommand = getGEFWrapper(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), (org.eclipse.gmf.runtime.notation.View) getHost().getModel()));
-		return mainCommand == null ? deleteViewCommand : mainCommand.chain(deleteViewCommand);
-}
-«ENDDEFINE»
-
-«DEFINE getSemanticCommandSwitch FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getSemanticCommandSwitch(org.eclipse.gmf.runtime.emf.type.core.requests.IEditCommandRequest req) {
-	if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest) {
-		return getCreateRelationshipCommand((org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) {
-		return getCreateCommand((org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest) {
-		return getConfigureCommand((org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest) {
-		return getDestroyElementCommand((org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest) {
-		return getDestroyReferenceCommand((org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest) {
-		return getDuplicateCommand((org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest) {
-		return getEditContextCommand((org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest) {
-		return getMoveCommand((org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest) {
-		return getReorientReferenceRelationshipCommand((org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest) {
-		return getReorientRelationshipCommand((org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest) req);
-	} else if (req instanceof org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest) {
-		return getSetCommand((org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest) req);
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getConfigureCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getConfigureCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ConfigureRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getCreateRelationshipCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getCreateRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getCreateCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getSetCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getSetCommand(org.eclipse.gmf.runtime.emf.type.core.requests.SetRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getEditContextCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getEditContextCommand(org.eclipse.gmf.runtime.emf.type.core.requests.GetEditContextRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getDestroyElementCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getDestroyReferenceCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getDestroyReferenceCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getDuplicateCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getDuplicateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getMoveCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getMoveCommand(org.eclipse.gmf.runtime.emf.type.core.requests.MoveRequest req) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getReorientReferenceRelationshipCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getReorientReferenceRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest req) {
-	return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;
-}
-«ENDDEFINE»
-
-«DEFINE getReorientRelationshipCommand FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getReorientRelationshipCommand(org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest req) {
-	return org.eclipse.gef.commands.UnexecutableCommand.INSTANCE;
-}
-«ENDDEFINE»
-
-«DEFINE getGEFWrapper FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected final org.eclipse.gef.commands.Command getGEFWrapper(org.eclipse.gmf.runtime.common.core.command.ICommand cmd) {
-		return new org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy(cmd);
-	}
-«ENDDEFINE»
-
-«DEFINE _accessLinkConstraints FOR gmfgen::GenDiagram-»
-«getBaseItemSemanticEditPolicyQualifiedClassName()».getLinkConstraints()«-»
-«ENDDEFINE»
-
-«DEFINE canExistCall(gmfgen::GenLink link, String sourceVar, String targetVar) FOR gmfgen::FeatureLinkModelFacet-»
-«EXPAND _accessLinkConstraints FOR link.diagram».canExist«link.getUniqueIdentifier()»(«sourceVar», «targetVar»)«-»
-«ENDDEFINE»
-// NOTE, containerVar will be used only when link has other container than its source. It's safe to pass variable/method name that doesn't exist
-«DEFINE canExistCall(gmfgen::GenLink link, String containerVar, String linkVar, String sourceVar, String targetVar) FOR gmfgen::TypeLinkModelFacet-»
-«EXPAND _accessLinkConstraints FOR link.diagram».canExist«link.getUniqueIdentifier()»(«IF hasContainerOtherThanSource(self)»«containerVar», «ENDIF»«linkVar», «sourceVar», «targetVar»)«-»
-«ENDDEFINE»
-
-«DEFINE canCreateCall(gmfgen::GenLink link, String sourceVar, String targetVar) FOR gmfgen::FeatureLinkModelFacet-»
-«EXPAND _accessLinkConstraints FOR link.diagram».canCreate«link.getUniqueIdentifier()»(«sourceVar», «targetVar»)«-»
-«ENDDEFINE»
-// NOTE, containerVar will be used only when link has other container than its source. It's safe to pass variable/method name that doesn't exist
-// Yes, this is sorta hack, but no idea of better approach right now. Perhaps, CreateLinkUtils may always define getContainer() for TypeLinkModelFacet, and use getSource() by default? 
-«DEFINE canCreateCall(gmfgen::GenLink link, String containerVar, String sourceVar, String targetVar) FOR gmfgen::TypeLinkModelFacet-»
-«EXPAND _accessLinkConstraints FOR link.diagram».canCreate«link.getUniqueIdentifier()»(«IF hasContainerOtherThanSource(self)»«containerVar», «ENDIF»«sourceVar», «targetVar»)«-»
-«ENDDEFINE»
-
-
-
-«REM»
-		FIXME need to check constraint's provider to ensure we don't generate a field
-		for e.g. Java (or Literal, which is unlikely, though) expressions
-«ENDREM»
-«DEFINE linkConstraints FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static «getLinkCreationConstraintsClassName()» getLinkConstraints() {
-		«getLinkCreationConstraintsClassName()» cached = «EXPAND plugin::Activator::instanceAccess FOR editorGen».getLinkConstraints();
-		if (cached == null) {
-			«EXPAND plugin::Activator::instanceAccess FOR editorGen».setLinkConstraints(cached = new «getLinkCreationConstraintsClassName()»());
-		}
-		return cached;
-	}
-
-
-«EXPAND xpt::Common::generatedClassComment»
-public static class «getLinkCreationConstraintsClassName()» {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	«getLinkCreationConstraintsClassName()»() {«REM»package-local for the BaseItemSemanticEditPolicy to instantiate. Perhaps, protected is better (i.e. if someone subclasses it?)«ENDREM»
-		// use static method #getLinkConstraints() to access instance
-	}
-
-	«EXPAND canCreate FOREACH links-»
-	«EXPAND canExist FOREACH links-»
-}
-«ENDDEFINE»
-
-«DEFINE canCreate FOR gmfgen::GenLink»
-«EXPAND xpt::Common::generatedMemberComment»
-public boolean canCreate«getUniqueIdentifier()»(«EXPAND canCreateParameters FOR modelFacet») {
-	«EXPAND checkEMFConstraints FOR modelFacet-»
-	return canExist«getUniqueIdentifier()»(«EXPAND canCreateValues FOR modelFacet»);
-}
-
-«ENDDEFINE»
-
-«REM»
-		XXX for now, both constraints are injected into single method
-			which may not be suitable for modification especially when mixing
-			java and ocl constraints (former requires manual code).
-		Better approach would be:
-			if either is non-null and providers are not the same - introduce two methods, 
-			to check source and target separately. Otherwize, do it inplace.
-«ENDREM»
-«DEFINE canExist FOR gmfgen::GenLink»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean canExist«getUniqueIdentifier()»(«EXPAND canExistParameters FOR modelFacet») {
-«IF creationConstraints <> null and (creationConstraints.isValid() and null <> getDiagram().editorGen.expressionProviders)-»
-		try {
-«IF null <> creationConstraints.sourceEnd-»
-			«EXPAND _checkAdditionalConstraint(creationConstraints.sourceEnd, 'source', 'target', creationConstraints.getSourceEndContextClass(), creationConstraints.getTargetEndContextClass()) FOR creationConstraints.sourceEnd.provider-»
-«ENDIF-»
-«IF null <> creationConstraints.targetEnd-»
-			«EXPAND _checkAdditionalConstraint(creationConstraints.targetEnd, 'target', 'source', creationConstraints.getTargetEndContextClass(), creationConstraints.getSourceEndContextClass()) FOR creationConstraints.targetEnd.provider-»
-«ENDIF-»
-			return true;
-		} catch(Exception e) {	
-			«EXPAND plugin::Activator::instanceAccess FOR getDiagram().editorGen».logError("Link constraint evaluation error", e);«EXPAND xpt::Common::nonNLS»
-			return false;
-		}
-«ELSE-»
-		return true;
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-// FIXME mark as private (_) and move to impl::<find proper place>::LinkConstraints.xpt
-«DEFINE canCreateParameters FOR gmfgen::LinkModelFacet»«EXPAND sourceTargetParameters»«ENDDEFINE»// source and target are reasonable defaults
-«DEFINE canCreateParameters FOR gmfgen::TypeLinkModelFacet»«IF hasContainerOtherThanSource(self)»«EXPAND MetaModel::QualifiedClassName FOR containmentMetaFeature.genClass» container, «ENDIF»«EXPAND sourceTargetParameters»«ENDDEFINE»
-
-«DEFINE canExistParameters FOR gmfgen::LinkModelFacet»«EXPAND sourceTargetParameters»«ENDDEFINE»// source and target are reasonable defaults
-«DEFINE canExistParameters FOR gmfgen::TypeLinkModelFacet»«IF hasContainerOtherThanSource(self)»«EXPAND MetaModel::QualifiedClassName FOR containmentMetaFeature.genClass» container, «ENDIF»«EXPAND MetaModel::QualifiedClassName FOR metaClass» linkInstance, «EXPAND sourceTargetParameters»«ENDDEFINE»
-
-«DEFINE sourceTargetParameters FOR gmfgen::LinkModelFacet»«EXPAND MetaModel::QualifiedClassName FOR getSourceType()» source, «EXPAND MetaModel::QualifiedClassName FOR getTargetType()» target«ENDDEFINE»
-
-// these are in fact 'canExist' values
-«DEFINE canCreateValues FOR gmfgen::LinkModelFacet»source, target«ENDDEFINE» // defaults
-«DEFINE canCreateValues FOR gmfgen::TypeLinkModelFacet»«IF hasContainerOtherThanSource(self)»container, «ENDIF»null, source, target«ENDDEFINE»
-
-
-«DEFINE checkEMFConstraints FOR gmfgen::LinkModelFacet»«ERROR 'Unrecognized link model facet in checkEMFConstraints: ' + self.repr()»«ENDDEFINE»
-
-«DEFINE checkEMFConstraints FOR gmfgen::TypeLinkModelFacet-»
-	«LET childMetaFeature <> containmentMetaFeature and not isUnbounded(childMetaFeature.ecoreFeature) AS checkChildFeatureBounds-»
-		«IF not isUnbounded(containmentMetaFeature.ecoreFeature) or checkChildFeatureBounds-»
-if («getContainerVariable(self)» != null) {
-			«EXPAND checkEMFConstraints(self) FOR containmentMetaFeature-»
-			«IF checkChildFeatureBounds-»
-				«EXPAND checkEMFConstraints(self) FOR childMetaFeature-»
-			«ENDIF-»
-}
-		«ENDIF-»
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE checkEMFConstraints(modelFacet : gmfgen::TypeLinkModelFacet) FOR genmodel::GenFeature-»
-«IF not isUnbounded(ecoreFeature)-»
-if («EXPAND featureBoundComparator(getContainerVariable(modelFacet), modelFacet.getSourceType())») {
-	return false;
-}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE checkEMFConstraints FOR gmfgen::FeatureLinkModelFacet-»
-if (source != null) {
-	if («EXPAND featureBoundsConditionClause('source', getSourceType()) FOR metaFeature») {
-		return false;
-	}
-	«IF isContains(metaFeature)-»
-	if (source == target) {
-		return false;
-	}
-	«ENDIF-»	
-}
-«IF getReverse(metaFeature) <> null-»
-if (target != null && («EXPAND featureBoundsConditionClause('target', getTargetType()) FOR getReverse(metaFeature)»)) {
-	return false;
-}
-«ENDIF»
-«ENDDEFINE»
-
-«DEFINE featureBoundsConditionClause(targetVar : String, targetType : genmodel::GenClass) FOR genmodel::GenFeature-»
-«REM»Checking upper bounds if was specified in MM«ENDREM»«-»
-«IF not isUnbounded(ecoreFeature)»«EXPAND featureBoundComparator(targetVar, targetType)»«ENDIF-»
-«REM»Checking uniqueness in addition if upper bounds != 1«ENDREM»«-»
-«IF not isSingleValued(ecoreFeature) and not isUnbounded(ecoreFeature)» || «ENDIF-»
-«REM»Checking uniqueness in if upper bounds !- 1«ENDREM»«-»
-«IF not isSingleValued(ecoreFeature)»«EXPAND featureUniquenessComparator(targetVar, targetType)»«ENDIF»
-«ENDDEFINE»
-
-«DEFINE featureBoundComparator(featureVar : String, featureVarGenClass : genmodel::GenClass) FOR genmodel::GenFeature»«EXPAND MetaModel::getFeatureValue(featureVar, featureVarGenClass)»«IF isSingleValued(ecoreFeature)» != null«ELSE».size() >= «ecoreFeature.upperBound»«ENDIF»«ENDDEFINE»
-«DEFINE featureUniquenessComparator(featureVar : String, featureVarGenClass : genmodel::GenClass) FOR genmodel::GenFeature»«EXPAND MetaModel::getFeatureValue(featureVar, featureVarGenClass) FOR self».contains(target)«ENDDEFINE»
-
-
-«DEFINE _checkAdditionalConstraint(gmfgen::ValueExpression valueExpr, String sourceEndVar, String targetEndVar, genmodel::GenClass context, genmodel::GenClass oppositeEndContext) FOR gmfgen::GenExpressionProviderBase»
-«ERROR 'Have no idea what extra constraints to check for ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE _checkAdditionalConstraint(gmfgen::ValueExpression valueExpr, String sourceEndVar, String targetEndVar, genmodel::GenClass context, genmodel::GenClass oppositeEndContext) FOR gmfgen::GenExpressionInterpreter-»
-	if («sourceEndVar» == null) {
-		return true;
-	} else {«REM»else is important here as it gives scope for the env variable«ENDREM»
-		java.util.Map«EXPAND CodeStyle::G2('String', 'org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram» env = java.util.Collections.«EXPAND CodeStyle::G2('String', 'org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram»singletonMap(«EXPAND oppositeEndVariableNameValue», «EXPAND MetaModel::MetaClass FOR oppositeEndContext»);«EXPAND xpt::Common::nonNLS»
-		Object «sourceEndVar»Val = «EXPAND xpt::expressions::getExpression::getExpression(valueExpr, context, 'env')».evaluate(«sourceEndVar», java.util.Collections.singletonMap(«EXPAND oppositeEndVariableNameValue», «targetEndVar»));«EXPAND xpt::Common::nonNLS»
-		if (false == «sourceEndVar»Val instanceof Boolean || !((Boolean) «sourceEndVar»Val).booleanValue()) {
-			return false;
-		} // else fall-through
-	}
-«ENDDEFINE»
-
-«DEFINE _checkAdditionalConstraint(gmfgen::ValueExpression valueExpr, String sourceEndVar, String targetEndVar, genmodel::GenClass context, genmodel::GenClass oppositeEndContext) FOR gmfgen::GenJavaExpressionProvider-»
-«IF injectExpressionBody and (valueExpr.body <> null and valueExpr.body.size() <> 0)-»
-	«valueExpr.body»
-«ELSEIF throwException or (injectExpressionBody and (valueExpr.body = null or valueExpr.body.size() = 0))-»
-	// TODO: implement this method, using «sourceEndVar» and «targetEndVar» 
-	// to access link source and target, respectively
-	// Ensure that you remove @generated or mark it @generated NOT
-	if (Boolean.TRUE.booleanValue()) {
-		throw new java.lang.UnsupportedOperationException("No java implementation provided");«EXPAND xpt::Common::nonNLS»
-	}
-«ELSE-»
-	if (Boolean.TRUE.booleanValue()) {«REM»just in case there are two consecutive java expression with neither throw nor inject - avoid unreachable code.«ENDREM»
-		return false;
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE oppositeEndVariableNameValue FOR OclAny»"oppositeEnd"«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE defaultConstructor FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «itemSemanticEditPolicyClassName»() {
-		«EXPAND defaultConstructorBody-»
-	}
-«ENDDEFINE»
-
-«REM»
-	This method should be called only with diagram, node or link used as a parameter 
-	(then elementType != null)
-«ENDREM»
-«DEFINE defaultConstructorBody FOR gmfgen::GenCommonBase-»
-	«IF elementType = null-»
-		«ERROR 'No element type in the passed node. Only diagram, node or link are supported in this template: ' + self.repr()-»
-	«ENDIF-»
-	super(«EXPAND xpt::providers::ElementTypes::accessElementType»);
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt
deleted file mode 100644
index a1c25937490..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/CompartmentItemSemanticEditPolicy.xpt
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE CompartmentItemSemanticEditPolicy FOR gmfgen::GenCompartment-»
-	«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPoliciesPackageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «itemSemanticEditPolicyClassName» extends «getDiagram().getBaseItemSemanticEditPolicyQualifiedClassName()» {
-
-	«EXPAND _constructor-»
-
-	«EXPAND xpt::diagram::editpolicies::childContainerCreateCommand::childContainerCreateCommand FOR childNodes->asSequence()-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenCompartment-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «itemSemanticEditPolicyClassName»() {
-		«EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::defaultConstructorBody FOR node-»		
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenCompartment-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt
deleted file mode 100644
index 63d5ebeddfa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/DiagramItemSemanticEditPolicy.xpt
+++ /dev/null
@@ -1,65 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE DiagramItemSemanticEditPolicy FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «editPoliciesPackageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «itemSemanticEditPolicyClassName» extends «getBaseItemSemanticEditPolicyQualifiedClassName()» {
-
-	«EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::defaultConstructor-»
-
-	«EXPAND xpt::diagram::editpolicies::childContainerCreateCommand::childContainerCreateCommand FOR topLevelNodes->asSequence()-»
-	
-	«EXPAND getDuplicateCommand-»
-	
-	«EXPAND DuplicateAnythingCommand-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE getDuplicateCommand FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getDuplicateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest req) {
-	org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain = ((org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) getHost()).getEditingDomain();
-	return getGEFWrapper(new DuplicateAnythingCommand(editingDomain, req));
-}
-«ENDDEFINE»
-
-«DEFINE DuplicateAnythingCommand FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedClassComment»
-private static class DuplicateAnythingCommand extends org.eclipse.gmf.runtime.emf.commands.core.commands.DuplicateEObjectsCommand {
-
-	«EXPAND DAC_constructor-»
-
-	«EXPAND DAC_additions-»
-}
-«ENDDEFINE»
-
-«DEFINE DAC_constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public DuplicateAnythingCommand(org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain, org.eclipse.gmf.runtime.emf.type.core.requests.DuplicateElementsRequest req) {
-	super(editingDomain, req.getLabel(), req.getElementsToBeDuplicated(), req.getAllDuplicatedElementsMap());
-}
-«ENDDEFINE»
-
-«DEFINE DAC_additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt
deleted file mode 100644
index ef919ab131e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/GraphicalNodeEditPolicy.xpt
+++ /dev/null
@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE GraphicalNodeEditPolicy FOR gmfgen::GenNode-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPoliciesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «graphicalNodeEditPolicyClassName» extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.GraphicalNodeEditPolicy {
-
-	«EXPAND xpt::Common::generatedClassComment»
-	protected org.eclipse.gef.commands.Command getConnectionCompleteCommand(
-			org.eclipse.gef.requests.CreateConnectionRequest request) {
-		org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = getElementType(request);
-		«FOREACH reorientedIncomingLinks->sortedBy(l | l.visualID) AS link-»
-		if («EXPAND xpt::providers::ElementTypes::accessElementType FOR link» == elementType) {
-			«IF link.outgoingCreationAllowed-»
-			if (request.getSourceEditPart() != getHost()) {
-			«ENDIF-»
-			return getConnectionWithReorientedViewCompleteCommand(request);
-			«IF link.outgoingCreationAllowed-»
-			}
-			«ENDIF-»
-		}
-		«ENDFOREACH-»
-		return super.getConnectionCompleteCommand(request);
-	}
-
-	«EXPAND xpt::Common::generatedClassComment»
-	protected org.eclipse.gmf.runtime.emf.type.core.IElementType getElementType(
-			org.eclipse.gef.requests.CreateConnectionRequest request) {
-		if (request instanceof org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest) {
-			org.eclipse.gmf.runtime.diagram.core.edithelpers.CreateElementRequestAdapter requestAdapter =
-					((org.eclipse.gmf.runtime.diagram.ui.requests.CreateConnectionViewAndElementRequest) request)
-							.getConnectionViewAndElementDescriptor().getCreateElementRequestAdapter();
-			return (org.eclipse.gmf.runtime.emf.type.core.IElementType) requestAdapter.getAdapter(
-					org.eclipse.gmf.runtime.emf.type.core.IElementType.class);
-		}
-		return null;
-	}
-
-	«EXPAND xpt::Common::generatedClassComment»
-	protected org.eclipse.gef.commands.Command getConnectionWithReorientedViewCompleteCommand(
-			org.eclipse.gef.requests.CreateConnectionRequest request) {
-		org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy c =
-				(org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy) super.getConnectionCompleteCommand(request);
-		org.eclipse.gmf.runtime.common.core.command.CompositeCommand cc =
-				(org.eclipse.gmf.runtime.common.core.command.CompositeCommand) c.getICommand();
-		org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain =
-				((org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) getHost()).getEditingDomain();
-		«getDiagram().getReorientConnectionViewCommandQualifiedClassName()» rcvCommand =
-				new «getDiagram().getReorientConnectionViewCommandQualifiedClassName()»(editingDomain, null);
-		rcvCommand.setEdgeAdaptor(getViewAdapter());
-		cc.compose(rcvCommand);
-		return c;
-	}
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNode»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt
deleted file mode 100644
index 2b72c24439b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/LinkItemSemanticEditPolicy.xpt
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Michael Golubev (Borland) - [243151] explicit source/target for links
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::editpolicies::LinkUtils»
-
-«DEFINE LinkItemSemanticEditPolicy FOR gmfgen::GenLink-»
-	«EXPAND xpt::Common::copyright FOR diagram.editorGen-»
-package «getDiagram().editPoliciesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «itemSemanticEditPolicyClassName» extends «diagram.getBaseItemSemanticEditPolicyQualifiedClassName()» {
-
-	«EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::defaultConstructor-»
-
-	«EXPAND classBody-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE» 
-
-«DEFINE classBody FOR gmfgen::GenLink-»
-	«EXPAND getDestroySemanticCommand(self) FOR modelFacet -»
-	«IF isTypeLink()»«EXPAND xpt::diagram::editpolicies::linkCommands::linkCommands»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getDestroySemanticCommand(gmfgen::GenLink genLink) FOR gmfgen::LinkModelFacet-»
-	«ERROR 'Unsupported model facet: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE getDestroySemanticCommand(gmfgen::GenLink genLink) FOR gmfgen::FeatureLinkModelFacet-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gef.commands.Command getDestroyReferenceCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyReferenceRequest req) {
-		return getGEFWrapper(«EXPAND impl::diagram::commands::DeleteLinkCommand::newDeleteReferenceLinkCommand(genLink, 'req')»);
-	}
-«ENDDEFINE»
-
-«DEFINE getDestroySemanticCommand(gmfgen::GenLink genLink) FOR gmfgen::TypeLinkModelFacet-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gef.commands.Command getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest req) {
-		return getGEFWrapper(«EXPAND impl::diagram::commands::DeleteLinkCommand::newDeleteLinkWithClassCommand(genLink, 'req')»);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenLink»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.qvto
deleted file mode 100644
index dfacbee2a99..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/LinkUtils.qvto
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Michael Golubev (Borland) - [243151] explicit source/target for links
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.GenModelUtils;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-
-library LinkUtils;
-
-helper gmfgen::GenLink::isTypeLink() : Boolean {
-	return not self.modelFacet.oclIsUndefined() and self.modelFacet.oclIsKindOf(gmfgen::TypeLinkModelFacet)
-}
-
-helper gmfgen::GenLink::isRefLink() : Boolean {
-	return not self.modelFacet.oclIsUndefined() and self.modelFacet.oclIsKindOf(gmfgen::FeatureLinkModelFacet)
-}
-
-helper canBeSource(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return link.sources->includes(linkEnd)
-}
-
-helper canBeTarget(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return link.targets->includes(linkEnd)
-}
-
-helper canBeContainer(link : gmfgen::GenLink, metaClass : genmodel::GenClass) : Boolean {
-	return null <> link.modelFacet and isCompatible(link.modelFacet.getContainerClass(), metaClass)
-}
--- MODIFIERS: private
-helper gmfgen::LinkModelFacet::getContainerClass() : genmodel::GenClass {
-	return null
-}
--- MODIFIERS: private
-helper gmfgen::TypeLinkModelFacet::getContainerClass() : genmodel::GenClass {
-	return self.childMetaFeature.genClass
-}
--- MODIFIERS: private
-helper gmfgen::FeatureLinkModelFacet::getContainerClass() : genmodel::GenClass {
-	return self.getSourceType()
-}
-
--- MODIFIERS: private
-helper isCompatible(desiredType : genmodel::GenClass, actualClass : genmodel::GenClass) : Boolean {
-	return null <> desiredType and desiredType.isSuperTypeOf(actualClass)
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt
deleted file mode 100644
index aa64a871a54..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/NodeItemSemanticEditPolicy.xpt
+++ /dev/null
@@ -1,143 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - [257632] do not rely on EditPart presence for element deletion
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
- 
-«REM»
-	This template should be called only for non-design nodes (modelFacet != null) 
-	because *ItemSemanticEditPolicy responsible for dealing with semantic model 
-	elements and meaningless (should not be generated) for pure design nodes.   
-«ENDREM»
- 
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::editpolicies::Utils»
-
-«DEFINE NodeItemSemanticEditPolicy FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «getDiagram().editPoliciesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «itemSemanticEditPolicyClassName» extends «getDiagram().getBaseItemSemanticEditPolicyQualifiedClassName()» {
-
-	«EXPAND xpt::diagram::editpolicies::BaseItemSemanticEditPolicy::defaultConstructor-»
-
-	«EXPAND xpt::diagram::editpolicies::childContainerCreateCommand::childContainerCreateCommand FOR childNodes->asSequence()-»
-
-	«EXPAND getDestroyElementCommand-»
-	«IF hasChildrenOrCompartments(self)-»
-		«EXPAND addDestroyChildNodesCommand-»
-	«ENDIF-»
-	«EXPAND xpt::diagram::editpolicies::linkCommands::linkCommands-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE getDestroyElementCommand FOR gmfgen::GenNode-»
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getDestroyElementCommand(org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest req) {
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) getHost().getModel();
-	org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand cmd = new org.eclipse.gmf.runtime.emf.commands.core.command.CompositeTransactionalCommand(getEditingDomain(), null);
-	cmd.setTransactionNestingEnabled(false);
-	«EXPAND destroyEdges('view')-»
-	org.eclipse.emf.ecore.EAnnotation annotation = view.getEAnnotation("Shortcut");«EXPAND xpt::Common::nonNLS»
-	if (annotation == null) {
-		// there are indirectly referenced children, need extra commands: «childNodes->union(compartments.childNodes->asBag())->exists(not isDirectlyOwned(self))»
-«IF hasChildrenOrCompartments(self)-»
-		addDestroyChildNodesCommand(cmd);
-«ENDIF-»
-		addDestroyShortcutsCommand(cmd, view);
-		// delete host element
-		cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(req));
-	} else {«REM»Here, we may play smart and don't generate else for non-toplevel nodes(which can't be shortcuts). Is it worth doing?«ENDREM»
-		cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), view));
-	}
-	return getGEFWrapper(cmd.reduce());
-}
-«ENDDEFINE»
-
-«DEFINE addDestroyChildNodesCommand FOR gmfgen::GenNode-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private void addDestroyChildNodesCommand(org.eclipse.gmf.runtime.common.core.command.ICompositeCommand cmd) {
-		org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) getHost().getModel();
-		for («EXPAND CodeStyle::G('java.util.Iterator', '?' /*FIXME Refactor once Notation model is Java5*/)» nit = view.getChildren().iterator(); nit.hasNext();) {
-			org.eclipse.gmf.runtime.notation.Node node = (org.eclipse.gmf.runtime.notation.Node) nit.next();
-			switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDiagram()»(node)) {
-			«EXPAND destroyChildNodes('node', self) FOREACH childNodes-»
-			«IF compartments->notEmpty()»«FOREACH compartments AS compartment-»
-			«EXPAND xpt::Common::caseVisualID FOR compartment»
-				for («EXPAND CodeStyle::G('java.util.Iterator', '?' /*FIXME Refactor once Notation model is Java5*/)» cit = node.getChildren().iterator(); cit.hasNext();) {
-					org.eclipse.gmf.runtime.notation.Node cnode = (org.eclipse.gmf.runtime.notation.Node) cit.next();
-					switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDiagram()»(cnode)) {
-					«EXPAND destroyChildNodes('cnode', self) FOREACH compartment.childNodes-»
-					}
-				}
-				break;
-			«ENDFOREACH»«ENDIF-»
-			}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE destroyChildNodes(nodeVar : String, gmfgen::GenNode genNode) FOR gmfgen::GenChildNode-»
-«EXPAND xpt::Common::caseVisualID»
-	«EXPAND destroyEdges(nodeVar)-»
-	cmd.add(new org.eclipse.gmf.runtime.emf.type.core.commands.DestroyElementCommand(new org.eclipse.gmf.runtime.emf.type.core.requests.DestroyElementRequest(getEditingDomain(), «nodeVar».getElement(), false))); // directlyOwned: «self.isDirectlyOwned(genNode)»
-	// don't need explicit deletion of «nodeVar» as parent's view deletion would clean child views as well 
-	// cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), «nodeVar»));
-	break;
-«ENDDEFINE»
-
-// @param view - Notation element for the passed node
-// assumes 'cmd' to point to composite command
-«DEFINE destroyEdges(String view) FOR gmfgen::GenNode-»
-«REM»
-	XXX: Though semantic editpolicy is supposed to create commands that operate with semantic elements only,
-	old code used to delegate child/link deletion to respective editparts, which in turn led to semantic commands
-	being combined with notational commands (BaseItemSemanticEditPolicy#addDeleteViewCommand()).
-	---
-	Use DiagramUpdater.get[Incoming|Outgoing]View instead, to clean links that are not present on a diagram
-	(but don't forget to clean corresponding Edge, if any)
-«ENDREM-»
-«IF genIncomingLinks->notEmpty()-»
-	for («EXPAND CodeStyle::G('java.util.Iterator', '?' /*FIXME Refactor once Notation model is Java5*/)» it = «view».getTargetEdges().iterator(); it.hasNext();) {
-		org.eclipse.gmf.runtime.notation.Edge incomingLink = (org.eclipse.gmf.runtime.notation.Edge) it.next();
-«FOREACH genIncomingLinks AS il-»
-		if («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDiagram()»(incomingLink) == «EXPAND xpt::editor::VisualIDRegistry::visualID FOR il») {
-			«EXPAND impl::diagram::commands::DeleteLinkCommand::newRequest('r', 'incomingLink') FOR il-»
-			cmd.add(«EXPAND impl::diagram::commands::DeleteLinkCommand::newInstance('r') FOR il»);
-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), incomingLink));
-			continue;
-		}
-«ENDFOREACH-»
-	}
-«ENDIF-»
-«IF genOutgoingLinks->notEmpty()-»
-	for («EXPAND CodeStyle::G('java.util.Iterator', '?' /*FIXME Refactor once Notation model is Java5*/)» it = «view».getSourceEdges().iterator(); it.hasNext();) {
-		org.eclipse.gmf.runtime.notation.Edge outgoingLink = (org.eclipse.gmf.runtime.notation.Edge) it.next();
-«FOREACH genOutgoingLinks AS ol-»
-		if («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR getDiagram()»(outgoingLink) == «EXPAND xpt::editor::VisualIDRegistry::visualID FOR ol») {
-			«EXPAND impl::diagram::commands::DeleteLinkCommand::newRequest('r', 'outgoingLink') FOR ol-»
-			cmd.add(«EXPAND impl::diagram::commands::DeleteLinkCommand::newInstance('r') FOR ol»);
-			cmd.add(new org.eclipse.gmf.runtime.diagram.core.commands.DeleteCommand(getEditingDomain(), outgoingLink));
-			continue;
-		}
-«ENDFOREACH-»
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNode»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt
deleted file mode 100644
index 399529fe786..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/OpenDiagram.xpt
+++ /dev/null
@@ -1,167 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::editpolicies::Utils»
-
-«DEFINE OpenDiagram FOR gmfgen::OpenDiagramBehaviour»
-«EXPAND xpt::Common::copyright FOR subject.getDiagram().editorGen-»
-package «subject.getDiagram().editPoliciesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPolicyClassName» extends «EXPAND extendsList» {
-
-«EXPAND getOpenCommand-»
-
-«EXPAND openCommandClass-»
-
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::OpenDiagramBehaviour»org.eclipse.gmf.runtime.diagram.ui.editpolicies.OpenEditPolicy«ENDDEFINE»
-
-«DEFINE getOpenCommand FOR gmfgen::OpenDiagramBehaviour»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gef.commands.Command getOpenCommand(org.eclipse.gef.Request request) {
-		org.eclipse.gef.EditPart targetEditPart = getTargetEditPart(request);
-		if (false == targetEditPart.getModel() instanceof org.eclipse.gmf.runtime.notation.View) {
-			return null;
-		}
-		org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) targetEditPart.getModel();
-		org.eclipse.gmf.runtime.notation.Style link = view.getStyle(org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getHintedDiagramLinkStyle());
-		if (false == link instanceof org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle) {
-			return null;
-		}
-		return new org.eclipse.gmf.runtime.diagram.ui.commands.ICommandProxy(new OpenDiagramCommand((org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle) link));
-	}
-«ENDDEFINE»
-
-«DEFINE openCommandClass FOR gmfgen::OpenDiagramBehaviour»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static class OpenDiagramCommand extends org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private final org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle diagramFacet;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		OpenDiagramCommand(org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle linkStyle) {
-			// editing domain is taken for original diagram, 
-			// if we open diagram from another file, we should use another editing domain
-			super(org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(linkStyle), «EXPAND xpt::Externalizer::accessorCall(i18nKeyForOpenCommandName()) FOR subject.getDiagram().editorGen», null);
-			diagramFacet = linkStyle;
-		}
-
-		// FIXME canExecute if  !(readOnly && getDiagramToOpen == null), i.e. open works on ro diagrams only when there's associated diagram already
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-			try {
-				org.eclipse.gmf.runtime.notation.Diagram diagram = getDiagramToOpen();
-				if (diagram == null) {
-					diagram = intializeNewDiagram();
-				}
-				«EXPAND xpt::navigator::getEditorInput::defineURIEditorInput('diagram', 'editorInput') FOR subject.getDiagram()-»
-				org.eclipse.ui.IWorkbenchPage page = org.eclipse.ui.PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-				page.openEditor(editorInput, getEditorID());
-				return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
-			} catch (Exception ex) {
-				throw new org.eclipse.core.commands.ExecutionException("Can't open diagram", ex);
-			}
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected org.eclipse.gmf.runtime.notation.Diagram getDiagramToOpen() {
-			return diagramFacet.getDiagramLink();
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected org.eclipse.gmf.runtime.notation.Diagram intializeNewDiagram() throws org.eclipse.core.commands.ExecutionException {
-			org.eclipse.gmf.runtime.notation.Diagram d = org.eclipse.gmf.runtime.diagram.core.services.ViewService.createDiagram(getDiagramDomainElement(), getDiagramKind(), getPreferencesHint());
-			if (d == null) {
-				throw new org.eclipse.core.commands.ExecutionException("Can't create diagram of '" + getDiagramKind() + "' kind");
-			}
-			diagramFacet.setDiagramLink(d);
-			«EXPAND xpt::Common::_assert('diagramFacet.eResource() != null')-»
-			diagramFacet.eResource().getContents().add(d);
-			org.eclipse.emf.ecore.EObject container = diagramFacet.eContainer();
-			while (container instanceof org.eclipse.gmf.runtime.notation.View) {
-				((org.eclipse.gmf.runtime.notation.View) container).persist();
-				container = container.eContainer();
-			}
-			try {
-			«IF null = subject.getDiagram().editorGen.application-»
-				new org.eclipse.ui.actions.WorkspaceModifyOperation() {
-					protected void execute(org.eclipse.core.runtime.IProgressMonitor monitor) throws org.eclipse.core.runtime.CoreException, java.lang.reflect.InvocationTargetException, InterruptedException {
-						try {
-			«ENDIF-»
-				for (java.util.Iterator it = diagramFacet.eResource().getResourceSet().getResources().iterator(); it.hasNext();) {
-					org.eclipse.emf.ecore.resource.Resource nextResource = (org.eclipse.emf.ecore.resource.Resource) it.next();
-					if (nextResource.isLoaded() && !getEditingDomain().isReadOnly(nextResource)) {
-						nextResource.save(«EXPAND xpt::Common::getSaveOptions FOR subject.getDiagram()»);
-					}
-				}
-			«IF null = subject.getDiagram().editorGen.application-»
-						} catch (java.io.IOException ex) {
-							throw new java.lang.reflect.InvocationTargetException(ex, "Save operation failed");
-						}		
-					}
-				}.run(null);
-			} catch (java.lang.reflect.InvocationTargetException e) {
-				throw new org.eclipse.core.commands.ExecutionException("Can't create diagram of '" + getDiagramKind() + "' kind", e);
-			} catch (InterruptedException e) {
-				throw new org.eclipse.core.commands.ExecutionException("Can't create diagram of '" + getDiagramKind() + "' kind", e);
-			}
-			«ELSE-»
-			} catch (java.io.IOException ex) {
-				throw new org.eclipse.core.commands.ExecutionException("Can't create diagram of '" + getDiagramKind() + "' kind", ex);
-			}
-			«ENDIF-»
-			return d;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected org.eclipse.emf.ecore.EObject getDiagramDomainElement() {
-			// use same element as associated with EP
-			return ((org.eclipse.gmf.runtime.notation.View) diagramFacet.eContainer()).getElement();
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint getPreferencesHint() {
-			// XXX prefhint from target diagram's editor?
-			return «EXPAND xpt::plugin::Activator::preferenceHintAccess FOR subject.getDiagram().editorGen»;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected String getDiagramKind() {
-			return «IF diagramKind = null»«EXPAND xpt::editor::VisualIDRegistry::modelID FOR subject.getDiagram()»«ELSE»"«diagramKind»"«ENDIF»;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected String getEditorID() {
-			return «IF editorID = null»«subject.getDiagram().editorGen.editor.getQualifiedClassName()».ID«ELSE»"«editorID»"«ENDIF»;
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::OpenDiagramBehaviour»«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForOpenCommandName())-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForOpenCommandName(), 'Open Diagram')-»
-«ENDDEFINE»
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
deleted file mode 100644
index 782e13fac9b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/TextFeedback.xpt
+++ /dev/null
@@ -1,283 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- * 	  Michael Golubev - template refactored according to common GMFT conventions 
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE TextSelectionEditPolicy FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editPoliciesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «textSelectionEditPolicyClassName» «EXPAND TextSelectionEditPolicy_extendsClause» «EXPAND TextSelectionEditPolicy_implementsClause» {
-
-	«EXPAND textFeedback FOR self-»
-	
-	«EXPAND TextSelectionEditPolicy_additions -»
-}
-«ENDDEFINE»
-
-«DEFINE TextSelectionEditPolicy_extendsClause FOR gmfgen::GenDiagram»extends org.eclipse.gef.editpolicies.SelectionEditPolicy«ENDDEFINE»
-«DEFINE TextSelectionEditPolicy_implementsClause FOR gmfgen::GenDiagram»implements org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy«ENDDEFINE»
-
-«DEFINE TextSelectionEditPolicy_additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE TextNonResizableEditPolicy FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editPoliciesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «textNonResizableEditPolicyClassName» «EXPAND TextNonResizableEditPolicy_extendsClause» «EXPAND TextNonResizableEditPolicy_implementsClause» {
-
-	«EXPAND textFeedback FOR self-»
-	
-	«EXPAND TextNonResizableEditPolicy_createSelectionHandles-»
-	
-	«EXPAND TextNonResizableEditPolicy_additions-»
-}
-«ENDDEFINE»
-
-«DEFINE TextNonResizableEditPolicy_extendsClause FOR gmfgen::GenDiagram»extends org.eclipse.gmf.runtime.diagram.ui.editpolicies.NonResizableEditPolicyEx«ENDDEFINE»
-«DEFINE TextNonResizableEditPolicy_implementsClause FOR gmfgen::GenDiagram»implements org.eclipse.gmf.tooling.runtime.edit.policies.labels.IRefreshableFeedbackEditPolicy«ENDDEFINE»
-
-«DEFINE TextNonResizableEditPolicy_createSelectionHandles FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected java.util.List createSelectionHandles() {
-		org.eclipse.gef.handles.MoveHandle moveHandle =
-			new org.eclipse.gef.handles.MoveHandle((org.eclipse.gef.GraphicalEditPart) getHost());
-		moveHandle.setBorder(null);
-		moveHandle.setDragTracker(new org.eclipse.gmf.runtime.diagram.ui.tools.DragEditPartsTrackerEx(getHost()));
-		return java.util.Collections.singletonList(moveHandle);
-	}
-«ENDDEFINE»
-
-«DEFINE TextNonResizableEditPolicy_additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE textFeedback_fields FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.draw2d.IFigure selectionFeedbackFigure;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.draw2d.IFigure focusFeedbackFigure;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.draw2d.FigureListener hostPositionListener;
-«ENDDEFINE»
-
-«DEFINE textFeedback FOR gmfgen::GenDiagram»
-
-	«EXPAND textFeedback_fields-» 
-	
-	«EXPAND textFeedback_showPrimarySelection-»
-	
-	«EXPAND textFeedback_showSelection-»
-	
-	«EXPAND textFeedback_hideSelection-»
-	
-	«EXPAND textFeedback_showFocus-»
-	
-	«EXPAND textFeedback_hideFocus-»
-	
-	«EXPAND textFeedback_getFeedbackBounds-»
-	
-	«EXPAND textFeedback_createSelectionFeedbackFigure-»
-
-	«EXPAND textFeedback_createFocusFeedbackFigure-»
-
-	«EXPAND textFeedback_updateLabel-»
-
-	«EXPAND textFeedback_refreshSelectionFeedback-»
-	
-	«EXPAND textFeedback_refreshFocusFeedback-»
-	
-	«EXPAND textFeedback_refreshFeedback-»
-	
-	«EXPAND textFeedback_getHostPositionListener-»
-
-«ENDDEFINE»
-
-«DEFINE textFeedback_showPrimarySelection FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void showPrimarySelection() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setSelected(true);
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			showSelection();
-			showFocus();
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_showSelection FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void showSelection() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setSelected(true);
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			hideSelection();
-			addFeedback(selectionFeedbackFigure = createSelectionFeedbackFigure());
-			getHostFigure().addFigureListener(getHostPositionListener());
-			refreshSelectionFeedback();
-			hideFocus();
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_hideSelection FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void hideSelection() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setSelected(false);
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (selectionFeedbackFigure != null) {
-				removeFeedback(selectionFeedbackFigure);
-				getHostFigure().removeFigureListener(getHostPositionListener());
-				selectionFeedbackFigure = null;
-			}
-			hideFocus();
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_showFocus FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void showFocus() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(true);
-		} else {
-			hideFocus();
-			addFeedback(focusFeedbackFigure = createFocusFeedbackFigure());
-			refreshFocusFeedback();
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_hideFocus FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void hideFocus() {
-		if (getHostFigure() instanceof org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) {
-			((org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel) getHostFigure()).setFocus(false);
-		} else {
-			if (focusFeedbackFigure != null) {
-				removeFeedback(focusFeedbackFigure);
-				focusFeedbackFigure = null;
-		}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_getFeedbackBounds FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.geometry.Rectangle getFeedbackBounds() {
-		org.eclipse.draw2d.geometry.Rectangle bounds;
-		if (getHostFigure() instanceof org.eclipse.draw2d.Label) {
-			bounds = ((org.eclipse.draw2d.Label) getHostFigure()).getTextBounds();
-			bounds.intersect(getHostFigure().getBounds());
-		} else {
-			bounds = getHostFigure().getBounds().getCopy();
-		}
-		getHostFigure().getParent().translateToAbsolute(bounds);
-		getFeedbackLayer().translateToRelative(bounds);
-		return bounds;
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_createSelectionFeedbackFigure FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure createSelectionFeedbackFigure() {
-		if (getHostFigure() instanceof org.eclipse.draw2d.Label) {
-			org.eclipse.draw2d.Label feedbackFigure = new org.eclipse.draw2d.Label();
-			feedbackFigure.setOpaque(true);
-			feedbackFigure.setBackgroundColor(org.eclipse.draw2d.ColorConstants.menuBackgroundSelected);
-			feedbackFigure.setForegroundColor(org.eclipse.draw2d.ColorConstants.menuForegroundSelected);
-			return feedbackFigure;
-		} else {
-			org.eclipse.draw2d.RectangleFigure feedbackFigure = new org.eclipse.draw2d.RectangleFigure();
-			feedbackFigure.setFill(false);
-			return feedbackFigure;
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_createFocusFeedbackFigure FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.draw2d.IFigure createFocusFeedbackFigure() {
-		return new org.eclipse.draw2d.Figure() {
-
-			protected void paintFigure(org.eclipse.draw2d.Graphics graphics) {
-				graphics.drawFocus(getBounds().getResized(-1, -1));
-			}
-		};
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_updateLabel FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void updateLabel(org.eclipse.draw2d.Label target) {
-		org.eclipse.draw2d.Label source = (org.eclipse.draw2d.Label) getHostFigure();
-		target.setText(source.getText());
-		target.setTextAlignment(source.getTextAlignment());
-		target.setFont(source.getFont());
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_refreshSelectionFeedback FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void refreshSelectionFeedback() {
-		if (selectionFeedbackFigure != null) {
-			if (selectionFeedbackFigure instanceof org.eclipse.draw2d.Label) {
-				updateLabel((org.eclipse.draw2d.Label) selectionFeedbackFigure);
-				selectionFeedbackFigure.setBounds(getFeedbackBounds());
-			} else {
-				selectionFeedbackFigure.setBounds(getFeedbackBounds().expand(5, 5));
-			}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_refreshFocusFeedback FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void refreshFocusFeedback() {
-		if (focusFeedbackFigure != null) {
-			focusFeedbackFigure.setBounds(getFeedbackBounds());
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_refreshFeedback FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::overrideI-»
-	public void refreshFeedback() {
-		refreshSelectionFeedback();
-		refreshFocusFeedback();
-	}
-«ENDDEFINE»
-
-«DEFINE textFeedback_getHostPositionListener FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.draw2d.FigureListener getHostPositionListener() {
-		if (hostPositionListener == null) {
-			hostPositionListener = new org.eclipse.draw2d.FigureListener() {
-				public void figureMoved(org.eclipse.draw2d.IFigure source) {
-					refreshFeedback();
-				}
-			};
-		}
-		return hostPositionListener;
-	}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.qvto
deleted file mode 100644
index c0862fe2f21..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/Utils.qvto
+++ /dev/null
@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Michael Golubev (Borland) - [243151] explicit source/target for links
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.diagram.editpolicies.LinkUtils;
-import xpt.GenModelUtils;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library Utils;
-
-helper hasChildrenOrCompartments(node : gmfgen::GenNode) : Boolean {
-	return not node.childNodes->isEmpty() or not node.compartments->isEmpty()
-}
-
-helper getContainerVariable(modelFacet : gmfgen::TypeLinkModelFacet) : String {
-	return (if null <> modelFacet.sourceMetaFeature then 'container' else 'source' endif)
-}
-
-helper getValidLinkConstraints(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLinkConstraints) {
-	return diagram.links->select(l | null <> l.creationConstraints and l.creationConstraints.isValid())->collect(l | l.creationConstraints)
-}
-
-helper getAllPotentialLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
-	return getAllRelatedLinks(linkEnd)->select(link | isCreationAllowed(link))
-}
-
-helper getReroutableTypeLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
-	return getAllRelatedReroutableLinks(linkEnd)->select(isTypeLink())
-}
-
-helper getReroutableRefLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
-	return getAllRelatedReroutableLinks(linkEnd)->select(isRefLink())
-}
-
---XXX[MG]: again, it would be better to use linkEnd.incomingLinks.union(linkEnd.outgoingLinks).toList() 
---but it will change the ordering and produce meaningless diff in the generated code
--- MODIFIERS: private cached 
-helper getAllRelatedLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
-	return linkEnd.getDiagram().links->select(link | canBeSource(link, linkEnd) or canBeTarget(link, linkEnd))->asSequence()
-}
-
--- MODIFIERS: private cached 
-helper getAllRelatedReroutableLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
-	return linkEnd.getDiagram().links->select(link | canBeSource(link, linkEnd) and link.sourceReorientingAllowed or (canBeTarget(link, linkEnd) and link.targetReorientingAllowed))->asSequence()
-}
-
--- MODIFIERS: private
-helper isCreationAllowed(link : gmfgen::GenLink) : Boolean {
-	return null <> link.modelFacet and (link.outgoingCreationAllowed or link.incomingCreationAllowed)
-}
-
-helper createStartLinkCommand(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return createStartOutgoingLinkCommand(link, linkEnd) or createStartIncomingLinkCommand(link, linkEnd)
-}
-
-helper createStartOutgoingLinkCommand(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return isSelf(link, linkEnd) or (isOutgoing(link, linkEnd) and link.outgoingCreationAllowed)
-}
-
-helper createStartIncomingLinkCommand(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return isIncoming(link, linkEnd) and link.incomingCreationAllowed
-}
-
-helper createCompleteLinkCommand(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return createCompleteIncomingLinkCommand(link, linkEnd) or createCompleteOutgoingLinkCommand(link, linkEnd)
-}
-
-helper createCompleteIncomingLinkCommand(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return isSelf(link, linkEnd) or (isIncoming(link, linkEnd) and link.outgoingCreationAllowed)
-}
-
-helper createCompleteOutgoingLinkCommand(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return isOutgoing(link, linkEnd) and link.incomingCreationAllowed
-}
-
-helper checkSource(reversedRequest : Boolean, isCompleteCommand : Boolean) : Boolean {
-	return not reversedRequest or isCompleteCommand
-}
-
-helper checkTarget(reversedRequest : Boolean, isCompleteCommand : Boolean) : Boolean {
-	return reversedRequest or isCompleteCommand
-}
-
--- MODIFIERS: private
-helper isSelf(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return canBeSource(link, linkEnd) and canBeTarget(link, linkEnd)
-}
-
--- MODIFIERS: private
-helper isOutgoing(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return canBeSource(link, linkEnd) and not canBeTarget(link, linkEnd)
-}
-
--- MODIFIERS: private
-helper isIncoming(link : gmfgen::GenLink, linkEnd : gmfgen::GenLinkEnd) : Boolean {
-	return canBeTarget(link, linkEnd) and not canBeSource(link, linkEnd)
-}
-
-helper i18nKeyForOpenCommandName() : String {
-	return 'CommandName.OpenDiagram'
-}
--- if child's containment feature comes from the node, assume deletion of the parent would delete the child.
-helper GenChildNode::isDirectlyOwned(genNode : GenNode) : Boolean {
-	if self.modelFacet.oclIsUndefined() or genNode.modelFacet.oclIsUndefined() then return false endif; -- can't assume anything
-	return self.modelFacet.containmentMetaFeature.genClass.isSuperTypeOf(genNode.modelFacet.metaClass)
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/VisualEffectEditPolicy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/VisualEffectEditPolicy.xpt
deleted file mode 100644
index ddb7e7ee00a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/VisualEffectEditPolicy.xpt
+++ /dev/null
@@ -1,237 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2012, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- * 	  Michael Golubev - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-
-«EXTENSION xpt::expressions::OclTracker»
-«EXTENSION xpt::GenModelUtils»
-
-«DEFINE VisualEffectEditPolicy FOR gmfgen::GenVisualEffect-»
-«EXPAND xpt::Common::copyright FOR subject.getDiagram().editorGen-»
-«EXPAND xpt::Common::packageStatement FOR getEditPolicyQualifiedClassName()»
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND xpt::Common::disqualifiedClassName FOR getEditPolicyQualifiedClassName()»«EXPAND extendsList» {
-
-	«EXPAND fields-»
-	
-	«EXPAND _constructor-»
-
-	«EXPAND methods-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenVisualEffect-»
-	extends org.eclipse.gmf.tooling.runtime.edit.policies.effect.AbstractOclVisualEffectEditPolicy
-«ENDDEFINE» 
-
-«DEFINE fields FOR gmfgen::GenVisualEffect-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static final String KEY = "«getEditPolicyQualifiedClassName()»:KEY";
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenVisualEffect-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «EXPAND xpt::Common::disqualifiedClassName FOR getEditPolicyQualifiedClassName()»() {
-	«IF isForcedImpactAnalyzerKind(oclExpression)-»
-		super(org.eclipse.gmf.tooling.runtime.ocl.tracker.OclTrackerFactory.Type.IMPACT_ANALYZER);
-	«ELSE-»
-		super();
-	«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE methods FOR gmfgen::GenVisualEffect-»
-	«EXPAND setVisualEffectValue-»
-	
-	«EXPAND getHostImpl-»
-	
-	«EXPAND getExpressionBody-»
-	
-	«EXPAND getContext-»	
-«ENDDEFINE»
-
-«DEFINE setVisualEffectValue FOR gmfgen::GenVisualEffect-»
-	«EXPAND xpt::Common::generatedMemberComment»
-
-	«EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
-	protected void setVisualEffectValue(Object value) {
-		«IF pinKind = 'ColorPin'-»  
-			«EXPAND setVisualEffectValueOnColorPin-»
-		«ELSEIF pinKind = 'VisiblePin'-»
-			«EXPAND setVisualEffectValueOnCustomPin-»
-		«ELSEIF pinKind = 'CustomPin'-»
-			«EXPAND setVisualEffectValueOnCustomPin-»
-		«ELSE-»
-			«ERROR 'Unsupported Pin kind: ' + pinKind»
-		«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE getHostImpl FOR gmfgen::GenVisualEffect-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
-	protected «subject.getEditPartQualifiedClassName()» getHostImpl() {
-		return («subject.getEditPartQualifiedClassName()») super.getHostImpl();
-	}
-«ENDDEFINE»
-
-«DEFINE getExpressionBody FOR gmfgen::GenVisualEffect-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
-	protected String getExpressionBody() {	
-			return 
-	«IF subject.oclIsKindOf(gmfgen::GenLink)-»
-		«EXPAND expressionLinkEnds FOR subject.oclAsType(gmfgen::GenLink).modelFacet-»
-	«ENDIF-»   
-		       «getOclExpressionString()»; «EXPAND xpt::Common::nonNLS»
-	}
-«ENDDEFINE»
-
-«DEFINE expressionLinkEnds FOR gmfgen::LinkModelFacet»«ENDDEFINE»
-
-«DEFINE expressionLinkEnds FOR gmfgen::FeatureLinkModelFacet-»
-	«IF metaFeature.ecoreFeature.upperBound = 1-»
-		«EXPAND expressionLinkEnds('', '.'+metaFeature.ecoreFeature.name)-»
-	«ELSE-»	
-		«LET getReverse(metaFeature) AS reverseMetaFeature-»
-			«IF reverseMetaFeature <> null-»
-				«EXPAND expressionLinkEnds('.'+reverseMetaFeature.ecoreFeature.name, '')-»				
-			«ELSEIF metaFeature.ecoreFeature.oclAsType(ecore::EReference).containment-»
-				«EXPAND expressionLinkEnds('.oclAsType(ecore::EObject).eContainer().oclAsType('+getSourceType().ecoreClass.name+')', '')-»
-			«ELSE-»
-				/* unable to set up both link ends */			
-			«ENDIF-»
-		«ENDLET-»
-	«ENDIF-»	
-«ENDDEFINE»
-
-«DEFINE expressionLinkEnds FOR gmfgen::TypeLinkModelFacet-»
-	«EXPAND expressionLinkEnds('.'+sourceMetaFeature.ecoreFeature.name, '.'+targetMetaFeature.ecoreFeature.name)-»
-«ENDDEFINE»
-
-«DEFINE expressionLinkEnds(sourcePath : String, targetPath : String) FOR gmfgen::LinkModelFacet-»
-		" let _src : «getSourceType().ecoreClass.name» = self«sourcePath» in " //
-				+ " let _dst : «getTargetType().ecoreClass.name» = self«targetPath» in " //
-				+
-«ENDDEFINE»
-
-«DEFINE callOperation FOR gmfgen::GenVisualEffect-»
-getHostImpl().getPrimaryShape().«operationName-»
-«ENDDEFINE»
-
-«DEFINE setVisualEffectValueOnColorPin FOR gmfgen::GenVisualEffect-»
-	«LET getOperationRuntimeType().oclAsType(ocl::ecore::TupleType) AS tupleType-»
-		«EXPAND defineTupleParts FOR tupleType-»
-		org.eclipse.swt.graphics.Color color = new org.eclipse.swt.graphics.Color(null, «EXPAND enumerateTupleParts FOR tupleType»);			
-		«EXPAND callOperation»(color);
-	«ENDLET-»	
-«ENDDEFINE»
-
-«DEFINE setVisualEffectValueOnCustomPin FOR gmfgen::GenVisualEffect-»
-	«EXPAND setVisualEffectValueOfType(self) FOR getOperationRuntimeType()»
-«ENDDEFINE»
-
-«DEFINE setVisualEffectValueOfType(visualEffect : gmfgen::GenVisualEffect) FOR ecore::EClassifier-»
-	«ERROR 'Asbtract template call setVisualEffectValueOfType for ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE setVisualEffectValueOfType(visualEffect : gmfgen::GenVisualEffect) FOR ocl::ecore::PrimitiveType-»
-	«EXPAND callOperation FOR visualEffect»((«instanceTypeName»)value);
-«ENDDEFINE»
-
-«DEFINE setVisualEffectValueOfType(visualEffect : gmfgen::GenVisualEffect) FOR ocl::ecore::TupleType-»
-	«EXPAND defineTupleParts»
-	«EXPAND callOperation FOR visualEffect-»
-	(«-»
-		«EXPAND enumerateTupleParts-»
-	);	
-«ENDDEFINE»
-
-«DEFINE defineTupleParts FOR ocl::ecore::TupleType-»
-	org.eclipse.ocl.util.Tuple<?, ?> tupleValue = (org.eclipse.ocl.util.Tuple<?, ?>) value;
-	«FOREACH eAllAttributes AS attribute -»
-		«attribute.eType.instanceTypeName» «attribute.name» = («attribute.eType.instanceTypeName»)tupleValue.getValue("«attribute.name»");
-	«ENDFOREACH-»
-«ENDDEFINE»
-
-«DEFINE enumerateTupleParts FOR ocl::ecore::TupleType-»
-	«FOREACH eAllAttributes AS attribute SEPARATOR ','-»
-		«attribute.name-»
-	«ENDFOREACH-»
-«ENDDEFINE»
-
-«DEFINE getContext FOR gmfgen::GenVisualEffect-»
-	«IF subject.oclIsKindOf(gmfgen::GenLink)-»
-		«EXPAND getContext FOR subject.oclAsType(gmfgen::GenLink).modelFacet-»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getContext FOR gmfgen::LinkModelFacet»«ENDDEFINE»
-
-«DEFINE getContext FOR gmfgen::FeatureLinkModelFacet-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override FOR self.oclAsType(ecore::EObject).eContainer().oclAsType(gmfgen::GenCommonBase)»
-	protected org.eclipse.emf.ecore.EObject getContext() {
-	«IF metaFeature.ecoreFeature.upperBound = 1-»
-		«EXPAND getContextBody('source', 'target', getSourceType(), getTargetType(), metaFeature)-»
-	«ELSE-»	
-		«LET getReverse(metaFeature) AS reverseMetaFeature-»
-			«IF reverseMetaFeature <> null or metaFeature.ecoreFeature.oclAsType(ecore::EReference).containment-»
-				«EXPAND getContextBody('target', 'source', getTargetType(), getSourceType(), reverseMetaFeature)-»
-			«ELSE-»
-				// unable to pass both link ends 
-				return null;			
-			«ENDIF-»
-		«ENDLET-»
-	«ENDIF-»	
-	}
-«ENDDEFINE»
-
-
-«DEFINE getContextBody(selfName : String, 
-					   oppositeName : String,
-					   selfType : genmodel::GenClass,
-					   oppositeType : genmodel::GenClass,
-					   selfFeature : genmodel::GenFeature) FOR gmfgen::FeatureLinkModelFacet-»
-		org.eclipse.gmf.runtime.notation.Edge hostModel = (org.eclipse.gmf.runtime.notation.Edge) host().getModel();
-		org.eclipse.gmf.runtime.notation.View targetModel = hostModel.getTarget();
-		org.eclipse.gmf.runtime.notation.View sourceModel = hostModel.getSource();
-
-		if (targetModel == null || sourceModel == null) { 
-			return null;
-		}
-
-		org.eclipse.emf.ecore.EObject «selfName»SemanticModel = org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.resolveSemanticElement(«selfName»Model);
-		// need to check actual opposite of the semantic element, since diagram opposite could be not up to date
-		«REM»(selfFeature = null) if link is multiplicity containment without opposite«ENDREM-»
-		«IF selfFeature <> null-»		 
-			«EXPAND MetaModel::QualifiedClassName FOR selfType» «selfName»TypedModel = «EXPAND MetaModel::CastEObject(selfName + 'SemanticModel') FOR selfType»;
-		«ENDIF-»
-		org.eclipse.emf.ecore.EObject «oppositeName»SemanticModel =
-			«IF selfFeature <> null-»
-				«EXPAND MetaModel::getFeatureValue(selfName + 'TypedModel', oppositeType) FOR selfFeature»
-			«ELSE-»
-				«selfName»SemanticModel.eContainer()
-			«ENDIF-»
-		;				
-
-		if («oppositeName»SemanticModel == null) {
-			return null;
-		}
-
-		return «selfName»SemanticModel; 
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt
deleted file mode 100644
index dd3910d205b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/childContainerCreateCommand.xpt
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
- 
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE childContainerCreateCommand FOR Sequence(gmfgen::GenNode)-»
-«IF not self->isEmpty()-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.gef.commands.Command getCreateCommand(org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest req) {
-«FOREACH self AS n-»
-		«EXPAND childNodeCreateCommand(n) FOR n.modelFacet-»
-«ENDFOREACH-»
-		return super.getCreateCommand(req);
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE childNodeCreateCommand(node : gmfgen::GenNode) FOR gmfgen::TypeModelFacet-»
-if («EXPAND xpt::providers::ElementTypes::accessElementType FOR node» == req.getElementType()) {
-	return getGEFWrapper(new «node.getCreateCommandQualifiedClassName()»(req));
-}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt
deleted file mode 100644
index 6733eb56f93..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/editpolicies/linkCommands.xpt
+++ /dev/null
@@ -1,145 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Dmitry Stadnik (Borland) - creation logic was moved in commands
- *    Michael Golubev (Borland) - [243151] explicit source/target for links
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::editpolicies::Utils»
-
-«REM»
- * Start  		start of link creation. 
- *				User click to this editpart and start dragging with link tool.
- * Complete 	end of the command
- *				User points to this editpart as a link target and release mouse button.
- *
- * Outgoing 	the node is link source
- *				This element could be a source for this type of link.
- * Incoming		the node is link destination
- *				This element could be a target for this type of link.
- *
- * Parameters:
- *
- * 	diagram 	GenDiagram used to collect all defined links
- *
- *	this		Instance of GenLinkEnd for the element link could be creates to/from.
- *				This could be GenNode or GenLink in case of links to links, 
- *              in the latter case it is assumed that its a TypeLink (so its model facet is LinkTypeModelFacet), 
- *              because RefLinks don't have underlying semantic identity   
- *
-«ENDREM»
-
-«DEFINE linkCommands FOR gmfgen::GenLinkEnd-»
-	«IF getAllPotentialLinks(self)->size() > 0-»
-		«EXPAND createLinkCommands -»
-	«ENDIF-»
-	«IF getReroutableTypeLinks(self)->size() > 0-»
-		«EXPAND reorientTypeLinkCommands -»
-	«ENDIF-»
-	«IF getReroutableRefLinks(self)->size() > 0-»
-		«EXPAND reorientRefLinkCommands -»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE createLinkCommands FOR gmfgen::GenLinkEnd-»
-
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getCreateRelationshipCommand(
-		org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest req) {
-	org.eclipse.gef.commands.Command command = req.getTarget() == null ?
-			getStartCreateRelationshipCommand(req) : getCompleteCreateRelationshipCommand(req);
-	return command != null ? command : super.getCreateRelationshipCommand(req);
-}
-
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getStartCreateRelationshipCommand(
-		org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest req) {
-	«EXPAND startLinkCommands(self) FOREACH getAllPotentialLinks(self)-»
-	return null;
-}
-
-«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.commands.Command getCompleteCreateRelationshipCommand(
-		org.eclipse.gmf.runtime.emf.type.core.requests.CreateRelationshipRequest req) {
-	«EXPAND completeLinkCommands(self) FOREACH getAllPotentialLinks(self)-»
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE startLinkCommands(linkEnd : gmfgen::GenLinkEnd) FOR gmfgen::GenLink-»
-if («EXPAND xpt::providers::ElementTypes::accessElementType» == req.getElementType()) {
-	«IF createStartLinkCommand(self, linkEnd)-»
-	return getGEFWrapper(new «getCreateCommandQualifiedClassName()»(req,
-		«IF createStartIncomingLinkCommand(self, linkEnd)-»
-			req.getTarget(), req.getSource()
-		«ELSE-»
-			req.getSource(), req.getTarget()
-		«ENDIF-»
-	));
-	«ELSE-»
-	return null;
-	«ENDIF-»
-}
-«ENDDEFINE»
-
-«DEFINE completeLinkCommands(linkEnd : gmfgen::GenLinkEnd) FOR gmfgen::GenLink-»
-if («EXPAND xpt::providers::ElementTypes::accessElementType» == req.getElementType()) {
-	«IF createCompleteLinkCommand(self, linkEnd)-»
-	return getGEFWrapper(new «getCreateCommandQualifiedClassName()»(req,
-		«IF createCompleteOutgoingLinkCommand(self, linkEnd)-»
-			req.getTarget(), req.getSource()
-		«ELSE-»
-			req.getSource(), req.getTarget()
-		«ENDIF-»
-	));
-	«ELSE-»
-	return null;
-	«ENDIF-»
-}
-«ENDDEFINE»
-
-«DEFINE reorientTypeLinkCommands FOR gmfgen::GenLinkEnd-»
-
-«EXPAND xpt::Common::generatedMemberComment(
-	'Returns command to reorient EClass based link. New link target or source\n' + 
-	'should be the domain model element associated with this node.\n'
-)»
-protected org.eclipse.gef.commands.Command getReorientRelationshipCommand(
-		org.eclipse.gmf.runtime.emf.type.core.requests.ReorientRelationshipRequest req) {
-	switch (getVisualID(req)) {
-	«EXPAND reorientLinkCommand FOREACH getReroutableTypeLinks(self)-»
-	}
-	return super.getReorientRelationshipCommand(req);
-}
-«ENDDEFINE»
-
-«DEFINE reorientRefLinkCommands FOR gmfgen::GenLinkEnd-»
-
-«EXPAND xpt::Common::generatedMemberComment(
-	'Returns command to reorient EReference based link. New link target or source\n' + 
-	'should be the domain model element associated with this node.\n'
-)»
-protected org.eclipse.gef.commands.Command getReorientReferenceRelationshipCommand(
-		org.eclipse.gmf.runtime.emf.type.core.requests.ReorientReferenceRelationshipRequest req) {
-	switch (getVisualID(req)) {
-	«EXPAND reorientLinkCommand FOREACH getReroutableRefLinks(self)-»
-	}
-	return super.getReorientReferenceRelationshipCommand(req);
-}
-«ENDDEFINE»
-
-«DEFINE reorientLinkCommand FOR gmfgen::GenLink-»
-«EXPAND xpt::Common::caseVisualID»
-	return getGEFWrapper(new «getReorientCommandQualifiedClassName()»(req));
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
deleted file mode 100644
index e0237de5964..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/preferences/PreferenceInitializer.xpt
+++ /dev/null
@@ -1,114 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::Utils»
-
-«DEFINE className FOR gmfgen::GenDiagram»DiagramPreferenceInitializer«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«preferencesPackageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE PreferenceInitializer FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «preferencesPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND className» extends org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void initializeDefaultPreferences() {
-		org.eclipse.jface.preference.IPreferenceStore store = getPreferenceStore();
-«IF preferences = null-»
-		«EXPAND initDefaults('store') FOREACH allPreferencePages(self)»
-«ELSE»«REM»default values for predefined pages will be set manually«ENDREM-»
-		«EXPAND initDefaults('store') FOREACH (allPreferencePages(self))[gmfgen::GenCustomPreferencePage]»
-		«EXPAND initDefaults('store') FOR preferences-»
-«ENDIF-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.jface.preference.IPreferenceStore getPreferenceStore() {
-		return «editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getPreferenceStore();
-	}
-} 
-«ENDDEFINE»
-
-«DEFINE initDefaults(storeVar : String) FOR gmfgen::GenPreferencePage»«ERROR 'Abstract define for ' + self.repr()»«ENDDEFINE»
-
-«DEFINE initDefaults(storeVar : String) FOR gmfgen::GenStandardPreferencePage-»
-«EXPAND impl::preferences::StandardPage::call_initDefaults(storeVar)»
-«ENDDEFINE»
-
-«DEFINE initDefaults(storeVar : String) FOR gmfgen::GenCustomPreferencePage-»
-«EXPAND impl::preferences::CustomPage::call_initDefaults(storeVar)»
-«ENDDEFINE»
-
-«DEFINE initDefaults(storeVar : String) FOR gmfgen::GenDiagramPreferences»
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_SHOW_CONNECTION_HANDLES, «showConnectionHandles»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_SHOW_POPUP_BARS, «showPopupBars»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_ENABLE_ANIMATED_LAYOUT, «enableAnimatedLayout»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_ENABLE_ANIMATED_ZOOM, «enableAnimatedZoom»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_ENABLE_ANTIALIAS, «enableAntiAlias»);
-	«EXPAND initDefaultFont(storeVar, 'PREF_DEFAULT_FONT') FOR defaultFont-»
-	«EXPAND initDefaultColor(storeVar, 'PREF_FONT_COLOR') FOR fontColor-»
-	«EXPAND initDefaultColor(storeVar, 'PREF_FILL_COLOR') FOR fillColor-»
-	«EXPAND initDefaultColor(storeVar, 'PREF_LINE_COLOR') FOR lineColor-»
-	«EXPAND initDefaultColor(storeVar, 'PREF_NOTE_FILL_COLOR') FOR noteFillColor-»
-	«EXPAND initDefaultColor(storeVar, 'PREF_NOTE_LINE_COLOR') FOR noteLineColor-»
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE, org.eclipse.gmf.runtime.notation.Routing.«lineStyle»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_SHOW_RULERS, «showRulers»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_RULER_UNITS, org.eclipse.gef.rulers.RulerProvider.UNIT_«rulerUnits»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_SHOW_GRID, «showGrid»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_SNAP_TO_GRID, «snapToGrid»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_SNAP_TO_GEOMETRY, «snapToGeometry»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_GRID_SPACING, «gridSpacing»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_MODEL, «promptOnDelFromModel»);
-	«storeVar».setDefault(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_PROMPT_ON_DEL_FROM_DIAGRAM, «promptOnDelFromDiagram»);
-«ENDDEFINE»
-
-«DEFINE initDefaultColor(storeVar : String, prefName : String) FOR gmfgen::GenColor»
-	org.eclipse.jface.preference.PreferenceConverter.setDefault(«storeVar»,
-		org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.«prefName», «EXPAND rgb»);
-«ENDDEFINE»
-
-«DEFINE initDefaultFont(storeVar : String, prefName : String) FOR gmfgen::GenFont»
-	org.eclipse.jface.preference.PreferenceConverter.setDefault(«storeVar»,
-		org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.«prefName», «EXPAND fontData»);
-«ENDDEFINE»
-
-«DEFINE rgb FOR gmfgen::GenColor»
-	«ERROR 'Unknown colour: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE rgb FOR gmfgen::GenConstantColor»
-	org.eclipse.gmf.runtime.diagram.ui.figures.DiagramColorConstants.«name».getRGB()
-«ENDDEFINE»
-
-«DEFINE rgb FOR gmfgen::GenRGBColor»
-	new org.eclipse.swt.graphics.RGB(«red», «green», «blue»)
-«ENDDEFINE»
-
-«DEFINE fontData FOR gmfgen::GenFont»
-	«ERROR 'Unknown font: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE fontData FOR gmfgen::GenCustomFont»
-	new org.eclipse.swt.graphics.FontData("«name»", «height», org.eclipse.swt.SWT.«style»)
-«ENDDEFINE»
-
-«DEFINE fontData FOR gmfgen::GenStandardFont»
-	org.eclipse.jface.resource.JFaceResources.get«name»Font().getFontData()
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt
deleted file mode 100644
index 176a47c9435..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/preferences/extensions.xpt
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::Utils»
-
-«DEFINE extensions FOR gmfgen::GenDiagram-»
-
-   <extension point="org.eclipse.core.runtime.preferences" id="prefs">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <initializer class="«EXPAND xpt::diagram::preferences::PreferenceInitializer::qualifiedClassName»"/>
-   </extension>
-
-«IF preferencePages->size() > 0-»
-   <extension point="org.eclipse.ui.preferencePages" id="prefpages">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-«EXPAND preferencePage FOREACH allPreferencePages(self)-»
-   </extension>
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE preferencePage FOR gmfgen::GenPreferencePage-»
-      <page
-            id="«iD»"
-            name="%prefpage.«iD»"
-«IF null <> parent-»
-            category="«parent.iD»"
-«ELSEIF parentCategory <> null and parentCategory.size() > 0-»
-            category="«parentCategory»"
-«ENDIF-»
-            class="«getQualifiedClassName()»">
-      </page>
-«ENDDEFINE»
-
-«DEFINE i18n FOR gmfgen::GenDiagram»
-# Preferences
-«FOREACH allPreferencePages(self) AS p-»
-prefpage.«p.iD»=«p.name»
-«ENDFOREACH»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
deleted file mode 100644
index c75ca6c1fc4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/DiagramUpdater.xpt
+++ /dev/null
@@ -1,529 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Michael Golubev (Borland) - [243151] explicit source/target for links
- *    Michael Golubev (Montages) - API extracted to gmf.tooling.runtime (#372479)  	  
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::updater::Utils»
-«EXTENSION xpt::GenModelUtils»
-«EXTENSION gmf::GenModelUtils»
-«EXTENSION xpt::GenEditorGenerator»
-
-«DEFINE DiagramUpdater FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «diagramUpdaterClassName» {
-	«EXPAND isShortcutOrphaned-»
-«LET editorGen.diagram.getAllContainers()->select(container | hasSemanticChildren(container))->asSequence() AS semanticContainers-»
-
-	«EXPAND getGenericSemanticChildrenOfView(semanticContainers)-»
-	«EXPAND getSemanticChildrenOfView FOREACH semanticContainers-»
-	«EXPAND getPhantomNodesIterator-»
-«ENDLET-»
-
-	«EXPAND getGenericConnectedLinks(getAllSemanticElements(editorGen.diagram), getContainedLinksMethodNameSuffix())-»
-	
-	«EXPAND getGenericConnectedLinks(getAllSemanticDiagramElements(editorGen.diagram), getIncomingLinksMethodNameSuffix())-»
-	
-	«EXPAND getGenericConnectedLinks(getAllSemanticDiagramElements(editorGen.diagram), getOutgoingLinksMethodNameSuffix())-»
-	«EXPAND getContainedLinks FOREACH getAllSemanticElements(editorGen.diagram)-»
-	«EXPAND getIncomingLinks FOREACH getAllSemanticDiagramElements(editorGen.diagram)-»
-	«EXPAND getOutgoingLinks FOREACH getAllSemanticDiagramElements(editorGen.diagram)-»
-	«EXPAND getContainedLinksByTypeMethod FOREACH getAllContainedLinks(editorGen.diagram)-»
-	«EXPAND getIncomingLinksByTypeMethod FOREACH getAllIncomingLinks(editorGen.diagram)-»
-	«EXPAND getOutgoingLinksByTypeMethod FOREACH getAllOutgoingLinks(editorGen.diagram)-»
-	
-	«EXPAND runtimeTypedInstance-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«REM»
-	Currently shortcuts are supported only for domain-based diagram element.
-	This means, view.isSetElement() == true.
-«ENDREM»
-«DEFINE isShortcutOrphaned FOR gmfgen::GenDiagramUpdater-»
-	«IF not editorGen.diagram.containsShortcutsTo->isEmpty()-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-public static boolean isShortcutOrphaned(org.eclipse.gmf.runtime.notation.View view) {
-	return !view.isSetElement() || view.getElement() == null || view.getElement().eIsProxy();
-}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getGenericSemanticChildrenOfView(semanticContainers : Sequence(gmfgen::GenContainerBase)) FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static «EXPAND CodeStyle::G('java.util.List', getNodeDescriptorQualifiedClassName()) FOR editorGen.diagram» getSemanticChildren(org.eclipse.gmf.runtime.notation.View view) {
-	«IF not semanticContainers->isEmpty()-»
-	switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»(view)) {
-		«EXPAND getSemanticChildrenCase FOREACH semanticContainers-»
-	}
-	«ENDIF-»
-	return «EXPAND CodeStyle::emptyList FOR editorGen.diagram»;
-}
-«ENDDEFINE»
-
-«DEFINE getSemanticChildrenCase FOR gmfgen::GenContainerBase-»
-«EXPAND xpt::Common::caseVisualID»
-	return «EXPAND getSemanticChildrenMethodName»(view);
-«ENDDEFINE»
-
-«DEFINE getSemanticChildrenOfView FOR gmfgen::GenContainerBase-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-public static «EXPAND CodeStyle::G('java.util.List', getDiagram().editorGen.diagramUpdater.getNodeDescriptorQualifiedClassName())» «EXPAND getSemanticChildrenMethodName»(org.eclipse.gmf.runtime.notation.View view) {
-	«IF getSemanticChildrenChildFeatures(self)->size() > 0 or self.getPhantomNodes()->size() > 0-»
-	«EXPAND defineModelElement-»
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', getDiagram().editorGen.diagramUpdater.getNodeDescriptorQualifiedClassName())»();
-«REM»childMetaFeature can be null here!«ENDREM»«-»
-		«FOREACH getSemanticChildrenChildFeatures(self) AS childMetaFeature-»
-			«IF null = childMetaFeature-»
-	{ /*FIXME no containment/child feature found in the genmodel, toolsmith need to specify Class here manually*/ childElement = /*FIXME no containment/child feature found in the genmodel, toolsmith need to specify correct one here manually*/;
-			«ELSEIF isListType(childMetaFeature)-»
-	for («EXPAND CodeStyle::G('java.util.Iterator', '?')» it = «EXPAND MetaModel::getFeatureValue('modelElement', self.getModelElementType()) FOR childMetaFeature».iterator(); it.hasNext();) {
-		«EXPAND MetaModel::DeclareAndAssign('childElement', 'it.next()', true) FOR getTypeGenClassX(childMetaFeature)»
-			«ELSE-»
-	{ «EXPAND MetaModel::DeclareAndAssign('childElement', 'modelElement', self.getModelElementType(), childMetaFeature) FOR getTypeGenClassX(childMetaFeature)»
-			«ENDIF-»
-		int visualID = «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall FOR getDiagram()»(view, «EXPAND MetaModel::DowncastToEObject('childElement') FOR getTypeGenClassX(childMetaFeature)»);
-			«EXPAND checkChildElementVisualID(null <> childMetaFeature and isListType(childMetaFeature)) FOREACH getSemanticChildren(self, childMetaFeature)-»
-	}
-		«ENDFOREACH-»
-«IF self.getPhantomNodes()->notEmpty()-»
-	org.eclipse.emf.ecore.resource.Resource resource = modelElement.eResource();
-	«EXPAND CodeStyle::iterate('childElement', 'org.eclipse.emf.ecore.EObject', 'it', 'getPhantomNodesIterator(resource)')-»
-		if (childElement == modelElement) {
-			continue;
-		}
-		«EXPAND addNextIfPhantom FOREACH self.getPhantomNodes()-»
-	}
-«ENDIF-»		
-	return result;
-	«ELSE-»
-	return «EXPAND CodeStyle::emptyList»;
-	«ENDIF-»
-}
-«ENDDEFINE»
-
-«DEFINE defineModelElement FOR gmfgen::GenContainerBase-»
-if (!view.isSetElement()) {
-	return «EXPAND CodeStyle::emptyList»;
-}
-«EXPAND MetaModel::DeclareAndAssign('modelElement', 'view.getElement()') FOR self.getModelElementType()»
-«ENDDEFINE»
-
-«DEFINE defineModelElement FOR gmfgen::GenCompartment-»
-if (false == view.eContainer() instanceof org.eclipse.gmf.runtime.notation.View) {
-	return «EXPAND CodeStyle::emptyList»;
-}
-org.eclipse.gmf.runtime.notation.View containerView = (org.eclipse.gmf.runtime.notation.View) view.eContainer();
-if (!containerView.isSetElement()) {
-	return «EXPAND CodeStyle::emptyList»;
-}
-«EXPAND MetaModel::DeclareAndAssign('modelElement', 'containerView.getElement()') FOR self.getModelElementType()»
-«ENDDEFINE»
-
-«DEFINE getSemanticChildrenMethodName FOR gmfgen::GenContainerBase»get«getUniqueIdentifier()»SemanticChildren«ENDDEFINE»
-
-«DEFINE getSemanticChildrenMethodCall FOR gmfgen::GenContainerBase»«getDiagram().editorGen.diagramUpdater.getDiagramUpdaterQualifiedClassName()».«EXPAND getSemanticChildrenMethodName»«ENDDEFINE»
-
-«DEFINE checkChildElementVisualID(inLoop : Boolean) FOR gmfgen::GenNode-»
-if (visualID == «EXPAND xpt::editor::VisualIDRegistry::visualID») {
-	result.add(new «getDiagram().editorGen.diagramUpdater.getNodeDescriptorQualifiedClassName()»(«IF null <> modelFacet.childMetaFeature»«EXPAND MetaModel::DowncastToEObject('childElement') FOR getTypeGenClassX(modelFacet.childMetaFeature)»«ENDIF», visualID));
-«IF inLoop-»
-	continue;
-«ENDIF-»
-}
-«ENDDEFINE»
-
-«DEFINE addNextIfPhantom FOR gmfgen::GenNode-»
-if («EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall FOR getDiagram()»(view, childElement) == «EXPAND xpt::editor::VisualIDRegistry::visualID») {
-	result.add(new «getDiagram().editorGen.diagramUpdater.getNodeDescriptorQualifiedClassName()»(childElement, «EXPAND xpt::editor::VisualIDRegistry::visualID»));
-	continue;
-}
-«ENDDEFINE»
-
-
-«DEFINE getPhantomNodesIterator FOR gmfgen::GenDiagramUpdater-»
-«IF editorGen.diagram.getPhantomNodes()->notEmpty()-»
-	
-«EXPAND xpt::Common::generatedMemberComment»
-private static «EXPAND CodeStyle::G('java.util.Iterator', 'org.eclipse.emf.ecore.EObject') FOR editorGen.diagram» getPhantomNodesIterator(org.eclipse.emf.ecore.resource.Resource resource) {
-	return resource.getAllContents();
-}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getGenericConnectedLinks(linkContainers : Sequence(gmfgen::GenCommonBase), methodNameSuffix : String) FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static «EXPAND CodeStyle::G('java.util.List', getLinkDescriptorQualifiedClassName()) FOR editorGen.diagram» get«methodNameSuffix»Links(org.eclipse.gmf.runtime.notation.View view) {
-	«IF not linkContainers->isEmpty()-»
-	switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»(view)) {
-		«EXPAND getContainedLinksCase(methodNameSuffix) FOREACH linkContainers-»
-	}
-	«ENDIF-»
-	return «EXPAND CodeStyle::emptyList FOR editorGen.diagram»;
-}
-«ENDDEFINE»
-
-«DEFINE getContainedLinksCase(methodNameSuffix : String) FOR gmfgen::GenCommonBase-»
-«EXPAND xpt::Common::caseVisualID»
-	return «EXPAND linkGetterName(methodNameSuffix)»(view);
-«ENDDEFINE»
-
-«REM»This DEFING can be used from other templates to inject call to the corresponding method«ENDREM»
-«DEFINE getContainedLinksMethodCall FOR gmfgen::GenCommonBase»«getDiagram().editorGen.diagramUpdater.getDiagramUpdaterQualifiedClassName()».«EXPAND linkGetterName(getContainedLinksMethodNameSuffix())»«ENDDEFINE»
-
-«REM»This DEFING can be used from other templates to inject call to the corresponding method«ENDREM»
-«DEFINE getIncomingLinksMethodCall FOR gmfgen::GenCommonBase»«getDiagram().editorGen.diagramUpdater.getDiagramUpdaterQualifiedClassName()».«EXPAND linkGetterName(getIncomingLinksMethodNameSuffix())»«ENDDEFINE»
-
-«REM»This DEFING can be used from other templates to inject call to the corresponding method«ENDREM»
-«DEFINE getOutgoingLinksMethodCall FOR gmfgen::GenCommonBase»«getDiagram().editorGen.diagramUpdater.getDiagramUpdaterQualifiedClassName()».«EXPAND linkGetterName(getOutgoingLinksMethodNameSuffix())»«ENDDEFINE»
-
-«DEFINE linkGetterName(suffix : String) FOR gmfgen::GenCommonBase»get«getUniqueIdentifier()»«suffix»Links«ENDDEFINE»
-
-«DEFINE getContainedLinks FOR gmfgen::GenCommonBase-»
-	«EXPAND getConnectedLinks(getContainedLinks(self.getMetaClass(), getDiagram()), getContainedLinksMethodNameSuffix(), false)-»
-«ENDDEFINE»
-
-«DEFINE getIncomingLinks FOR gmfgen::GenLinkEnd-»
-	«EXPAND getConnectedLinks(getIncomingLinks(self), getIncomingLinksMethodNameSuffix(), true)-»
-«ENDDEFINE»
-
-«DEFINE getOutgoingLinks FOR gmfgen::GenLinkEnd-»
-	«EXPAND getConnectedLinks(getOutgoingLinks(self), getOutgoingLinksMethodNameSuffix(), false)-»
-«ENDDEFINE»
-
-«DEFINE getConnectedLinks(genLinks : Sequence(gmfgen::GenLink), methodNameSuffix : String, needCrossReferencer : Boolean) FOR gmfgen::GenCommonBase-»
-
-«EXPAND xpt::Common::generatedMemberComment»
-public static «EXPAND CodeStyle::G('java.util.List', getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())» «EXPAND linkGetterName(methodNameSuffix)»(org.eclipse.gmf.runtime.notation.View view) {
-«IF genLinks->notEmpty()-»
-«LET self.getMetaClass() AS metaclass-»
-	«EXPAND MetaModel::DeclareAndAssign('modelElement', 'view.getElement()') FOR metaclass»
-	«IF needCrossReferencer»«EXPAND CodeStyle::G2('java.util.Map', 'org.eclipse.emf.ecore.EObject', 'java.util.Collection<org.eclipse.emf.ecore.EStructuralFeature.Setting>')» crossReferences = org.eclipse.emf.ecore.util.EcoreUtil.CrossReferencer.find(view.eResource().getResourceSet().getResources());
-	«ENDIF-»
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())»();
-	«EXPAND colectConnectedLinks(methodNameSuffix, needCrossReferencer, isExternalInterface(metaclass)) FOREACH genLinks-»
-	return result;
-«ENDLET-»
-«ELSE-»
-	return «EXPAND CodeStyle::emptyList»;
-«ENDIF-»
-}
-«ENDDEFINE»
-
-«DEFINE colectConnectedLinks(methodNameSuffix : String, needCrossReferencer : Boolean, isExternalInterface : Boolean) FOR gmfgen::GenLink-»
-«IF isExternalInterface-»
-	if («EXPAND MetaModel::IsInstance('modelElement') FOR modelFacet.getLinkEndType(methodNameSuffix)») {
-«ENDIF-»
-	result.addAll(«EXPAND chooseConnectedLinksByTypeMethodName(methodNameSuffix, self) FOR modelFacet»(«IF isExternalInterface-»
-«EXPAND MetaModel::CastEObject('modelElement') FOR modelFacet.getLinkEndType(methodNameSuffix)»«ELSE»modelElement«ENDIF»«IF needCrossReferencer», crossReferences«ENDIF»));	
-«IF isExternalInterface-»
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE chooseConnectedLinksByTypeMethodName(methodNameSuffix : String, genLink : gmfgen::GenLink) FOR gmfgen::LinkModelFacet-»
-	«EXPAND incorrectLinkModelFacet-»
-«ENDDEFINE»
-
-«REM»
-	For FeatureModelFacet-based links we are calling 
-	getOutgoing???Links instead of getContained???Links
-«ENDREM»
-«DEFINE chooseConnectedLinksByTypeMethodName(methodNameSuffix : String, genLink : gmfgen::GenLink) FOR gmfgen::FeatureLinkModelFacet-»
-«IF getContainedLinksMethodNameSuffix() = methodNameSuffix»«EXPAND getConnectedLinksByTypeMethodName(getOutgoingLinksMethodNameSuffix()) FOR genLink-»
-«ELSE»«EXPAND getConnectedLinksByTypeMethodName(methodNameSuffix) FOR genLink-»
-«ENDIF-»
-«ENDDEFINE»
-
-«REM»
-	For TypeModelFacet-based links we are calling 
-	getContained???Links instead of getOutgoinf???Links 
-	if sourceMetaFeature was not specified
-«ENDREM»
-«DEFINE chooseConnectedLinksByTypeMethodName(methodNameSuffix : String, genLink : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-«IF getOutgoingLinksMethodNameSuffix() = methodNameSuffix and null = sourceMetaFeature»«EXPAND getConnectedLinksByTypeMethodName(getContainedLinksMethodNameSuffix()) FOR genLink-»
-«ELSE»«EXPAND getConnectedLinksByTypeMethodName(methodNameSuffix) FOR genLink-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getContainedLinksByTypeMethod FOR gmfgen::GenLink»«EXPAND getContainedLinksByTypeMethod(self) FOR modelFacet»«ENDDEFINE»
-
-«DEFINE getConnectedLinksByTypeMethodName(suffix : String) FOR gmfgen::GenLink»get«suffix»«EXPAND getConnectedLinksByTypeMethodFragment FOR modelFacet»_«visualID»«ENDDEFINE»
-
-«DEFINE getConnectedLinksByTypeMethodFragment FOR gmfgen::TypeLinkModelFacet»TypeModelFacetLinks_«metaClass.ecoreClass.name»«ENDDEFINE»
-
-«DEFINE getConnectedLinksByTypeMethodFragment FOR gmfgen::FeatureLinkModelFacet»FeatureModelFacetLinks_«metaFeature.genClass.ecoreClass.name»_«metaFeature.ecoreFeature.name.firstToUpper()»«ENDDEFINE»
-
-«DEFINE getConnectedLinksByTypeMethodFragment FOR gmfgen::LinkModelFacet-»
-	«EXPAND incorrectLinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE getContainedLinksByTypeMethod(genLink : gmfgen::GenLink) FOR gmfgen::LinkModelFacet-»
-	«EXPAND incorrectLinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE getContainedLinksByTypeMethod(genLink : gmfgen::GenLink) FOR gmfgen::FeatureLinkModelFacet»«ENDDEFINE»
-
-«DEFINE getContainedLinksByTypeMethod(genLink : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private static «EXPAND CodeStyle::G('java.util.Collection', genLink.getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName()) FOR genLink» «EXPAND getConnectedLinksByTypeMethodName(getContainedLinksMethodNameSuffix()) FOR genLink»(«EXPAND MetaModel::QualifiedClassName FOR childMetaFeature.genClass» container) {
-	«EXPAND getContainedLinksByTypeMethodBody(genLink, false)-»
-}
-«ENDDEFINE»
-
-«DEFINE getContainedLinksByTypeMethodBody(genLink : gmfgen::GenLink, sourceVarDefined : Boolean) FOR gmfgen::TypeLinkModelFacet-»
-«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', genLink.getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName()) FOR genLink»();
-	«LET isListType(childMetaFeature) AS inLoop-»
-«IF inLoop-»
-for («EXPAND CodeStyle::G('java.util.Iterator', '?') FOR genLink» links = «EXPAND MetaModel::getFeatureValue('container', childMetaFeature.genClass) FOR childMetaFeature».iterator(); links.hasNext();) {
-	org.eclipse.emf.ecore.EObject linkObject = (org.eclipse.emf.ecore.EObject ) links.next();
-	if («EXPAND MetaModel::NotInstance('linkObject') FOR metaClass») {
-		continue;
-	}
-	«EXPAND MetaModel::DeclareAndAssign('link', 'linkObject') FOR metaClass»
-«ELSE-»
-	«IF getTypeGenClassX(childMetaFeature) = metaClass-»
-		«EXPAND MetaModel::DeclareAndAssign('link', 'container', getSourceType(), childMetaFeature) FOR metaClass»
-	«ELSE-»
-		«EXPAND MetaModel::DeclareAndAssign('linkObject', 'container', getSourceType(), childMetaFeature) FOR getTypeGenClassX(childMetaFeature)»
-		if («EXPAND MetaModel::NotInstance('linkObject') FOR metaClass») {
-			return result;
-		}
-		«EXPAND MetaModel::DeclareAndAssign('link', 'linkObject') FOR metaClass»
-	«ENDIF-»
-«ENDIF-»
-		«EXPAND checkLinkVisualID(genLink, inLoop)-»
-		«EXPAND defineLinkDestination(inLoop)-»
-		«IF null <> sourceMetaFeature-»
-			«EXPAND defineLinkSource(inLoop)-»
-			«IF sourceVarDefined-»
-				«EXPAND checkLinkSource(inLoop)-»
-			«ENDIF-»
-			«EXPAND addLinkDescriptor(genLink, 'src', 'dst')-»
-		«ELSE-»
-			«EXPAND addLinkDescriptor(genLink, 'container', 'dst')-»
-		«ENDIF-»
-«IF inLoop-»
-}
-«ENDIF-»
-	«ENDLET-»
-return result;	
-«ENDDEFINE»
-
-«DEFINE addLinkDescriptor(genLink : gmfgen::GenLink, srcVar : String, dstVar : String) FOR gmfgen::TypeLinkModelFacet-»
-result.add(new «genLink.getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName()»(«EXPAND MetaModel::DowncastToEObject(srcVar) FOR getSourceType()», «EXPAND MetaModel::DowncastToEObject(dstVar) FOR getTargetType()», «EXPAND MetaModel::DowncastToEObject('link') FOR metaClass», «EXPAND xpt::providers::ElementTypes::accessElementType FOR genLink», «EXPAND xpt::editor::VisualIDRegistry::visualID FOR genLink»));
-«ENDDEFINE»
-
-«DEFINE checkLinkVisualID(genLink : gmfgen::GenLink, inLoop : Boolean) FOR gmfgen::TypeLinkModelFacet-»
-if («EXPAND xpt::editor::VisualIDRegistry::visualID FOR genLink» != «EXPAND xpt::editor::VisualIDRegistry::getLinkWithClassVisualIDMethodCall FOR genLink.getDiagram()»(«EXPAND MetaModel::DowncastToEObject('link') FOR metaClass»)) {
-	«EXPAND stopLinkProcessing(inLoop)-»
-}
-«ENDDEFINE»
-
-«DEFINE defineLinkSource(inLoop : Boolean) FOR gmfgen::TypeLinkModelFacet-»
-	«IF isListType(sourceMetaFeature)-»
-java.util.List sources = «EXPAND MetaModel::getFeatureValue('link', metaClass) FOR sourceMetaFeature»;
-Object theSource = sources.size() == 1 ? sources.get(0) : null;
-if («EXPAND MetaModel::NotInstance('theSource') FOR getSourceType()») {
-	«EXPAND stopLinkProcessing(inLoop)-»
-}
-«EXPAND MetaModel::DeclareAndAssign('src', 'theSource', true) FOR getSourceType()»
-	«ELSE-»
-«EXPAND MetaModel::DeclareAndAssign('src', 'link', metaClass, sourceMetaFeature) FOR getSourceType()»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE checkLinkSource(inLoop : Boolean) FOR gmfgen::TypeLinkModelFacet-»
-if (src != source) {
-	«EXPAND stopLinkProcessing(inLoop)-»
-}
-«ENDDEFINE»
-
-«DEFINE defineLinkDestination(inLoop : Boolean) FOR gmfgen::TypeLinkModelFacet-»
-	«IF isListType(targetMetaFeature)-»
-java.util.List targets = «EXPAND MetaModel::getFeatureValue('link', metaClass) FOR targetMetaFeature»;
-Object theTarget = targets.size() == 1 ? targets.get(0) : null;
-if («EXPAND MetaModel::NotInstance('theTarget') FOR getTargetType()») {
-	«EXPAND stopLinkProcessing(inLoop)-»
-}
-«EXPAND MetaModel::DeclareAndAssign('dst', 'theTarget', true) FOR getTargetType()»
-	«ELSE-»
-«EXPAND MetaModel::DeclareAndAssign('dst', 'link', metaClass, targetMetaFeature) FOR getTargetType()»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE stopLinkProcessing(inLoop : Boolean) FOR gmfgen::TypeLinkModelFacet-»
-«IF inLoop-»
-continue;
-«ELSE-»
-return result;
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getIncomingLinksByTypeMethod FOR gmfgen::GenLink-»
-
-«EXPAND xpt::Common::generatedMemberComment»
-private static «EXPAND CodeStyle::G('java.util.Collection', getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())» «EXPAND getConnectedLinksByTypeMethodName(getIncomingLinksMethodNameSuffix())»(«EXPAND MetaModel::QualifiedClassName FOR modelFacet.getTargetType()» target, «EXPAND CodeStyle::G2('java.util.Map', 'org.eclipse.emf.ecore.EObject', 'java.util.Collection<org.eclipse.emf.ecore.EStructuralFeature.Setting>')» crossReferences) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())»();
-	«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.emf.ecore.EStructuralFeature.Setting')» settings = «EXPAND CodeStyle::castTyped('java.util.Collection')»crossReferences.get(target);
-	«EXPAND CodeStyle::iterate('setting', 'org.eclipse.emf.ecore.EStructuralFeature.Setting', 'settings')-»
-		«EXPAND getIncomingLinksByTypeMethodBody(self /*FIXME pass settings var name inside for completeness */) FOR modelFacet-»
-	}
-	return result;	
-}
-«ENDDEFINE»
-
-«DEFINE getIncomingLinksByTypeMethodBody(genLink : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-if (setting.getEStructuralFeature() != «EXPAND MetaModel::MetaFeature FOR targetMetaFeature» || «EXPAND MetaModel::NotInstance('setting.getEObject()') FOR metaClass») {
-	continue;
-}
-«EXPAND MetaModel::DeclareAndAssign('link', 'setting.getEObject()') FOR metaClass»
-	«EXPAND checkLinkVisualID(genLink, true)-»
-	«IF null <> sourceMetaFeature-»
-		«EXPAND defineLinkSource(true)-»
-		«EXPAND addLinkDescriptor(genLink, 'src', 'target')-»
-	«ELSE-»
-		«EXPAND defineLinkContainer(true)-»
-		«EXPAND addLinkDescriptor(genLink, 'container', 'target')-»
-«REM»TODO: continue here.«ENDREM»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE defineLinkContainer(inLoop : Boolean) FOR gmfgen::TypeLinkModelFacet-»
-if (false == «EXPAND MetaModel::IsContainerInstance('link', metaClass) FOR containmentMetaFeature.genClass») {
-	«EXPAND stopLinkProcessing(inLoop)-»
-}
-«EXPAND MetaModel::DeclareAndAssignContainer('container', 'link', metaClass) FOR containmentMetaFeature.genClass»
-«ENDDEFINE»
-
-«DEFINE getIncomingLinksByTypeMethodBody(genLink : gmfgen::GenLink) FOR gmfgen::FeatureLinkModelFacet-»
-if (setting.getEStructuralFeature() == «EXPAND MetaModel::MetaFeature FOR metaFeature») {
-	result.add(new «genLink.getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName()»(setting.getEObject(), «EXPAND MetaModel::DowncastToEObject('target') FOR getTargetType()», «EXPAND xpt::providers::ElementTypes::accessElementType FOR genLink», «EXPAND xpt::editor::VisualIDRegistry::visualID FOR genLink»));
-}
-«ENDDEFINE»
-
-«DEFINE getIncomingLinksByTypeMethodBody(genLink : gmfgen::GenLink) FOR gmfgen::LinkModelFacet-»
-	«EXPAND incorrectLinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE getOutgoingLinksByTypeMethod FOR gmfgen::GenLink-»
-	«EXPAND getOutgoingLinksByTypeMethod(self) FOR modelFacet-»
-«ENDDEFINE»
-
-«DEFINE getOutgoingLinksByTypeMethodSignature FOR gmfgen::GenLink-»
-private static «EXPAND CodeStyle::G('java.util.Collection', getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName())» «EXPAND getConnectedLinksByTypeMethodName(getOutgoingLinksMethodNameSuffix())»(«EXPAND MetaModel::QualifiedClassName FOR modelFacet.getSourceType()» source)«ENDDEFINE»
-
-«DEFINE getOutgoingLinksByTypeMethod(genLink : gmfgen::GenLink) FOR gmfgen::FeatureLinkModelFacet-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-«EXPAND getOutgoingLinksByTypeMethodSignature FOR genLink» {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', genLink.getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName()) FOR genLink»();
-	«IF isListType(metaFeature)-»
-	for («EXPAND CodeStyle::G('java.util.Iterator', '?') FOR genLink» destinations = «EXPAND MetaModel::getFeatureValue('source', getSourceType()) FOR metaFeature».iterator(); destinations.hasNext();) {
-		«EXPAND MetaModel::DeclareAndAssign('destination', 'destinations.next()', true) FOR getTargetType()»
-	«ELSE-»
-	«EXPAND MetaModel::DeclareAndAssign('destination', 'source', getSourceType(), metaFeature) FOR getTargetType()»
-	if (destination == null) {
-		return result;
-	}
-	«ENDIF-»
-	result.add(new «genLink.getDiagram().editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName()»(«EXPAND MetaModel::DowncastToEObject('source') FOR getSourceType()», «EXPAND MetaModel::DowncastToEObject('destination') FOR getTargetType()», «EXPAND xpt::providers::ElementTypes::accessElementType FOR genLink», «EXPAND xpt::editor::VisualIDRegistry::visualID FOR genLink»));
-	«IF isListType(metaFeature)-»
-	}
-	«ENDIF-»
-	return result;
-}
-«ENDDEFINE»
-
-«REM»More careful way to find container should be used here then GMF will be modified in accordance«ENDREM»
-«DEFINE getOutgoingLinksByTypeMethod(genLink : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-	«IF null <> sourceMetaFeature-»
-	
-		«EXPAND xpt::Common::generatedMemberComment»
-«EXPAND getOutgoingLinksByTypeMethodSignature FOR genLink» {
-	«EXPAND MetaModel::QualifiedClassName FOR containmentMetaFeature.genClass» container = null;
-	// Find container element for the link.
-	// Climb up by containment hierarchy starting from the source
-	// and return the first element that is instance of the container class.
-	for (org.eclipse.emf.ecore.EObject element = «EXPAND MetaModel::DowncastToEObject('source') FOR getSourceType()»; element != null && container == null; element = element.eContainer()) {
-		if («EXPAND MetaModel::IsInstance('element') FOR containmentMetaFeature.genClass») {
-			container = «EXPAND MetaModel::CastEObject('element') FOR containmentMetaFeature.genClass»;
-		}
-	}
-	if (container == null) {
-		return «EXPAND CodeStyle::emptyList FOR genLink»;
-	}
-		«EXPAND getContainedLinksByTypeMethodBody(genLink, true)-»
-}		
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getOutgoingLinksByTypeMethod(genLink : gmfgen::GenLink) FOR gmfgen::LinkModelFacet-»
-	«EXPAND incorrectLinkModelFacet-»
-«ENDDEFINE»
-
-«DEFINE incorrectLinkModelFacet FOR gmfgen::LinkModelFacet-»
-	«ERROR 'Incorrect LinkModelFacet: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE runtimeTypedInstanceName FOR gmfgen::GenDiagramUpdater»TYPED_INSTANCE«ENDDEFINE»
-«DEFINE runtimeTypedInstanceCall FOR gmfgen::GenDiagramUpdater»«getDiagramUpdaterQualifiedClassName()».«EXPAND runtimeTypedInstanceName»«ENDDEFINE»
-
-«DEFINE runtimeTypedInstance FOR gmfgen::GenDiagramUpdater-»
-	«IF self.editorGen.jdkComplianceLevel() > 4-»
-	«LET self.getNodeDescriptorQualifiedClassName() AS nodeDescriptorFQN-»
-	«LET self.getLinkDescriptorQualifiedClassName() AS linkDescriptorFQN-»
-	«EXPAND xpt::Common::generatedClassComment»
-	public static final org.eclipse.gmf.tooling.runtime.update.DiagramUpdater «EXPAND runtimeTypedInstanceName» = new org.eclipse.gmf.tooling.runtime.update.DiagramUpdater() {
-		«REM»Doesn't make sense to use CodeStyle::G -- interface requires generics anyway, so we checked above for the whole field«ENDREM»«-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI FOR editorGen.diagram»
-		public java.util.List<«nodeDescriptorFQN»> getSemanticChildren(org.eclipse.gmf.runtime.notation.View view) {
-			return «diagramUpdaterClassName».getSemanticChildren(view);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI FOR editorGen.diagram»
-		public java.util.List<«linkDescriptorFQN»> getContainedLinks(org.eclipse.gmf.runtime.notation.View view) {
-			return «diagramUpdaterClassName».getContainedLinks(view);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI FOR editorGen.diagram»
-		public java.util.List<«linkDescriptorFQN»> getIncomingLinks(org.eclipse.gmf.runtime.notation.View view) {
-			return «diagramUpdaterClassName».getIncomingLinks(view);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI FOR editorGen.diagram»
-		public java.util.List<«linkDescriptorFQN»> getOutgoingLinks(org.eclipse.gmf.runtime.notation.View view) {
-			return «diagramUpdaterClassName».getOutgoingLinks(view);
-		}
-	}; 
-	«ENDLET-»
-	«ENDLET-»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagramUpdater»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt
deleted file mode 100644
index 45daf0c2620..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/LinkDescriptor.xpt
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - API extracted to gmf.tooling.runtime (#372479)  	  
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE LinkDescriptor FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «linkDescriptorClassName» extends org.eclipse.gmf.tooling.runtime.update.UpdaterLinkDescriptor {
-	«EXPAND refOnlyLinkConstructor-»
-	
-	«EXPAND typeLinkConstructor-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE refOnlyLinkConstructor FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public «linkDescriptorClassName»(org.eclipse.emf.ecore.EObject source, org.eclipse.emf.ecore.EObject destination, org.eclipse.gmf.runtime.emf.type.core.IElementType elementType, int linkVID) {
-	super(source, destination, elementType, linkVID);
-}
-«ENDDEFINE»
-
-«DEFINE typeLinkConstructor FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public «linkDescriptorClassName»(org.eclipse.emf.ecore.EObject source, org.eclipse.emf.ecore.EObject destination, org.eclipse.emf.ecore.EObject linkElement, org.eclipse.gmf.runtime.emf.type.core.IElementType elementType, int linkVID) {
-	super(source, destination, linkElement, elementType, linkVID);
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagramUpdater»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt
deleted file mode 100644
index d1fd56e7683..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/NodeDescriptor.xpt
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - API extracted to gmf.tooling.runtime (#372479)  	  
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE NodeDescriptor FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «nodeDescriptorClassName» extends org.eclipse.gmf.tooling.runtime.update.UpdaterNodeDescriptor {
-	«EXPAND _constructor-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public «nodeDescriptorClassName»(org.eclipse.emf.ecore.EObject modelElement, int visualID) {
-	super(modelElement, visualID);
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagramUpdater»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt
deleted file mode 100644
index b9dd56219b1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/UpdateCommand.xpt
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE UpdateCommand FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «updateCommandClassName» implements org.eclipse.core.commands.IHandler {
-
-	«EXPAND addHandlerListener-»
-
-	«EXPAND dispose-»
-
-	«EXPAND execute-»
-
-	«EXPAND isEnabled-»
-
-	«EXPAND isHandled-»
-
-	«EXPAND removeHandlerListener-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE addHandlerListener FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void addHandlerListener(org.eclipse.core.commands.IHandlerListener handlerListener) {
-}
-«ENDDEFINE»
-	
-«DEFINE dispose FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void dispose() {
-}
-«ENDDEFINE»
-
-«DEFINE execute FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public Object execute(org.eclipse.core.commands.ExecutionEvent event) throws org.eclipse.core.commands.ExecutionException {
-	org.eclipse.jface.viewers.ISelection selection = org.eclipse.ui.PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
-	if (selection instanceof org.eclipse.jface.viewers.IStructuredSelection) {
-		org.eclipse.jface.viewers.IStructuredSelection structuredSelection = (org.eclipse.jface.viewers.IStructuredSelection) selection;
-		if (structuredSelection.size() != 1) {
-			return null;
-		}
-		if (structuredSelection.getFirstElement() instanceof org.eclipse.gef.EditPart && ((org.eclipse.gef.EditPart) structuredSelection.getFirstElement()).getModel() instanceof org.eclipse.gmf.runtime.notation.View) {
-			org.eclipse.emf.ecore.EObject modelElement = ((org.eclipse.gmf.runtime.notation.View) ((org.eclipse.gef.EditPart) structuredSelection.getFirstElement()).getModel()).getElement();
-			java.util.List editPolicies = org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy.getRegisteredEditPolicies(modelElement);
-			for (java.util.Iterator it = editPolicies.iterator(); it.hasNext();) {
-				org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy nextEditPolicy = (org.eclipse.gmf.runtime.diagram.ui.editpolicies.CanonicalEditPolicy) it.next();
-				nextEditPolicy.refresh();
-			}
-
-		}
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE isEnabled FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isEnabled() {
-	return true;
-}
-«ENDDEFINE»
-	
-«DEFINE isHandled FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isHandled() {
-	return true;
-}
-«ENDDEFINE»
-
-«DEFINE removeHandlerListener FOR gmfgen::GenDiagramUpdater-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void removeHandlerListener(org.eclipse.core.commands.IHandlerListener handlerListener) {
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagramUpdater»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/Utils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/Utils.qvto
deleted file mode 100644
index 249ba6f31b6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/Utils.qvto
+++ /dev/null
@@ -1,167 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import xpt.diagram.editpolicies.LinkUtils;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-
-library Utils;
-
-helper getContainedLinksMethodNameSuffix() : String {
-	return 'Contained'
-}
-
-helper getIncomingLinksMethodNameSuffix() : String {
-	return 'Incoming'
-}
-
-helper getOutgoingLinksMethodNameSuffix() : String {
-	return 'Outgoing'
-}
-
-helper getContainedLinks(metaClass : genmodel::GenClass, diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLink) {
-	return diagram.links->select(link | canBeContainer(link, metaClass))->asSequence()
-}
-
-helper getOutgoingLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
-	return linkEnd.getDiagram().links->select(link | linkEnd.genOutgoingLinks->includes(link))->asSequence()
-}
-
-helper getIncomingLinks(linkEnd : gmfgen::GenLinkEnd) : Sequence(gmfgen::GenLink) {
-	return linkEnd.getDiagram().links->select(link | linkEnd.genIncomingLinks->includes(link))->asSequence()
-}
-
-helper getAllContainedLinks(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLink) {
-	return diagram.links->select(link | not getAllSemanticElements(diagram)->select(commonBase | canBeContainer(link, commonBase.getMetaClass()))->isEmpty())->asSequence()
-}
-
-helper getAllIncomingLinks(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLink) {
-	return diagram.links->select(link | not link.targets->isEmpty())->asSequence()
-}
-
-helper getAllOutgoingLinks(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLink) {
-	return diagram.links->select(link | link.isOutgoingLink())->select(link | not link.sources->isEmpty())->asSequence()
-}
-
-helper gmfgen::GenLink::isOutgoingLink() : Boolean {
-	return null <> self.modelFacet and self.modelFacet.isOutgoingLink()
-}
-
-helper gmfgen::LinkModelFacet::isOutgoingLink() : Boolean {
-	return true
-}
-
-helper gmfgen::TypeLinkModelFacet::isOutgoingLink() : Boolean {
-	return null <> self.sourceMetaFeature
-}
-
-helper getAllSemanticDiagramElements(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenLinkEnd) {
-	return ((diagram.getAllNodes()->asSequence())[gmfgen::GenLinkEnd]->union(diagram.links->asSequence()))[gmfgen::GenLinkEnd]->select(linkEnd | not linkEnd.getMetaClass().oclIsUndefined())
-}
-
-helper getAllSemanticElements(diagram : gmfgen::GenDiagram) : Sequence(gmfgen::GenCommonBase) {
-	return (if null <> diagram.domainDiagramElement then (Sequence { diagram })[gmfgen::GenCommonBase]->union(getAllSemanticDiagramElements(diagram)) else getAllSemanticDiagramElements(diagram) endif)
-}
-
-helper gmfgen::GenCommonBase::getMetaClass() : genmodel::GenClass {
-	return null
-}
-
-helper gmfgen::GenDiagram::getMetaClass() : genmodel::GenClass {
-	return self.domainDiagramElement
-}
-
-helper gmfgen::GenNode::getMetaClass() : genmodel::GenClass {
-	return self.modelFacet.metaClass
-}
-
-helper gmfgen::GenLink::getMetaClass() : genmodel::GenClass {
-	return (if null <> self.modelFacet then self.modelFacet.getMetaClass() else null endif)
-}
-
-helper gmfgen::LinkModelFacet::getMetaClass() : genmodel::GenClass {
-	return null
-}
-
-helper gmfgen::TypeLinkModelFacet::getMetaClass() : genmodel::GenClass {
-	return self.metaClass
-}
-
-helper hasSemanticChildren(container : gmfgen::GenContainerBase) : Boolean {
-	return not container.sansDomain and not container.containedNodes->isEmpty()
-}
-
-helper gmfgen::GenContainerBase::getModelElementType() : genmodel::GenClass {
-	return null
-}
-
-helper gmfgen::GenDiagram::getModelElementType() : genmodel::GenClass {
-	return self.domainDiagramElement
-}
-
-helper gmfgen::GenCompartment::getModelElementType() : genmodel::GenClass {
-	return self.node.getModelElementType()
-}
-
-helper gmfgen::GenNode::getModelElementType() : genmodel::GenClass {
-	return self.modelFacet.metaClass
-}
-
-helper getSemanticChildrenChildFeatures(containerBase : gmfgen::GenContainerBase) : Set(genmodel::GenFeature) {
-	return getNonPhantomSemanticChildren(containerBase)->collect(node | node.modelFacet.childMetaFeature)->asOrderedSet()
-}
-
-helper getSemanticChildrenContainmentFeatures(containerBase : gmfgen::GenContainerBase) : Set(genmodel::GenFeature) {
-	return getNonPhantomSemanticChildren(containerBase)->collect(node | node.modelFacet.containmentMetaFeature)->asOrderedSet()
-}
-
-helper getSemanticChildren(containerBase : gmfgen::GenContainerBase, childMetaFeature : genmodel::GenFeature) : Sequence(gmfgen::GenNode) {
-	return getNonPhantomSemanticChildren(containerBase)->select(node | node.modelFacet.childMetaFeature = childMetaFeature)
-}
-
-helper getNonPhantomSemanticChildren(containerBase : gmfgen::GenContainerBase) : Sequence(gmfgen::GenNode) {
-	return getSemanticChildren(containerBase)->select(node | not node.modelFacet.isPhantomElement())
-}
-
-helper gmfgen::GenContainerBase::getPhantomNodes() : Sequence(gmfgen::GenNode) {
-	return Sequence {  }
-}
-
-helper gmfgen::GenDiagram::getPhantomNodes() : Sequence(gmfgen::GenNode) {
-	return getSemanticChildren(self)->select(node | node.modelFacet.isPhantomElement())
-}
-
-helper getSemanticChildren(containerBase : gmfgen::GenContainerBase) : Sequence(gmfgen::GenNode) {
-	return containerBase.containedNodes->select(node | null <> node.modelFacet)->asSequence()
-}
-
--- true when children share same metaclass
-helper hasConformableSemanticChildren(containerBase : gmfgen::GenContainerBase) : Boolean {
-	-- return let childMetaClasses = getSemanticChildren(containerBase)->collect(node | node.modelFacet.metaClass) in not childMetaClasses->forAll(mc | childMetaClasses->select(mc2 | mc = mc2)->size() = 1)
-	return let childMetaClasses = getSemanticChildren(containerBase).modelFacet.metaClass in childMetaClasses->size() <> childMetaClasses->asSet()->size()
-}
-
-helper gmfgen::LinkModelFacet::getLinkEndType(methodNameSuffix : String) : genmodel::GenClass {
-	return null
-}
-
-helper gmfgen::FeatureLinkModelFacet::getLinkEndType(methodNameSuffix : String) : genmodel::GenClass {
-	return (if getIncomingLinksMethodNameSuffix() = methodNameSuffix then self.getTargetType() else self.getSourceType() endif)
-}
-
-helper gmfgen::TypeLinkModelFacet::getLinkEndType(methodNameSuffix : String) : genmodel::GenClass {
-	return (if getIncomingLinksMethodNameSuffix() = methodNameSuffix then self.getTargetType() else (if getOutgoingLinksMethodNameSuffix() = methodNameSuffix and null <> self.sourceMetaFeature then self.getSourceType() else self.containmentMetaFeature.genClass endif) endif)
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt
deleted file mode 100644
index 1f6d6bdccec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/updater/extensions.xpt
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE extensions FOR gmfgen::GenDiagramUpdater-»
-   <extension point="org.eclipse.ui.commands" id="update-cmd">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <command
-         categoryId="org.eclipse.ui.category.edit"
-         defaultHandler="«getUpdateCommandQualifiedClassName()»"
-         description="%update.diagram.description"
-         id="«updateCommandID»"
-         name="%update.diagram.name"/>
-   </extension>
-   
-   <extension point="org.eclipse.ui.bindings" id="update-cmd-binding">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <key 
-         commandId="«updateCommandID»"
-         contextId="«editorGen.editor.contextID»"
-         schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-         sequence="F5"/>
-   </extension>
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/views/Utils.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/views/Utils.xpt
deleted file mode 100644
index fed669268e3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/diagram/views/Utils.xpt
+++ /dev/null
@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - [257119] Create views directly, not through ViewFactories
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::ViewmapAttributesUtils»
-«EXTENSION xpt::diagram::Utils»
-
-// FIXME ColorAttributes class is deprecated
-«DEFINE foregroundColour(viewVar : String) FOR gmfgen::Viewmap»«EXPAND foregroundColour(viewVar) FOREACH attributes[gmfgen::ColorAttributes]»«ENDDEFINE»
-«DEFINE foregroundColour(viewVar : String) FOR gmfgen::ColorAttributes»org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(«viewVar», org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLineStyle_LineColor(), org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.colorToInteger(org.eclipse.draw2d.ColorConstants.«foregroundColor»));
-«ENDDEFINE»
-
-«DEFINE backgroundColour(viewVar : String) FOR gmfgen::Viewmap»«EXPAND backgroundColour(viewVar) FOREACH attributes[gmfgen::ColorAttributes]»«ENDDEFINE»
-«DEFINE backgroundColour(viewVar : String) FOR gmfgen::ColorAttributes»org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(«viewVar», org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFillStyle_FillColor(), org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.colorToInteger(org.eclipse.draw2d.ColorConstants.«backgroundColor»));
-«ENDDEFINE»
-
-«DEFINE addFontLineFillStylesConditionally(stylesVar : String) FOR gmfgen::Viewmap-»
-«IF not self.isFixedFont()-»
-	«stylesVar».add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createFontStyle());
-«ENDIF-»
-«IF not self.isFixedForeground()-»
-	«stylesVar».add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createLineStyle());
-«ENDIF-»
-«IF not self.isFixedBackground()-»
-	«stylesVar».add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createFillStyle());
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE addTextStyle(stylesVar : String) FOR gmfgen::LabelModelFacet»«ENDDEFINE»
-«DEFINE addTextStyle(stylesVar : String) FOR gmfgen::DesignLabelModelFacet»«stylesVar».add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDescriptionStyle());
-«ENDDEFINE»
-
-«DEFINE addLinkedDiagramStyle(stylesVar : String) FOR gmfgen::GenCommonBase»«EXPAND addLinkedDiagramStyle(stylesVar) FOREACH behaviour»«ENDDEFINE»
-«DEFINE addLinkedDiagramStyle(stylesVar : String) FOR gmfgen::Behaviour»«ENDDEFINE»
-«DEFINE addLinkedDiagramStyle(stylesVar : String) FOR gmfgen::OpenDiagramBehaviour-»
-«IF diagramKind <> null-»
-	{
-		org.eclipse.gmf.runtime.notation.HintedDiagramLinkStyle diagramFacet = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createHintedDiagramLinkStyle();
-		diagramFacet.setHint("«diagramKind»");«EXPAND xpt::Common::nonNLS»
-		«stylesVar».add(diagramFacet);
-	}
-«ELSE-»
-		«stylesVar».add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createHintedDiagramLinkStyle());
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE addCustomStyles(stylesVar : String) FOR gmfgen::GenCommonBase-»
-«FOREACH styles AS style-»
-	«stylesVar».add(«EXPAND MetaModel::NewInstance FOR style»);
-«ENDFOREACH-»
-«ENDDEFINE»
-
-// external node and link labels' offset
-
-«DEFINE offset(String viewVar) FOR gmfgen::GenLabel»«ENDDEFINE»
-
-«DEFINE offset(String viewVar) FOR gmfgen::GenLinkLabel-»
-«IF labelOffsetX(viewmap, 0) <> 0 or labelOffsetY(viewmap, 0) <> 0-»
-	«EXPAND offset(viewVar, labelOffsetX(viewmap, 0), labelOffsetY(viewmap, 0))-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE offset(String viewVar) FOR gmfgen::GenExternalNodeLabel»«EXPAND offset(viewVar, 0, 5)»«ENDDEFINE»
-
-// viewVar must be already inserted into a diagram (view.getDiagram() should be meaningful)
-«DEFINE offset(String viewVar, x : Integer, y : Integer) FOR gmfgen::GenLabel-»
-	org.eclipse.gmf.runtime.notation.Location location«visualID» = (org.eclipse.gmf.runtime.notation.Location) «viewVar».getLayoutConstraint();
-«IF self.getDiagram().isPixelMapMode()-»
-	location«visualID».setX(«x»);
-	location«visualID».setY(«y»);
-«ELSE-»
-	location«visualID».setX(org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper.getMapMode(«viewVar».getDiagram().getMeasurementUnit()).DPtoLP(«x»));
-	location«visualID».setY(org.eclipse.gmf.runtime.diagram.ui.util.MeasurementUnitHelper.getMapMode(«viewVar».getDiagram().getMeasurementUnit()).DPtoLP(«y»));
-«ENDIF-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt
deleted file mode 100644
index 50948f55f08..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ActionBarContributor.xpt
+++ /dev/null
@@ -1,73 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::GenEditorGenerator»
-
-«DEFINE ActionBarContributor FOR gmfgen::GenEditorView-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «actionBarContributorClassName»«EXPAND extendsList» {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected Class getEditorClass() {
-		return «getQualifiedClassName()».class;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected String getEditorId() {
-		return «getQualifiedClassName()».ID;
-	}
-	«EXPAND initMethod-»
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenEditorView» extends org.eclipse.gmf.runtime.diagram.ui.parts.DiagramActionBarContributor«ENDDEFINE»
-
-«DEFINE initMethod FOR gmfgen::GenEditorView»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void init(org.eclipse.ui.IActionBars bars, org.eclipse.ui.IWorkbenchPage page) {
-		super.init(bars, page);
-		// print preview
-		org.eclipse.jface.action.IMenuManager fileMenu = bars.getMenuManager().findMenuUsingPath(org.eclipse.ui.IWorkbenchActionConstants.M_FILE);
-		«EXPAND xpt::Common::_assert('fileMenu != null')-»
-«IF editorGen.plugin.printingEnabled-»
-		org.eclipse.jface.action.IAction printPreviewAction = new org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.RenderedPrintPreviewAction(new org.eclipse.gmf.runtime.diagram.ui.printing.render.actions.EnhancedPrintActionHelper());
-		fileMenu.insertBefore("print", printPreviewAction);«EXPAND xpt::Common::nonNLS»
-«ELSE-»
-		fileMenu.remove("pageSetupAction");«EXPAND xpt::Common::nonNLS»
-«ENDIF-»
-«IF /*hasAudits || hasMetrics */editorGen.diagram.validationEnabled or hasAudits(editorGen) or (editorGen.metrics <> null and editorGen.metrics.metrics->size() > 0)-»
-		org.eclipse.jface.action.IMenuManager editMenu = bars.getMenuManager().findMenuUsingPath(org.eclipse.ui.IWorkbenchActionConstants.M_EDIT);
-		«EXPAND xpt::Common::_assert('editMenu != null')-»
-		if (editMenu.find("validationGroup") == null) {«EXPAND xpt::Common::nonNLS»
-			editMenu.add(new org.eclipse.jface.action.GroupMarker("validationGroup"));«EXPAND xpt::Common::nonNLS»
-		}
-«IF editorGen.diagram.validationEnabled or hasAudits(editorGen)-»
-		org.eclipse.jface.action.IAction validateAction = new «EXPAND xpt::editor::ValidateAction::qualifiedClassName FOR editorGen.diagram»(page);
-		editMenu.appendToGroup("validationGroup", validateAction);«EXPAND xpt::Common::nonNLS»
-«ENDIF-»
-«IF editorGen.metrics <> null and editorGen.metrics.metrics->size() > 0-»
-		org.eclipse.jface.action.IAction metricsAction = new «editorGen.diagram.getMetricProviderQualifiedClassName()».MetricsAction(page);
-		editMenu.appendToGroup("validationGroup", metricsAction);«EXPAND xpt::Common::nonNLS»
-«ENDIF-»
-«ENDIF /*hasAudits || hasMetrics */-»
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenEditorView»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/CreationWizard.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/CreationWizard.xpt
deleted file mode 100644
index e929c123358..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/CreationWizard.xpt
+++ /dev/null
@@ -1,185 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::editor::Utils»
-«EXTENSION xpt::editor::GenDiagram»
-
-«DEFINE CreationWizard FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «creationWizardClassName»
-		extends org.eclipse.jface.wizard.Wizard implements org.eclipse.ui.INewWizard {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.IWorkbench workbench;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-    protected org.eclipse.jface.viewers.IStructuredSelection selection;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «getCreationWizardPageQualifiedClassName()» diagramModelFilePage;
-	«IF standaloneDomainModel(self)-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «getCreationWizardPageQualifiedClassName()» domainModelFilePage;
-	«ENDIF-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.emf.ecore.resource.Resource diagram;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private boolean openNewlyCreatedDiagramEditor = true;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-    public org.eclipse.ui.IWorkbench getWorkbench() {
-        return workbench;
-    }
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.jface.viewers.IStructuredSelection getSelection() {
-        return selection;
-    }
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public final org.eclipse.emf.ecore.resource.Resource getDiagram() {
-		return diagram;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public final boolean isOpenNewlyCreatedDiagramEditor() {
-		return openNewlyCreatedDiagramEditor;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setOpenNewlyCreatedDiagramEditor(boolean openNewlyCreatedDiagramEditor) {
-		this.openNewlyCreatedDiagramEditor = openNewlyCreatedDiagramEditor;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void init(org.eclipse.ui.IWorkbench workbench, org.eclipse.jface.viewers.IStructuredSelection selection) {
-        this.workbench = workbench;
-        this.selection = selection;
-		setWindowTitle(«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForCreationWizard(self))) FOR editorGen»);
-		setDefaultPageImageDescriptor(«editorGen.plugin.getActivatorQualifiedClassName()».getBundledImageDescriptor(
-				"icons/wizban/New«IF domainDiagramElement <> null»«domainDiagramElement.genPackage.prefix»«ENDIF»Wizard.gif")); //$NON-NLS-1$
-		setNeedsProgressMonitor(true);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void addPages() {
-		diagramModelFilePage = new «getCreationWizardPageQualifiedClassName()»(
-				"DiagramModelFile", getSelection(), "«editorGen.diagramFileExtension»"); //$NON-NLS-1$ //$NON-NLS-2$
-		diagramModelFilePage.setTitle(«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForCreationWizardDiagramPage(self))) FOR editorGen»);
-		diagramModelFilePage.setDescription(«EXPAND xpt::Externalizer::accessorCall(descriptionKey(i18nKeyForCreationWizardDiagramPage(self))) FOR editorGen»);
-		addPage(diagramModelFilePage);
-	«IF standaloneDomainModel(self)-»
-
-		domainModelFilePage = new «getCreationWizardPageQualifiedClassName()»(
-				"DomainModelFile", getSelection(), "«editorGen.domainFileExtension»") { //$NON-NLS-1$ //$NON-NLS-2$
-
-			public void setVisible(boolean visible) {
-				if (visible) {
-					String fileName = diagramModelFilePage.getFileName();
-					fileName = fileName.substring(0, fileName.length() - ".«editorGen.diagramFileExtension»".length()); //$NON-NLS-1$
-					setFileName(«getDiagramEditorUtilQualifiedClassName()».getUniqueFileName(
-							getContainerFullPath(), fileName, "«editorGen.domainFileExtension»")); //$NON-NLS-1$
-				}
-				super.setVisible(visible);
-			}
-		};
-		domainModelFilePage.setTitle(«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForCreationWizardDomainPage(self))) FOR editorGen»);
-		domainModelFilePage.setDescription(«EXPAND xpt::Externalizer::accessorCall(descriptionKey(i18nKeyForCreationWizardDomainPage(self))) FOR editorGen»);
-		addPage(domainModelFilePage);
-	«ENDIF-»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean performFinish() {
-		org.eclipse.jface.operation.IRunnableWithProgress op =
-	«IF editorGen.application = null-»
-				new org.eclipse.ui.actions.WorkspaceModifyOperation(null) {
-
-			protected void execute(org.eclipse.core.runtime.IProgressMonitor monitor)
-					throws org.eclipse.core.runtime.CoreException, InterruptedException {
-	«ELSE-»
-				new org.eclipse.jface.operation.IRunnableWithProgress() {
-
-			public void run(org.eclipse.core.runtime.IProgressMonitor monitor)
-					throws InvocationTargetException, InterruptedException {
-	«ENDIF-»
-				diagram = «getDiagramEditorUtilQualifiedClassName()».createDiagram(diagramModelFilePage.getURI(),
-	«IF standaloneDomainModel(self)-»
-						domainModelFilePage.getURI(),
-	«ENDIF-»
-						monitor);
-				if (isOpenNewlyCreatedDiagramEditor() && diagram != null) {
-					try {
-						«getDiagramEditorUtilQualifiedClassName()».openDiagram(diagram);
-					} catch (org.eclipse.ui.PartInitException e) {
-						org.eclipse.jface.dialogs.ErrorDialog.openError(getContainer().getShell(),
-								«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardOpenEditorError(self)) FOR editorGen», null, e.getStatus());
-					}
-				}
-			}
-		};
-		try {
-			getContainer().run(false, true, op);
-		} catch (InterruptedException e) {
-			return false;
-		} catch (java.lang.reflect.InvocationTargetException e) {
-			if (e.getTargetException() instanceof org.eclipse.core.runtime.CoreException) {
-				org.eclipse.jface.dialogs.ErrorDialog.openError(getContainer().getShell(),
-						«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardCreationError(self)) FOR editorGen», null,
-						((org.eclipse.core.runtime.CoreException) e.getTargetException()).getStatus());
-			} else {
-				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-						"Error creating diagram", e.getTargetException()); //$NON-NLS-1$
-			}
-			return false;
-		}
-		return diagram != null;
-	}
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForCreationWizard(self)), 'New ' + editorGen.modelID + ' Diagram')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForCreationWizardDiagramPage(self)), 'Create ' + editorGen.modelID + ' Diagram')-»
-«EXPAND xpt::Externalizer::messageEntry(descriptionKey(i18nKeyForCreationWizardDiagramPage(self)), (if standaloneDomainModel(self) then 'Select file that will contain diagram model.' else 'Select file that will contain diagram and domain models.' endif))-»
-«IF standaloneDomainModel(self)-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForCreationWizardDomainPage(self)), 'Create ' + editorGen.modelID + ' Domain Model')-»
-«EXPAND xpt::Externalizer::messageEntry(descriptionKey(i18nKeyForCreationWizardDomainPage(self)), 'Select file that will contain domain model.')-»
-«ENDIF-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForCreationWizardOpenEditorError(self), 'Error opening diagram editor')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForCreationWizardCreationError(self), 'Creation Problems')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForCreationWizard(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForCreationWizardDiagramPage(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(descriptionKey(i18nKeyForCreationWizardDiagramPage(self)))-»
-	«IF standaloneDomainModel(self)-»
-	«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForCreationWizardDomainPage(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(descriptionKey(i18nKeyForCreationWizardDomainPage(self)))-»
-	«ENDIF-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForCreationWizardOpenEditorError(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForCreationWizardCreationError(self))-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt
deleted file mode 100644
index ca29be1d752..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/CreationWizardPage.xpt
+++ /dev/null
@@ -1,108 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::editor::Utils»
-
-«DEFINE CreationWizardPage FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «creationWizardPageClassName» extends
-	«IF editorGen.application = null-»
-		org.eclipse.ui.dialogs.WizardNewFileCreationPage
-	«ELSE-»
-		«editorGen.application.packageName».WizardNewFileCreationPage
-	«ENDIF-»
-		{
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final String fileExtension;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «creationWizardPageClassName»(String pageName,
-			org.eclipse.jface.viewers.IStructuredSelection selection, String fileExtension) {
-		super(pageName, selection);
-		this.fileExtension = fileExtension;
-	}
-
-	/**
-	 * Override to create files with this extension.
-	 * 
-	 * @generated
-	 */
-	protected String getExtension() {
-		return fileExtension;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.common.util.URI getURI() {
-	«IF editorGen.application = null-»
-		return org.eclipse.emf.common.util.URI.createPlatformResourceURI(getFilePath().toString(), false);
-	«ELSE-»
-		return org.eclipse.emf.common.util.URI.createFileURI(getFilePath().toString());
-	«ENDIF-»
-	}
-	«IF editorGen.application = null-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.core.runtime.IPath getFilePath() {
-		org.eclipse.core.runtime.IPath path = getContainerFullPath();
-		if (path == null) {
-			path = new org.eclipse.core.runtime.Path(""); //$NON-NLS-1$
-		}
-		String fileName = getFileName();
-		if (fileName != null) {
-			path = path.append(fileName);
-		}
-		return path;
-	}
-	«ENDIF-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void createControl(org.eclipse.swt.widgets.Composite parent) {
-		super.createControl(parent);
-		setFileName(«getDiagramEditorUtilQualifiedClassName()».getUniqueFileName(
-				getContainerFullPath(), getFileName(), getExtension()));
-		setPageComplete(validatePage());
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean validatePage() {
-		if (!super.validatePage()) {
-			return false;
-		}
-		String extension = getExtension();
-		if (extension != null && !getFilePath().toString().endsWith("." + extension)) {
-			setErrorMessage(org.eclipse.osgi.util.NLS.bind(
-					«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreationWizardPageExtensionError(self)) FOR editorGen», extension));
-			return false;
-		}
-		return true;
-	}
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForCreationWizardPageExtensionError(self), 'File name should have {0} extension.')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForCreationWizardPageExtensionError(self))-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DeleteElementAction.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DeleteElementAction.xpt
deleted file mode 100644
index c5919d80ab5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DeleteElementAction.xpt
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Michael Golubev - non generated code moved to GMF-Tooling runtime
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE className FOR gmfgen::GenDiagram»DeleteElementAction«ENDDEFINE»
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«editorGen.editor.packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenDiagram»extends org.eclipse.gmf.tooling.runtime.actions.DefaultDeleteElementAction«ENDDEFINE»
-
-«DEFINE DeleteElementAction FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND className» «EXPAND extendsList» {
-
-	«EXPAND _constructor»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «EXPAND className»(org.eclipse.ui.IWorkbenchPart part) {
-		super(part);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
deleted file mode 100644
index f9f9f312074..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramContentInitializer.xpt
+++ /dev/null
@@ -1,176 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::updater::Utils»
-
-«DEFINE DiagramContentInitializer FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «diagramContentInitializerClassName» {
-
-	«EXPAND attributes-»
-
-	«EXPAND initDiagramContent-»
-	
-	«EXPAND createChildren FOREACH getAllContainers()->select(container | not container.sansDomain)-»
-	
-	«EXPAND createNode-»
-	
-	«EXPAND createLinks-»
-	«IF not (getAllContainers())[gmfgen::GenCompartment]->isEmpty()-»
-	
-		«EXPAND getCompartment-»
-	«ENDIF-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private java.util.Map myDomain2NotationMap = new java.util.HashMap();
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private java.util.Collection myLinkDescriptors = new java.util.LinkedList();
-«ENDDEFINE»
-
-«DEFINE initDiagramContent FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void initDiagramContent(org.eclipse.gmf.runtime.notation.Diagram diagram) {
-	if (!«EXPAND xpt::editor::VisualIDRegistry::modelID».equals(diagram.getType())) {
-		«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Incorrect diagram passed as a parameter: " + diagram.getType());
-		return;
-	}
-	if («EXPAND MetaModel::NotInstance('diagram.getElement()') FOR domainDiagramElement») {
-		«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Incorrect diagram element specified: " + diagram.getElement() + " instead of «domainDiagramElement.ecoreClass.name»");
-		return;
-	}
-	«EXPAND createChildrenMethodName»(diagram);
-	createLinks(diagram);
-}
-«ENDDEFINE»
-
-«DEFINE createChildrenMethodName FOR gmfgen::GenContainerBase»create«getUniqueIdentifier()»Children«ENDDEFINE»
-
-«DEFINE createChildren FOR gmfgen::GenContainerBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private void «EXPAND createChildrenMethodName»(org.eclipse.gmf.runtime.notation.View view) {
-	«EXPAND collectContainedLinks-»
-	«IF hasSemanticChildren(self)-»
-	java.util.Collection childNodeDescriptors = «EXPAND xpt::diagram::updater::DiagramUpdater::getSemanticChildrenMethodCall»(view);
-	for (java.util.Iterator it = childNodeDescriptors.iterator(); it.hasNext();) {
-		createNode(view, («getDiagram().editorGen.diagramUpdater.getNodeDescriptorQualifiedClassName()») it.next());
-	}
-	«ENDIF-»
-	«EXPAND createCompartmentsChildren-»
-}
-«ENDDEFINE»
-
-«DEFINE collectContainedLinks FOR gmfgen::GenContainerBase»«ENDDEFINE»
-
-«DEFINE collectContainedLinks FOR gmfgen::GenNode-»
-	myDomain2NotationMap.put(view.getElement(), view);
-	myLinkDescriptors.addAll(«EXPAND xpt::diagram::updater::DiagramUpdater::getOutgoingLinksMethodCall»(view));
-«ENDDEFINE»
-
-«DEFINE createCompartmentsChildren FOR gmfgen::GenContainerBase»«ENDDEFINE»
-
-«DEFINE createCompartmentsChildren FOR gmfgen::GenNode-»
-	«EXPAND callCreateCompartmentChildren FOREACH compartments»
-«ENDDEFINE»
-
-«REM»
-	Will be called for each compartment of GenNode for GenNode.isSansDomain() == false. 
-	if !GenNode.isSansDomain() => !GenCompartment.isSansDomain() so should not check 
-	!this.isSansDomain() here.
-«ENDREM»
-«DEFINE callCreateCompartmentChildren FOR gmfgen::GenCompartment-»
-	«EXPAND createChildrenMethodName»(getCompartment(view, «EXPAND xpt::editor::VisualIDRegistry::visualID»));
-«ENDDEFINE»
-
-«DEFINE createNode FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private void createNode(org.eclipse.gmf.runtime.notation.View parentView, «editorGen.diagramUpdater.getNodeDescriptorQualifiedClassName()» nodeDescriptor) {
-	final String nodeType = «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall('nodeDescriptor.getVisualID()')»;
-	org.eclipse.gmf.runtime.notation.Node node = org.eclipse.gmf.runtime.diagram.core.services.ViewService.createNode(parentView, nodeDescriptor.getModelElement(), nodeType, «EXPAND xpt::plugin::Activator::preferenceHintAccess FOR editorGen»);
-	switch (nodeDescriptor.getVisualID()) {
-	«EXPAND createNodeCase FOREACH getAllNodes()->select(node | not node.sansDomain)-»
-	}
-}
-«ENDDEFINE»
-
-«DEFINE createNodeCase FOR gmfgen::GenContainerBase-»
-«EXPAND xpt::Common::caseVisualID»
-	«EXPAND createChildrenMethodName»(node);
-	return;
-«ENDDEFINE»
-
-«REM»Adopt this code to work with links to links«ENDREM»
-«DEFINE createLinks FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private void createLinks(org.eclipse.gmf.runtime.notation.Diagram diagram) {
-	for (boolean continueLinkCreation = true; continueLinkCreation;) {
-		continueLinkCreation = false;
-		java.util.Collection additionalDescriptors = new java.util.LinkedList();
-		for (java.util.Iterator it = myLinkDescriptors.iterator(); it.hasNext();) {
-			«editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName()» nextLinkDescriptor = («editorGen.diagramUpdater.getLinkDescriptorQualifiedClassName()») it.next();
-			if (!myDomain2NotationMap.containsKey(nextLinkDescriptor.getSource()) || !myDomain2NotationMap.containsKey(nextLinkDescriptor.getDestination())) {
-				continue;
-			}
-			final String linkType = «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall('nextLinkDescriptor.getVisualID()')»;
-			org.eclipse.gmf.runtime.notation.Edge edge = org.eclipse.gmf.runtime.diagram.core.services.ViewService.getInstance().createEdge(nextLinkDescriptor.getSemanticAdapter(), diagram, linkType, org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.APPEND, true, «EXPAND xpt::plugin::Activator::preferenceHintAccess FOR editorGen»);
-			if (edge != null) {
-				edge.setSource((org.eclipse.gmf.runtime.notation.View) myDomain2NotationMap.get(nextLinkDescriptor.getSource()));
-				edge.setTarget((org.eclipse.gmf.runtime.notation.View) myDomain2NotationMap.get(nextLinkDescriptor.getDestination()));
-				it.remove();
-				if (nextLinkDescriptor.getModelElement() != null) {
-					myDomain2NotationMap.put(nextLinkDescriptor.getModelElement(), edge);
-				}
-				continueLinkCreation = true;
-				switch (nextLinkDescriptor.getVisualID()) {
-	«EXPAND createLinksCase FOREACH links->select(link | null <> link.getMetaClass())-»
-				}
-			}
-		}
-		myLinkDescriptors.addAll(additionalDescriptors);
-	}
-}
-«ENDDEFINE»
-
-«DEFINE createLinksCase FOR gmfgen::GenLink-»
-«EXPAND xpt::Common::caseVisualID»
-	additionalDescriptors.addAll(«EXPAND xpt::diagram::updater::DiagramUpdater::getOutgoingLinksMethodCall»(edge));
-	break;
-«ENDDEFINE»
-
-«DEFINE getCompartment FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.gmf.runtime.notation.Node getCompartment(org.eclipse.gmf.runtime.notation.View node, int visualID) {
-	String type = «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall('visualID')»;
-	for (java.util.Iterator it = node.getChildren().iterator(); it.hasNext();) {
-		org.eclipse.gmf.runtime.notation.View nextView = (org.eclipse.gmf.runtime.notation.View) it.next();
-		if (nextView instanceof org.eclipse.gmf.runtime.notation.Node && type.equals(nextView.getType())) {
-			return (org.eclipse.gmf.runtime.notation.Node) nextView;
-		}
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramEditorContextMenuProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramEditorContextMenuProvider.xpt
deleted file mode 100644
index 8e818ce4a69..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramEditorContextMenuProvider.xpt
+++ /dev/null
@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE className FOR gmfgen::GenDiagram»DiagramEditorContextMenuProvider«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«editorGen.editor.packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE DiagramEditorContextMenuProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND className» extends org.eclipse.gmf.runtime.diagram.ui.providers.DiagramContextMenuProvider {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.IWorkbenchPart part;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «EXPAND xpt::editor::DeleteElementAction::qualifiedClassName» deleteAction;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public DiagramEditorContextMenuProvider(org.eclipse.ui.IWorkbenchPart part, org.eclipse.gef.EditPartViewer viewer) {
-		super(part, viewer);
-		this.part = part;
-		deleteAction = new «EXPAND xpt::editor::DeleteElementAction::qualifiedClassName»(part);
-		deleteAction.init();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void dispose() {
-		if (deleteAction != null) {
-			deleteAction.dispose();
-			deleteAction = null;
-		}
-		super.dispose();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void buildContextMenu(final org.eclipse.jface.action.IMenuManager menu) {
-		getViewer().flush();
-		try {
-			org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(
-					(org.eclipse.emf.ecore.EObject) getViewer().getContents().getModel()).runExclusive(new Runnable() {
-
-				public void run() {
-					org.eclipse.gmf.runtime.common.ui.services.action.contributionitem.ContributionItemService.getInstance().contributeToPopupMenu(
-							DiagramEditorContextMenuProvider.this, part);
-					menu.remove(org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds.ACTION_DELETE_FROM_MODEL);
-					menu.appendToGroup("editGroup", deleteAction);
-				}
-			});
-		} catch (Exception e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Error building context menu", e);
-		}
-	}
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
deleted file mode 100644
index 1583434f570..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DiagramEditorUtil.xpt
+++ /dev/null
@@ -1,401 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::editor::GenDiagram»
-«EXTENSION xpt::editor::Utils»
-
-«DEFINE DiagramEditorUtil FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «diagramEditorUtilClassName» {
-
-«EXPAND saveOptions-»
-
-«EXPAND openDiagramMethod-»
-«IF editorGen.application = null-»
-
-	«EXPAND setCharsetMethods-»
-«ENDIF-»
-
-«EXPAND getUniqueFileNameMethod-»
-
-«IF editorGen.application <> null»
-	/**
-	 * Allows user to select file and loads it as a model.
-	 * 
-	 * @generated
-	 */
-	public static org.eclipse.emf.ecore.resource.Resource openModel(
-			org.eclipse.swt.widgets.Shell shell, String description, org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain) {
-		org.eclipse.swt.widgets.FileDialog fileDialog = new org.eclipse.swt.widgets.FileDialog(shell, org.eclipse.swt.SWT.OPEN);
-		if (description != null) {
-			fileDialog.setText(description);
-		}
-		fileDialog.open();
-		String fileName = fileDialog.getFileName();
-		if (fileName == null || fileName.length() == 0) {
-			return null;
-		}
-		if (fileDialog.getFilterPath() != null) {
-			fileName = fileDialog.getFilterPath() + java.io.File.separator + fileName;
-		}
-		org.eclipse.emf.common.util.URI uri = org.eclipse.emf.common.util.URI.createFileURI(fileName);
-		org.eclipse.emf.ecore.resource.Resource resource = null;
-		try {
-			resource = editingDomain.getResourceSet().getResource(uri, true);
-		} catch (org.eclipse.emf.common.util.WrappedException we) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Unable to load resource: " + uri, we); «EXPAND xpt::Common::nonNLS»
-			org.eclipse.jface.dialogs.MessageDialog.openError(shell, 
-                «EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForOpenModelResourceErrorDialog(self))) FOR editorGen»,
-				org.eclipse.osgi.util.NLS.bind(
-				    «EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForOpenModelResourceErrorDialog(self))) FOR editorGen»,
-				    fileName));
-		}
-		return resource;
-	}
-«ENDIF»
-
-	/**
-	 * Runs the wizard in a dialog.
-	 * 
-	 * @generated
-	 */
-	public static void runWizard(org.eclipse.swt.widgets.Shell shell, org.eclipse.jface.wizard.Wizard wizard, String settingsKey) {
-		org.eclipse.jface.dialogs.IDialogSettings pluginDialogSettings = «editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getDialogSettings();
-		org.eclipse.jface.dialogs.IDialogSettings wizardDialogSettings = pluginDialogSettings.getSection(settingsKey);
-		if (wizardDialogSettings == null) {
-			wizardDialogSettings = pluginDialogSettings.addNewSection(settingsKey);
-		}
-		wizard.setDialogSettings(wizardDialogSettings);
-		org.eclipse.jface.wizard.WizardDialog dialog = new org.eclipse.jface.wizard.WizardDialog(shell, wizard);
-		dialog.create();
-		dialog.getShell().setSize(Math.max(500, dialog.getShell().getSize().x), 500);
-		dialog.open();
-	}
-
-«EXPAND createDiagramMethod-»
-«IF domainDiagramElement <> null»
-	«EXPAND createInitialModelMethod»
-	«EXPAND attachModelMethod»
-	«IF hasDocumentRoot(self)»«EXPAND createDocumentRootMethod»«ENDIF»
-«ENDIF»
-
-«EXPAND selectElementsMethod»
-«EXPAND findElementsMethod»
-«EXPAND findViewMethod»
-
-«EXPAND additions»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE saveOptions FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static «EXPAND CodeStyle::G2('java.util.Map', '?', '?')» getSaveOptions() {
-		«EXPAND CodeStyle::newGenericInstance2('saveOptions', 'java.util.HashMap', 'String', 'Object')»();
-		saveOptions.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_ENCODING, "UTF-8"); «EXPAND xpt::Common::nonNLS»
-		saveOptions.put(org.eclipse.emf.ecore.resource.Resource.OPTION_SAVE_ONLY_IF_CHANGED, org.eclipse.emf.ecore.resource.Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-		return saveOptions;
-	}
-«ENDDEFINE»
-
-«DEFINE openDiagramMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static boolean openDiagram(org.eclipse.emf.ecore.resource.Resource diagram) throws org.eclipse.ui.PartInitException {
-«IF editorGen.application = null-»
-		String path = diagram.getURI().toPlatformString(true);
-		org.eclipse.core.resources.IResource workspaceResource = org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().findMember(new org.eclipse.core.runtime.Path(path));
-		if (workspaceResource instanceof org.eclipse.core.resources.IFile) {
-			org.eclipse.ui.IWorkbenchPage page = org.eclipse.ui.PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-			return null != page.openEditor(new org.eclipse.ui.part.FileEditorInput((org.eclipse.core.resources.IFile) workspaceResource), «editorGen.editor.getQualifiedClassName()».ID);
-		}
-		return false;
-«ELSE-»
-		org.eclipse.ui.IWorkbenchPage page = org.eclipse.ui.PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
-		page.openEditor(new org.eclipse.emf.common.ui.URIEditorInput(diagram.getURI()), «editorGen.editor.getQualifiedClassName()».ID);
-		return true;
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE setCharsetMethods FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void setCharset(org.eclipse.core.resources.IFile file) {
-		if (file == null) {
-			return;
-		}
-		try {
-			file.setCharset("UTF-8", new org.eclipse.core.runtime.NullProgressMonitor()); «EXPAND xpt::Common::nonNLS»
-		} catch (org.eclipse.core.runtime.CoreException e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Unable to set charset for file " + file.getFullPath(), e); «EXPAND xpt::Common::nonNLS»
-		}
-	}	
-«ENDDEFINE»
-
-«DEFINE getUniqueFileNameMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static String getUniqueFileName(org.eclipse.core.runtime.IPath containerFullPath, String fileName, String extension) {
-		return org.eclipse.gmf.tooling.runtime.part.DefaultDiagramEditorUtil.getUniqueFileName(containerFullPath, fileName, extension, «-»
-			org.eclipse.gmf.tooling.runtime.part.DefaultDiagramEditorUtil.«IF editorGen.application = null»EXISTS_IN_WORKSPACE«ELSE»EXISTS_AS_IO_FILE«ENDIF»);
-	}
-«ENDDEFINE»
-
-«DEFINE createDiagramMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment((if editorGen.application = null then 'This method should be called within a workspace modify operation since it creates resources.' else '' endif))»
-	public static org.eclipse.emf.ecore.resource.Resource createDiagram(org.eclipse.emf.common.util.URI diagramURI,«IF standaloneDomainModel(self)» org.eclipse.emf.common.util.URI modelURI,«ENDIF» org.eclipse.core.runtime.IProgressMonitor progressMonitor) {
-		org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain = org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory.INSTANCE.createEditingDomain();
-		progressMonitor.beginTask(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreateDiagramProgressTask(self)) FOR editorGen», 3);
-		final org.eclipse.emf.ecore.resource.Resource diagramResource = editingDomain.getResourceSet().createResource(diagramURI);
-«IF standaloneDomainModel(self)-»
-		final org.eclipse.emf.ecore.resource.Resource modelResource = editingDomain.getResourceSet().createResource(modelURI);
-«ELSEIF domainDiagramElement <> null and hasDocumentRoot(self) /*for standalone models, we assume its resourcefactory would be able to set extendedMetaData option*/-»
-		((org.eclipse.emf.ecore.xmi.XMLResource) diagramResource).getDefaultSaveOptions().put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-		((org.eclipse.emf.ecore.xmi.XMLResource) diagramResource).getDefaultLoadOptions().put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_EXTENDED_META_DATA, Boolean.TRUE);
-«ENDIF-»
-		final String diagramName = diagramURI.lastSegment();
-		org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand command = new org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand(editingDomain, «EXPAND xpt::Externalizer::accessorCall(i18nKeyForCreateDiagramCommandLabel(self)) FOR editorGen», java.util.Collections.EMPTY_LIST) {
-			protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-«IF domainDiagramElement <> null-»
-				«EXPAND MetaModel::QualifiedClassName FOR domainDiagramElement» model = createInitialModel();
-				attachModelToResource(model, «IF standaloneDomainModel(self)»model«ELSE»diagram«ENDIF»Resource);
-«ENDIF»
-				org.eclipse.gmf.runtime.notation.Diagram diagram = org.eclipse.gmf.runtime.diagram.core.services.ViewService.createDiagram(
-«IF domainDiagramElement <> null-»
-				«EXPAND MetaModel::DowncastToEObject('model') FOR domainDiagramElement», 
-«ENDIF-»
-					«EXPAND xpt::editor::VisualIDRegistry::modelID», «EXPAND xpt::plugin::Activator::preferenceHintAccess FOR editorGen»);
-				if (diagram != null) {
-					diagramResource.getContents().add(diagram);
-					diagram.setName(diagramName);
-«IF domainDiagramElement <> null-»
-					diagram.setElement(«EXPAND MetaModel::DowncastToEObject('model') FOR domainDiagramElement»);
-«ENDIF-»
-				}
-				
-				try {
-					«IF standaloneDomainModel(self)»modelResource.save(«EXPAND xpt::Common::getSaveOptions»);«ENDIF»
-					diagramResource.save(«EXPAND xpt::Common::getSaveOptions»);
-				} catch (java.io.IOException e) {
-					«/* TODO CommandResult.newErrorCommandResult(e) would be better? Or even throw ExecutionEx?*/»
-					«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Unable to store model and diagram resources", e); «EXPAND xpt::Common::nonNLS»
-				}
-				return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
-			}
-		};
-		try {
-			org.eclipse.core.commands.operations.OperationHistoryFactory.getOperationHistory().execute(command, new org.eclipse.core.runtime.SubProgressMonitor(progressMonitor, 1), null);
-		} catch (org.eclipse.core.commands.ExecutionException e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Unable to create model and diagram", e); «EXPAND xpt::Common::nonNLS»
-		}
-«IF editorGen.application = null-»
-		«IF standaloneDomainModel(self)»setCharset(org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(modelResource));«ENDIF»
-		setCharset(org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(diagramResource));
-«ENDIF-»
-		return diagramResource;
-	}
-«ENDDEFINE»
-
-«DEFINE createInitialModelMethod FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment('Create a new instance of domain element associated with canvas.\n<!-- begin-user-doc -->\n<!-- end-user-doc -->')»
-	private static «EXPAND MetaModel::QualifiedClassName FOR domainDiagramElement» createInitialModel() {
-		return «EXPAND MetaModel::NewInstance FOR domainDiagramElement»;
-	}
-«ENDDEFINE»
-
-«DEFINE attachModelMethod FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment('Store model element in the resource.\n<!-- begin-user-doc -->\n<!-- end-user-doc -->')»
-	private static void attachModelToResource(«EXPAND MetaModel::QualifiedClassName FOR domainDiagramElement» model, org.eclipse.emf.ecore.resource.Resource resource) {
-		resource.getContents().add(«IF hasDocumentRoot(self)»createDocumentRoot(model)«ELSE»«EXPAND MetaModel::DowncastToEObject('model') FOR domainDiagramElement»«ENDIF»);
-	}
-«ENDDEFINE»
-
-// invoke only when there's DocumentRoot in the domain model
-«DEFINE createDocumentRootMethod FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static «EXPAND MetaModel::QualifiedClassName FOR getDocumentRoot(self)» createDocumentRoot(«EXPAND MetaModel::QualifiedClassName FOR domainDiagramElement» model) {
-		«IF domainDiagramElement = getDocumentRoot(self)»
-		return model;
-		«ELSE»
-			«EXPAND MetaModel::NewInstance('docRoot') FOR getDocumentRoot(self)»
-			«LET getDocumentRootSetFeature(self) AS f»«IF f.oclIsUndefined()-»
-		docRoot.set«domainDiagramElement.ecoreClass.name»(model); // FIXME name of the set method is pure guess«ELSE-»
-		«EXPAND MetaModel::modifyFeature('docRoot', getDocumentRoot(self), 'model') FOR f»«ENDIF»
-			«ENDLET-»
-		return docRoot;
-		«ENDIF»
-	}
-«ENDDEFINE»
-
-// FIXME only metrics and audits use selectElementsInDiagram and findView (and hence LazyElement2ViewMap and findElementsInDiagramByID)
-// methods, thus it's reasonable to generate these methods iff Metrics or Audits are enabled.
-
-«DEFINE selectElementsMethod FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void selectElementsInDiagram(org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart diagramPart, «EXPAND CodeStyle::G('java.util.List', 'org.eclipse.gef.EditPart')» editParts) {
-		diagramPart.getDiagramGraphicalViewer().deselectAll();
-
-		org.eclipse.gef.EditPart firstPrimary = null;
-		«EXPAND CodeStyle::iterate('nextPart', 'org.eclipse.gef.EditPart', 'editParts')-»
-			diagramPart.getDiagramGraphicalViewer().appendSelection(nextPart);
-			if(firstPrimary == null && nextPart instanceof org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart) {
-				firstPrimary = nextPart;
-			}
-		}
-
-		if(!editParts.isEmpty()) {
-			diagramPart.getDiagramGraphicalViewer().reveal(firstPrimary != null ? firstPrimary : (org.eclipse.gef.EditPart)editParts.get(0));
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE findElementsMethod FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static int findElementsInDiagramByID(org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramPart, org.eclipse.emf.ecore.EObject element, «EXPAND CodeStyle::G('java.util.List', 'org.eclipse.gef.EditPart')» editPartCollector) {
-		org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer viewer = (org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramGraphicalViewer) diagramPart.getViewer();
-		final int intialNumOfEditParts = editPartCollector.size();
-		
-		if (element instanceof org.eclipse.gmf.runtime.notation.View) { // support notation element lookup
-			org.eclipse.gef.EditPart editPart = (org.eclipse.gef.EditPart) viewer.getEditPartRegistry().get(element);
-			if (editPart != null) {
-				editPartCollector.add(editPart);
-				return 1;
-			}
-		}
-
-		String elementID = org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil.getProxyID(element);
-		«EXPAND CodeStyle::SuppressWarnings('"unchecked"')-»
-		«EXPAND CodeStyle::G('java.util.List', 'org.eclipse.gef.EditPart')» associatedParts = viewer.findEditPartsForElement(elementID, org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart.class);
-		// perform the possible hierarchy disjoint -> take the top-most parts only
-		«EXPAND CodeStyle::iterate('nextPart', 'org.eclipse.gef.EditPart', 'associatedParts')-»
-			org.eclipse.gef.EditPart parentPart = nextPart.getParent();
-			while (parentPart != null && !associatedParts.contains(parentPart)) {
-				parentPart = parentPart.getParent();
-			}
-			if (parentPart == null) {
-				editPartCollector.add(nextPart);
-			}
-		}
-
-		if (intialNumOfEditParts == editPartCollector.size()) {
-			if (!associatedParts.isEmpty()) {
-				editPartCollector.add(associatedParts.get(0));
-			} else {
-				if (element.eContainer() != null) {
-					return findElementsInDiagramByID(diagramPart, element.eContainer(), editPartCollector);
-				}
-			}
-		}
-		return editPartCollector.size() - intialNumOfEditParts;
-	}
-«ENDDEFINE»
-
-«DEFINE findViewMethod FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static org.eclipse.gmf.runtime.notation.View findView(org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramEditPart, org.eclipse.emf.ecore.EObject targetElement, LazyElement2ViewMap lazyElement2ViewMap) {
-		boolean hasStructuralURI = false;						
-		if(targetElement.eResource() instanceof org.eclipse.emf.ecore.xmi.XMLResource) {
-			hasStructuralURI = ((org.eclipse.emf.ecore.xmi.XMLResource)targetElement.eResource()).getID(targetElement) == null;
-		}
-		
-		org.eclipse.gmf.runtime.notation.View view = null;
-		«EXPAND CodeStyle::newGenericInstance('editPartHolder', 'java.util.LinkedList', 'org.eclipse.gef.EditPart')»();
-		if(hasStructuralURI && !lazyElement2ViewMap.getElement2ViewMap().isEmpty()) {
-			view = «EXPAND CodeStyle::castTyped('org.eclipse.gmf.runtime.notation.View')»lazyElement2ViewMap.getElement2ViewMap().get(targetElement);
-		} else if (findElementsInDiagramByID(diagramEditPart, targetElement, editPartHolder) > 0) {
-			org.eclipse.gef.EditPart editPart = «EXPAND CodeStyle::castTyped('org.eclipse.gef.EditPart')»editPartHolder.get(0);
-			view = editPart.getModel() instanceof org.eclipse.gmf.runtime.notation.View ? (org.eclipse.gmf.runtime.notation.View) editPart.getModel() : null;
-		}
-	
-		return (view == null) ? diagramEditPart.getDiagramView() : view;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment('XXX This is quite suspicious code (especially editPartTmpHolder) and likely to be removed soon')»
-	public static class LazyElement2ViewMap {
-		«EXPAND xpt::Common::generatedMemberComment»
-		private «EXPAND CodeStyle::G2('java.util.Map', 'org.eclipse.emf.ecore.EObject', 'org.eclipse.gmf.runtime.notation.View')» element2ViewMap;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.gmf.runtime.notation.View scope;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private «EXPAND CodeStyle::G('java.util.Set', '? extends org.eclipse.emf.ecore.EObject')» elementSet;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public LazyElement2ViewMap(org.eclipse.gmf.runtime.notation.View scope, «EXPAND CodeStyle::G('java.util.Set', '? extends org.eclipse.emf.ecore.EObject')» elements) {
-			this.scope = scope;
-			this.elementSet = elements;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public final «EXPAND CodeStyle::G2('java.util.Map', 'org.eclipse.emf.ecore.EObject', 'org.eclipse.gmf.runtime.notation.View')» getElement2ViewMap() {
-			if(element2ViewMap == null) {
-				element2ViewMap = new «EXPAND CodeStyle::G2('java.util.HashMap', 'org.eclipse.emf.ecore.EObject', 'org.eclipse.gmf.runtime.notation.View')»();
-				// map possible notation elements to itself as these can't be found by view.getElement()
-				«EXPAND CodeStyle::iterate('element', 'org.eclipse.emf.ecore.EObject', 'elementSet')-»
-					if(element instanceof org.eclipse.gmf.runtime.notation.View) {
-						org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) element;
-						if(view.getDiagram() == scope.getDiagram()) {
-							element2ViewMap.put(element, view); // take only those that part of our diagram
-						}
-					}
-				}
-				
-				buildElement2ViewMap(scope, element2ViewMap, elementSet);					
-			}
-			return element2ViewMap;
-		}
-		«EXPAND xpt::Common::generatedMemberComment»
-		private static boolean buildElement2ViewMap(org.eclipse.gmf.runtime.notation.View parentView, «EXPAND CodeStyle::G2('java.util.Map', 'org.eclipse.emf.ecore.EObject', 'org.eclipse.gmf.runtime.notation.View')» element2ViewMap, «EXPAND CodeStyle::G('java.util.Set', '? extends org.eclipse.emf.ecore.EObject')» elements) {
-			if (elements.size() == element2ViewMap.size()) {
-				return true;
-			}
-
-			if(parentView.isSetElement() && !element2ViewMap.containsKey(parentView.getElement()) && elements.contains(parentView.getElement())) {
-				element2ViewMap.put(parentView.getElement(), parentView);
-				if (elements.size() == element2ViewMap.size()) {
-					return true;
-				}
-			}
-			boolean complete = false;
-			for («EXPAND CodeStyle::G('java.util.Iterator', '?')» it = parentView.getChildren().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((org.eclipse.gmf.runtime.notation.View) it.next(), element2ViewMap, elements);			
-			}
-			for («EXPAND CodeStyle::G('java.util.Iterator', '?')» it = parentView.getSourceEdges().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((org.eclipse.gmf.runtime.notation.View) it.next(), element2ViewMap, elements);			
-			}
-			for («EXPAND CodeStyle::G('java.util.Iterator', '?')» it = parentView.getTargetEdges().iterator(); it.hasNext() && !complete;) {
-				complete = buildElement2ViewMap((org.eclipse.gmf.runtime.notation.View) it.next(), element2ViewMap, elements);			
-			}	
-			return complete;
-		}
-	} //LazyElement2ViewMap	
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForOpenModelResourceErrorDialog(self)))-»
-«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForOpenModelResourceErrorDialog(self)))-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForCreateDiagramProgressTask(self))-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForCreateDiagramCommandLabel(self))-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForOpenModelResourceErrorDialog(self)), 'Error')-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForOpenModelResourceErrorDialog(self)), 'Failed to load model file {0}')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForCreateDiagramProgressTask(self), 'Creating diagram and model files')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForCreateDiagramCommandLabel(self), 'Creating diagram and model')-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
deleted file mode 100644
index 87c3bba479a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/DocumentProvider.xpt
+++ /dev/null
@@ -1,742 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::editor::Utils»
-
-«DEFINE DocumentProvider FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «documentProviderClassName» extends org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.AbstractDocumentProvider implements org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocumentProvider {
-	
-	«EXPAND createElementInfo-»
-	
-	«EXPAND createDocument-»
-	
-	«EXPAND setupDocument-»
-	
-	«EXPAND computeModificationStamp-»
-	
-	«EXPAND createEmptyDocument-»
-	
-	«EXPAND createEditingDomain-»
-	
-	«EXPAND setDocumentContent-»
-	
-	«EXPAND getModificationStamp-»
-	
-	«EXPAND isDeleted-»
-	
-	«EXPAND getResourceSetInfo-»
-	
-	«EXPAND disposeElementInfo-»
-	«IF null = editorGen.application-»
-
-		«EXPAND doValidateState-»
-	«ENDIF-»
-	
-	«EXPAND isReadOnly-»
-	
-	«EXPAND isModifiable-»
-	
-	«EXPAND updateCache-»
-	
-	«EXPAND doUpdateStateCache-»
-	
-	«EXPAND isSynchronized-»
-	«IF null = editorGen.application-»
-		
-		«EXPAND getResetRule-»
-	
-		«EXPAND getSaveRule-»
-	
-		«EXPAND getSynchronizeRule-»
-	
-		«EXPAND getValidateStateRule-»
-	
-		«EXPAND computeSchedulingRule-»
-	«ENDIF-»
-	
-	«EXPAND doSynchronize-»
-	
-	«EXPAND doSaveDocument-»
-	
-	«EXPAND handleElementChanged-»
-
-	«EXPAND handleElementMoved-»
-
-	«EXPAND createInputWithEditingDomain-»
-
-	«EXPAND getDiagramDocument-»
-	
-	«EXPAND getOperationRunner-»
-	«IF null <> editorGen.application-»
-
-		«EXPAND getFile-»
-	«ENDIF-»
-	
-	«EXPAND xpt::editor::ResourceSetInfo::ResourceSetInfo-»
-	
-	«EXPAND xpt::editor::ResourceSetModificationListener::ResourceSetModificationListener-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE createElementInfo FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected ElementInfo createElementInfo(Object element) throws org.eclipse.core.runtime.CoreException {
-	«EXPAND checkEditorInputInstance-»
-	org.eclipse.ui.IEditorInput editorInput = (org.eclipse.ui.IEditorInput) element;
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument document = (org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument) createDocument(editorInput);
-
-	ResourceSetInfo info = new ResourceSetInfo(document, editorInput);
-	info.setModificationStamp(computeModificationStamp(info));
-	info.fStatus = null;
-	return info;
-}
-«ENDDEFINE»
-
-«DEFINE checkEditorInputInstance FOR gmfgen::GenDiagram-»
-if («IF null = editorGen.application»false == element instanceof «EXPAND fileEditorInputClassFQName» && «ENDIF»false == element instanceof «EXPAND uriEditorInputClassFQName») {
-	«EXPAND throwIncorrectInputException-»
-}
-«ENDDEFINE»
-
-«DEFINE throwIncorrectInputException FOR gmfgen::GenDiagram-»
-throw new org.eclipse.core.runtime.CoreException(new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.IStatus.ERROR, «editorGen.plugin.getActivatorQualifiedClassName()».ID, 0, 
-		org.eclipse.osgi.util.NLS.bind(
-			«EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentProviderIncorrectInputError(self)) FOR editorGen»,
-			new Object[] {element, «IF null = editorGen.application»"«EXPAND fileEditorInputClassFQName»", «ENDIF»"«EXPAND uriEditorInputClassFQName»"}),«EXPAND xpt::Common::nonNLS(1)»«IF null = editorGen.application»«EXPAND xpt::Common::nonNLS(2)»«ENDIF» 
-		null));
-«ENDDEFINE»
-
-«DEFINE fileEditorInputClassFQName FOR gmfgen::GenDiagram»org.eclipse.ui.part.FileEditorInput«ENDDEFINE»
-
-«DEFINE uriEditorInputClassFQName FOR gmfgen::GenDiagram»org.eclipse.emf.common.ui.URIEditorInput«ENDDEFINE»
-
-«DEFINE createDocument FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument createDocument(Object element) throws org.eclipse.core.runtime.CoreException {
-	«EXPAND checkEditorInputInstance-»
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument document = createEmptyDocument();
-	setDocumentContent(document, (org.eclipse.ui.IEditorInput) element);
-	setupDocument(element, document);
-	return document;
-}
-«ENDDEFINE»
-
-«DEFINE setupDocument FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment(
-		'Sets up the given document as it would be provided for the given element. The\n' + 
-		'content of the document is not changed. This default implementation is empty.\n' + 
-		'Subclasses may reimplement.\n' + 
-		'\n' + 
-		'@param element the blue-print element\n' + 
-		'@param document the document to set up'
-	)»
-protected void setupDocument(Object element, org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument document) {
-	// for subclasses
-}
-«ENDDEFINE»
-
-«DEFINE computeModificationStamp FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private long computeModificationStamp(ResourceSetInfo info) {
-	int result = 0;
-	«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-	«IF null = editorGen.application-»
-		org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(nextResource);
-		if (file != null) {
-			if (file.getLocation() != null) {
-				result += file.getLocation().toFile().lastModified();
-			} else {
-				result += file.getModificationStamp();
-			}
-		}
-	«ELSE-»
-		java.io.File file = getFile(nextResource);
-		if (file != null && file.exists()) {
-			result += file.lastModified();
-		}
-	«ENDIF-»
-	}
-	return result;
-}
-«ENDDEFINE»
-
-«DEFINE createEmptyDocument FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument createEmptyDocument() {
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument document = new org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.DiagramDocument();
-	document.setEditingDomain(createEditingDomain());
-	return document;
-}
-«ENDDEFINE»
-
-«DEFINE createEditingDomain FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.emf.transaction.TransactionalEditingDomain createEditingDomain() {
-	org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain = org.eclipse.gmf.runtime.diagram.core.DiagramEditingDomainFactory.getInstance().createEditingDomain();
-	editingDomain.setID("«editingDomainID»");«EXPAND xpt::Common::nonNLS»
-	final org.eclipse.emf.transaction.NotificationFilter diagramResourceModifiedFilter = org.eclipse.emf.transaction.NotificationFilter.createNotifierFilter(editingDomain.getResourceSet()).and(org.eclipse.emf.transaction.NotificationFilter.createEventTypeFilter(org.eclipse.emf.common.notify.Notification.ADD)).and(org.eclipse.emf.transaction.NotificationFilter.createFeatureFilter(org.eclipse.emf.ecore.resource.ResourceSet.class, org.eclipse.emf.ecore.resource.ResourceSet.RESOURCE_SET__RESOURCES));
-	editingDomain.getResourceSet().eAdapters().add(new org.eclipse.emf.common.notify.Adapter() {
-
-		private org.eclipse.emf.common.notify.Notifier myTarger;
-
-		public org.eclipse.emf.common.notify.Notifier getTarget() {
-			return myTarger;
-		}
-
-		public boolean isAdapterForType(Object type) {
-			return false;
-		}
-
-		public void notifyChanged(org.eclipse.emf.common.notify.Notification notification) {
-			if (diagramResourceModifiedFilter.matches(notification)) {
-				Object value = notification.getNewValue();
-				if (value instanceof org.eclipse.emf.ecore.resource.Resource) {
-					((org.eclipse.emf.ecore.resource.Resource) value).setTrackingModification(true);
-				}
-			}
-		}
-
-		public void setTarget(org.eclipse.emf.common.notify.Notifier newTarget) {
-			myTarger = newTarget;
-		}
-			
-	});	
-	
-	return editingDomain;
-}
-«ENDDEFINE»
-
-«DEFINE setDocumentContent FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void setDocumentContent(org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument document, org.eclipse.ui.IEditorInput element) throws org.eclipse.core.runtime.CoreException {
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument diagramDocument = (org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument) document;
-	org.eclipse.emf.transaction.TransactionalEditingDomain domain = diagramDocument.getEditingDomain();
-	«IF null = editorGen.application»if (element instanceof «EXPAND fileEditorInputClassFQName») {
-		org.eclipse.core.resources.IStorage storage = ((«EXPAND fileEditorInputClassFQName») element).getStorage();
-		org.eclipse.gmf.runtime.notation.Diagram diagram = org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.util.DiagramIOUtil.load(domain, storage, true, getProgressMonitor());
-		document.setContent(diagram);
-	} else «ENDIF»if(element instanceof «EXPAND uriEditorInputClassFQName») {
-		org.eclipse.emf.common.util.URI uri = ((«EXPAND uriEditorInputClassFQName») element).getURI();
-		org.eclipse.emf.ecore.resource.Resource resource = null;
-		try {
-			resource = domain.getResourceSet().getResource(uri.trimFragment(), false);
-			if (resource == null) {
-				resource = domain.getResourceSet().createResource(uri.trimFragment());
-			}
-			if (!resource.isLoaded()) {
-				try {
-					java.util.Map options = new java.util.HashMap(org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory.getDefaultLoadOptions());
-					// @see 171060 
-					// options.put(org.eclipse.emf.ecore.xmi.XMLResource.OPTION_RECORD_UNKNOWN_FEATURE, Boolean.TRUE);
-					resource.load(options);
-				} catch (java.io.IOException e) {
-					resource.unload();
-					throw e;
-				}
-			}
-			if (uri.fragment() != null) {
-				org.eclipse.emf.ecore.EObject rootElement = resource.getEObject(uri.fragment());
-				if (rootElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-					document.setContent((org.eclipse.gmf.runtime.notation.Diagram) rootElement);
-					return;
-				}
-			} else {
-				for (java.util.Iterator it = resource.getContents().iterator(); it.hasNext();) {
-					Object rootElement = it.next();
-					if (rootElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-						document.setContent((org.eclipse.gmf.runtime.notation.Diagram) rootElement);
-						return;
-					}
-				}
-			}
-			throw new RuntimeException(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentProviderNoDiagramInResourceError(self)) FOR editorGen»);
-		} catch (Exception e) {
-			org.eclipse.core.runtime.CoreException thrownExcp = null;
-			if (e instanceof org.eclipse.core.runtime.CoreException) {
-				thrownExcp = (org.eclipse.core.runtime.CoreException) e;
-			} else {
-				String msg = e.getLocalizedMessage();
-				thrownExcp = new org.eclipse.core.runtime.CoreException(new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.IStatus.ERROR, «editorGen.plugin.getActivatorQualifiedClassName()».ID, 0, 
-				msg != null ? msg : «EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentProviderDiagramLoadingError(self)) FOR editorGen», e));
-			}
-			throw thrownExcp;
-		}
-	} else {
-	«EXPAND throwIncorrectInputException-»
-	}	
-}
-«ENDDEFINE»
-
-«DEFINE getModificationStamp FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public long getModificationStamp(Object element) {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		return computeModificationStamp(info);
-	}
-	return super.getModificationStamp(element);
-}
-«ENDDEFINE»
-
-«DEFINE isDeleted FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isDeleted(Object element) {
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument document = getDiagramDocument(element);
-	if (document != null) {
-		org.eclipse.emf.ecore.resource.Resource diagramResource = document.getDiagram().eResource();
-		if (diagramResource != null) {
-	«IF null = editorGen.application-»
-			org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(diagramResource);
-			return file == null || file.getLocation() == null || !file.getLocation().toFile().exists();
-	«ELSE-»
-			java.io.File file = getFile(diagramResource);
-			return file != null && !file.exists();
-	«ENDIF-»
-		}
-	}
-	return super.isDeleted(element);
-}
-«ENDDEFINE»
-
-«DEFINE getResourceSetInfo FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public ResourceSetInfo getResourceSetInfo(Object editorInput) {
-	return (ResourceSetInfo) super.getElementInfo(editorInput);
-}
-«ENDDEFINE»
-
-«DEFINE disposeElementInfo FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void disposeElementInfo(Object element, ElementInfo info) {
-	if (info instanceof ResourceSetInfo) {
-		ResourceSetInfo resourceSetInfo = (ResourceSetInfo) info;
-		resourceSetInfo.dispose();
-	}
-	super.disposeElementInfo(element, info);
-}
-«ENDDEFINE»
-
-«DEFINE doValidateState FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void doValidateState(Object element, Object computationContext) throws org.eclipse.core.runtime.CoreException {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND CodeStyle::newGenericInstance('files2Validate', 'java.util.LinkedList', 'org.eclipse.core.resources.IFile')»();
-		«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-			org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null && file.isReadOnly()) {
-				files2Validate.add(file);
-			}
-		}
-		org.eclipse.core.resources.ResourcesPlugin.getWorkspace().validateEdit((org.eclipse.core.resources.IFile[]) files2Validate.toArray(new org.eclipse.core.resources.IFile[files2Validate.size()]), computationContext);
-	}
-
-	super.doValidateState(element, computationContext);
-}
-«ENDDEFINE»
-
-«DEFINE isReadOnly FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isReadOnly(Object element) {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND callUpdateCache-»
-		return info.isReadOnly();
-	}
-	return super.isReadOnly(element);
-}
-«ENDDEFINE»
-
-«DEFINE isModifiable FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isModifiable(Object element) {
-	if (!isStateValidated(element)) {
-		if («IF null = editorGen.application»element instanceof «EXPAND fileEditorInputClassFQName» || «ENDIF»element instanceof «EXPAND uriEditorInputClassFQName») {
-			return true;
-		}
-	}
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND callUpdateCache-»
-		return info.isModifiable();
-	}
-	return super.isModifiable(element);
-}
-«ENDDEFINE»
-
-«DEFINE callUpdateCache FOR gmfgen::GenDiagram-»
-if (info.isUpdateCache()) {
-	try {
-		updateCache(element);
-	} catch (org.eclipse.core.runtime.CoreException ex) {
-		«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentProviderIsModifiable(self)) FOR editorGen», ex);
-		// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.StorageDocumentProvider_isModifiable
-	}
-}
-«ENDDEFINE»
-
-«DEFINE updateCache FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void updateCache(Object element) throws org.eclipse.core.runtime.CoreException {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-	«IF null = editorGen.application-»
-			org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null && file.isReadOnly()) {
-	«ELSE-»
-			java.io.File file = getFile(nextResource);
-			if (file != null && file.exists() && !file.canWrite()) {
-	«ENDIF-»
-				info.setReadOnly(true);
-				info.setModifiable(false);
-				return;
-			}
-		}
-		info.setReadOnly(false);
-		info.setModifiable(true);
-		return;
-	}
-}
-«ENDDEFINE»
-
-«DEFINE doUpdateStateCache FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void doUpdateStateCache(Object element) throws org.eclipse.core.runtime.CoreException {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		info.setUpdateCache(true);
-	}
-	super.doUpdateStateCache(element);
-}
-«ENDDEFINE»
-
-«DEFINE isSynchronized FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isSynchronized(Object element) {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		return info.isSynchronized();
-	}
-	return super.isSynchronized(element);
-}
-«ENDDEFINE»
-
-«DEFINE getResetRule FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.core.runtime.jobs.ISchedulingRule getResetRule(Object element) {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND CodeStyle::newGenericInstance('rules', 'java.util.LinkedList', 'org.eclipse.core.runtime.jobs.ISchedulingRule')»();
-		«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-			org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null) {
-				rules.add(org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(file));
-			}
-		}
-		return new org.eclipse.core.runtime.jobs.MultiRule((org.eclipse.core.runtime.jobs.ISchedulingRule[]) rules.toArray(new org.eclipse.core.runtime.jobs.ISchedulingRule[rules.size()]));
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getSaveRule FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.core.runtime.jobs.ISchedulingRule getSaveRule(Object element) {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND CodeStyle::newGenericInstance('rules', 'java.util.LinkedList', 'org.eclipse.core.runtime.jobs.ISchedulingRule')»();
-		«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-			org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null) {
-				rules.add(computeSchedulingRule(file));
-			}
-		}
-		return new org.eclipse.core.runtime.jobs.MultiRule((org.eclipse.core.runtime.jobs.ISchedulingRule[]) rules.toArray(new org.eclipse.core.runtime.jobs.ISchedulingRule[rules.size()]));
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getSynchronizeRule FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.core.runtime.jobs.ISchedulingRule getSynchronizeRule(Object element) {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND CodeStyle::newGenericInstance('rules', 'java.util.LinkedList', 'org.eclipse.core.runtime.jobs.ISchedulingRule')»();
-		«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-			org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null) {
-				rules.add(org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRuleFactory().refreshRule(file));
-			}
-		}
-		return new org.eclipse.core.runtime.jobs.MultiRule((org.eclipse.core.runtime.jobs.ISchedulingRule[]) rules.toArray(new org.eclipse.core.runtime.jobs.ISchedulingRule[rules.size()]));
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getValidateStateRule FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.core.runtime.jobs.ISchedulingRule getValidateStateRule(Object element) {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND CodeStyle::newGenericInstance('files', 'java.util.LinkedList', 'org.eclipse.core.runtime.jobs.ISchedulingRule')»();
-		«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-			org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(nextResource);
-			if (file != null) {
-				files.add(file);
-			}
-		}
-		return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRuleFactory().validateEditRule((org.eclipse.core.resources.IFile[]) files.toArray(new org.eclipse.core.resources.IFile[files.size()]));
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE computeSchedulingRule FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.core.runtime.jobs.ISchedulingRule computeSchedulingRule(org.eclipse.core.resources.IResource toCreateOrModify) {
-	if (toCreateOrModify.exists())
-		return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRuleFactory().modifyRule(toCreateOrModify);
-
-	org.eclipse.core.resources.IResource parent = toCreateOrModify;
-	do {
-		/*
-		 * XXX This is a workaround for
-		 * https://bugs.eclipse.org/bugs/show_bug.cgi?id=67601
-		 * IResourceRuleFactory.createRule should iterate the hierarchy
-		 * itself.
-		 */
-		toCreateOrModify = parent;
-		parent = toCreateOrModify.getParent();
-	} while (parent != null && !parent.exists());
-
-	return org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRuleFactory().createRule(toCreateOrModify);
-}
-«ENDDEFINE»
-
-«DEFINE doSynchronize FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void doSynchronize(Object element, org.eclipse.core.runtime.IProgressMonitor monitor) throws org.eclipse.core.runtime.CoreException {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-			handleElementChanged(info, nextResource, monitor);	
-		}
-		return;
-	}
-	super.doSynchronize(element, monitor);
-}
-«ENDDEFINE»
-
-«DEFINE handleElementChanged FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void handleElementChanged(ResourceSetInfo info, org.eclipse.emf.ecore.resource.Resource changedResource, org.eclipse.core.runtime.IProgressMonitor monitor) {
-	«IF null = editorGen.application-»
-	org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(changedResource);
-	if (file != null) {
-		try {
-			file.refreshLocal(org.eclipse.core.resources.IResource.DEPTH_INFINITE, monitor);
-		} catch (org.eclipse.core.runtime.CoreException ex) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentProviderHandleElementContentChanged(self)) FOR editorGen», ex);
-			// Error message to log was initially taken from org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide.internal.l10n.EditorMessages.FileDocumentProvider_handleElementContentChanged
-		}
-	}
-	«ENDIF-»
-	changedResource.unload();
-	
-	fireElementContentAboutToBeReplaced(info.getEditorInput());
-	removeUnchangedElementListeners(info.getEditorInput(), info);
-	info.fStatus = null;
-	try {
-		setDocumentContent(info.fDocument, info.getEditorInput());
-	} catch (org.eclipse.core.runtime.CoreException e) {
-		info.fStatus = e.getStatus();
-	}
-«REM»TODO: Remove this if and call setModificationStamp only from doSaveDocument method«ENDREM»«-»
-	if (!info.fCanBeSaved) {
-		info.setModificationStamp(computeModificationStamp(info));
-	}
-	addUnchangedElementListeners(info.getEditorInput(), info);
-	fireElementContentReplaced(info.getEditorInput());
-}
-«ENDDEFINE»
-
-«DEFINE doSaveDocument FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void doSaveDocument(org.eclipse.core.runtime.IProgressMonitor monitor, Object element, org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument document, boolean overwrite) throws org.eclipse.core.runtime.CoreException {
-	ResourceSetInfo info = getResourceSetInfo(element);
-	if (info != null) {
-		if (!overwrite && !info.isSynchronized()) {
-			throw new org.eclipse.core.runtime.CoreException(new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.IStatus.ERROR, «editorGen.plugin.getActivatorQualifiedClassName()».ID, 
-				«IF null = editorGen.application»org.eclipse.core.resources.IResourceStatus.OUT_OF_SYNC_LOCAL«ELSE»org.eclipse.core.runtime.IStatus.ERROR«ENDIF», 
-				«EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentUnsynchronizedFileSaveError(self)) FOR editorGen», 
-				null));
-		}
-	«IF null = editorGen.application-»
-		info.stopResourceListening();
-	«ENDIF-»
-		fireElementStateChanging(element);
-		try {
-			monitor.beginTask(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentSaveDiagramTask(self)) FOR editorGen», info.getResourceSet().getResources().size() + 1); //"Saving diagram"
-			«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'info.getLoadedResourcesIterator()')-»
-				monitor.setTaskName(org.eclipse.osgi.util.NLS.bind(
-						«EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentSaveNextResourceTask(self)) FOR editorGen», 
-						nextResource.getURI()));
-				if (nextResource.isLoaded() && !info.getEditingDomain().isReadOnly(nextResource)) {
-					try {
-						nextResource.save(«EXPAND xpt::Common::getSaveOptions»);
-					} catch (java.io.IOException e) {
-						fireElementStateChangeFailed(element);
-						throw new org.eclipse.core.runtime.CoreException(new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.IStatus.ERROR, «editorGen.plugin.getActivatorQualifiedClassName()».ID, org.eclipse.gmf.runtime.diagram.ui.resources.editor.internal.EditorStatusCodes.RESOURCE_FAILURE, e.getLocalizedMessage(), null));
-					}
-				}
-				monitor.worked(1);
-			}
-			monitor.done();
-			info.setModificationStamp(computeModificationStamp(info));
-		} catch (RuntimeException x) {
-			fireElementStateChangeFailed(element);
-			throw x;
-		} «IF null = editorGen.application» finally {
-			info.startResourceListening();
-		} «ENDIF»
-	} else {
-		org.eclipse.emf.common.util.URI newResoruceURI;
-		«EXPAND CodeStyle::G('java.util.List', 'org.eclipse.core.resources.IFile')» affectedFiles = null;
-		«IF null = editorGen.application»if (element instanceof «EXPAND fileEditorInputClassFQName») {
-			org.eclipse.core.resources.IFile newFile = ((«EXPAND fileEditorInputClassFQName») element).getFile();
-			affectedFiles = java.util.Collections.singletonList(newFile);
-			newResoruceURI = org.eclipse.emf.common.util.URI.createPlatformResourceURI(newFile.getFullPath().toString(), true);
-		} else «ENDIF»if(element instanceof «EXPAND uriEditorInputClassFQName») {
-			newResoruceURI = ((«EXPAND uriEditorInputClassFQName») element).getURI();
-		} else {
-			fireElementStateChangeFailed(element);
-			«EXPAND throwIncorrectInputException-»
-		}
-		if (false == document instanceof org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument) {
-			fireElementStateChangeFailed(element);
-			throw new org.eclipse.core.runtime.CoreException(new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.IStatus.ERROR, «editorGen.plugin.getActivatorQualifiedClassName()».ID, 0,
-			"Incorrect document used: " + document + " instead of org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument", null));«EXPAND xpt::Common::nonNLS(1)»«EXPAND xpt::Common::nonNLS(2)»
-		}
-		org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument diagramDocument = (org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument) document;
-		final org.eclipse.emf.ecore.resource.Resource newResource = diagramDocument.getEditingDomain().getResourceSet().createResource(newResoruceURI);
-		final org.eclipse.gmf.runtime.notation.Diagram diagramCopy = (org.eclipse.gmf.runtime.notation.Diagram) org.eclipse.emf.ecore.util.EcoreUtil.copy(diagramDocument.getDiagram());
-		try {
-			new org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand(diagramDocument.getEditingDomain(), org.eclipse.osgi.util.NLS.bind(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForDocumentSaveAs(self)) FOR editorGen», diagramCopy.getName()), affectedFiles) {
-				protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info) throws org.eclipse.core.commands.ExecutionException {
-					newResource.getContents().add(diagramCopy);					
-					return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
-				}
-			}.execute(monitor, null);
-			newResource.save(«EXPAND xpt::Common::getSaveOptions»);
-		} catch (org.eclipse.core.commands.ExecutionException e) {
-			fireElementStateChangeFailed(element);
-			throw new org.eclipse.core.runtime.CoreException(new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.IStatus.ERROR, «editorGen.plugin.getActivatorQualifiedClassName()».ID, 0, e.getLocalizedMessage(), null));
-		} catch (java.io.IOException e) {
-			fireElementStateChangeFailed(element);
-			throw new org.eclipse.core.runtime.CoreException(new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.IStatus.ERROR, «editorGen.plugin.getActivatorQualifiedClassName()».ID, 0, e.getLocalizedMessage(), null));
-		}
-		newResource.unload();
-	}
-}
-«ENDDEFINE»
-
-«DEFINE handleElementMoved FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void handleElementMoved(org.eclipse.ui.IEditorInput input, org.eclipse.emf.common.util.URI uri) {
-	«IF null = editorGen.application»if (input instanceof «EXPAND fileEditorInputClassFQName») {
-		org.eclipse.core.resources.IFile newFile = org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot().getFile(new org.eclipse.core.runtime.Path(org.eclipse.emf.common.util.URI.decode(uri.path())).removeFirstSegments(1));
-		fireElementMoved(input, newFile == null ? null : new org.eclipse.ui.part.FileEditorInput(newFile));
-		return;
-	}«ENDIF»
-	// TODO: append suffix to the URI! (use diagram as a parameter)
-	fireElementMoved(input, new org.eclipse.emf.common.ui.URIEditorInput(uri));
-}
-«ENDDEFINE»
-
-«DEFINE createInputWithEditingDomain FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.ui.IEditorInput createInputWithEditingDomain(org.eclipse.ui.IEditorInput editorInput, org.eclipse.emf.transaction.TransactionalEditingDomain domain) {
-	return editorInput;
-}
-«ENDDEFINE»
-
-«DEFINE getDiagramDocument FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument getDiagramDocument(Object element) {
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument doc = getDocument(element);
-	if (doc instanceof org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument) {
-		return (org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument) doc;
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getOperationRunner FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.jface.operation.IRunnableContext getOperationRunner(org.eclipse.core.runtime.IProgressMonitor monitor) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getFile FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private static java.io.File getFile(org.eclipse.emf.ecore.resource.Resource resource) {
-	org.eclipse.emf.common.util.URI resourceUri = resource.getURI();
-	if (resourceUri != null && resourceUri.isFile()) {
-		java.io.File file = new java.io.File(resourceUri.toFileString());
-		if (!file.isDirectory()) {
-			return file;
-		}
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentProviderIsModifiable(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentProviderHandleElementContentChanged(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentProviderIncorrectInputError(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentProviderNoDiagramInResourceError(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentProviderDiagramLoadingError(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentUnsynchronizedFileSaveError(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentSaveDiagramTask(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentSaveNextResourceTask(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForDocumentSaveAs(self))-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentProviderIsModifiable(self), 'Updating cache failed')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentProviderHandleElementContentChanged(self), 'Failed to refresh hierarchy for changed resource')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentProviderIncorrectInputError(self), (if 'Incorrect element used: {0} instead of ' + editorGen.application.repr() = null then '{1} or {2}' else '{1}' endif))-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentProviderNoDiagramInResourceError(self), 'Diagram is not present in resource')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentProviderDiagramLoadingError(self), 'Error loading diagram')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentUnsynchronizedFileSaveError(self), 'The file has been changed on the file system')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentSaveDiagramTask(self), 'Saving diagram')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentSaveNextResourceTask(self), 'Saving {0}')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForDocumentSaveAs(self), 'Saving {0} diagram as')-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/Editor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/Editor.xpt
deleted file mode 100644
index 8cd0061dd78..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/Editor.xpt
+++ /dev/null
@@ -1,443 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::editor::Utils»
-
-«DEFINE Editor FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «className»  extends org.eclipse.gmf.runtime.diagram.ui.resources.editor.parts.DiagramDocumentEditor«EXPAND implementsList FOR getEditorImplementsList(self)» {
-
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-	
-	«EXPAND getContextID-»
-	«EXPAND createPaletteRoot FOR editorGen.diagram.palette-»
-	
-	«EXPAND getPreferencesHint-»
-	
-	«EXPAND getContributorId-»
-	«EXPAND getAdapter-»
-	
-	«EXPAND getDocumentProvider-»
-	
-	«EXPAND getEditingDomain-»
-	
-	«EXPAND setDocumentProvider-»
-	«IF isIDEMode(self)-»
-	
-		«EXPAND gotoMarker-»
-		
-		«EXPAND isSaveAsAllowed-»
-		
-		«EXPAND doSaveAs-»
-		
-		«EXPAND performSaveAs-»
-		
-		«EXPAND getShowInContext-»
-		«EXPAND getNavigatorSelection FOR editorGen.navigator-»
-	«ENDIF-»
-
-	«EXPAND configureGraphicalViewer-»
-
-	«IF editorGen.diagram.generateCreateShortcutAction()-»
-	
-		«EXPAND initializeGraphicalViewer-»
-		
-		«EXPAND controlLastClickPositionProviderService»
-		
-		«EXPAND dispose»
-		
-		«EXPAND DropTargetListener-»
-	«ENDIF-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static final String ID = "«iD»"; «EXPAND xpt::Common::nonNLS»
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-public static final String CONTEXT_ID = "«contextID»"; «EXPAND xpt::Common::nonNLS»
-	
-	«IF editorGen.diagram.generateCreateShortcutAction()-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.gmf.tooling.runtime.part.LastClickPositionProvider myLastClickPositionProvider;
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public «className»() {
-	super(«null <> editorGen.diagram.palette and editorGen.diagram.palette.flyout»);
-}
-«ENDDEFINE»
-
-«DEFINE getContextID FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected String getContextID() {
-	return CONTEXT_ID;
-}
-«ENDDEFINE»
-
-«DEFINE createPaletteRoot FOR gmfgen::Palette-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gef.palette.PaletteRoot createPaletteRoot(org.eclipse.gef.palette.PaletteRoot existingPaletteRoot) {
-	org.eclipse.gef.palette.PaletteRoot root = super.createPaletteRoot(existingPaletteRoot);
-	new «getFactoryQualifiedClassName()»().fillPalette(root);
-	return root;
-}
-«ENDDEFINE»
-
-«DEFINE getPreferencesHint FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint getPreferencesHint() {
-«REM» 
-	XXX seems better we use preference store directly (in configureGraphicalViewer) instead all these indirect ids 
-«ENDREM»«-»
-	return «EXPAND xpt::plugin::Activator::preferenceHintAccess FOR editorGen»;
-}
-«ENDDEFINE»
-
-«DEFINE getContributorId FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public String getContributorId() {
-	return «editorGen.plugin.getActivatorQualifiedClassName()».ID;
-}
-«ENDDEFINE»
-
-«DEFINE getAdapter FOR gmfgen::GenEditorView-»
-«IF not hasPropertySheet(self) or hasNavigator(self)-»
-	
-«EXPAND xpt::Common::generatedMemberComment»
-«EXPAND CodeStyle::SuppressWarnings('"rawtypes"') FOR editorGen-»
-public Object getAdapter(Class type) {
-	«IF not hasPropertySheet(self)-»
-	if (type == org.eclipse.ui.views.properties.IPropertySheetPage.class) {
-		return null;
-	}
-	«ENDIF-»
-	«IF hasNavigator(self)-»
-	if (type == org.eclipse.ui.part.IShowInTargetList.class) {
-		return new org.eclipse.ui.part.IShowInTargetList() {
-			public String[] getShowInTargetIds() {
-				return new String[] { org.eclipse.ui.navigator.resources.ProjectExplorer.VIEW_ID };
-			}
-		};
-	}
-	«ENDIF-»
-	return super.getAdapter(type);
-}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getDocumentProvider FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider getDocumentProvider(org.eclipse.ui.IEditorInput input) {
-	if («EXPAND checkEditorInput») {
-		return «editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getDocumentProvider();
-	}
-	return super.getDocumentProvider(input);
-}
-«ENDDEFINE»
-
-«DEFINE getEditingDomain FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.emf.transaction.TransactionalEditingDomain getEditingDomain() {
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocument document = getEditorInput() != null ? getDocumentProvider().getDocument(getEditorInput()) : null;
-	if (document instanceof org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument) {
-		return ((org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument) document).getEditingDomain();
-	}
-	return super.getEditingDomain();
-}
-«ENDDEFINE»
-
-«DEFINE setDocumentProvider FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void setDocumentProvider(org.eclipse.ui.IEditorInput input) {
-	if («EXPAND checkEditorInput») {
-		setDocumentProvider(«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getDocumentProvider());
-	} else {
-		super.setDocumentProvider(input);
-	}
-}
-«ENDDEFINE»
-
-«DEFINE checkEditorInput FOR gmfgen::GenEditorView»«IF isIDEMode(self)»input instanceof org.eclipse.ui.IFileEditorInput || «ENDIF»input instanceof org.eclipse.emf.common.ui.URIEditorInput«ENDDEFINE»
-
-«DEFINE gotoMarker FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void gotoMarker(org.eclipse.core.resources.IMarker marker) {
-	org.eclipse.gmf.runtime.common.ui.services.marker.MarkerNavigationService.getInstance().gotoMarker(this, marker);
-}
-«ENDDEFINE»
-
-«DEFINE isSaveAsAllowed FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isSaveAsAllowed() {
-	return true;
-}
-«ENDDEFINE»
-
-«DEFINE doSaveAs FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void doSaveAs() {
-	performSaveAs(new org.eclipse.core.runtime.NullProgressMonitor());
-}
-«ENDDEFINE»
-
-«DEFINE performSaveAs FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void performSaveAs(org.eclipse.core.runtime.IProgressMonitor progressMonitor) {
-	org.eclipse.swt.widgets.Shell shell = getSite().getShell();
-	org.eclipse.ui.IEditorInput input = getEditorInput();
-	org.eclipse.ui.dialogs.SaveAsDialog dialog = new org.eclipse.ui.dialogs.SaveAsDialog(shell);
-	org.eclipse.core.resources.IFile original = input instanceof org.eclipse.ui.IFileEditorInput ? ((org.eclipse.ui.IFileEditorInput) input).getFile() : null;
-	if (original != null) {
-		dialog.setOriginalFile(original);
-	}
-	dialog.create();
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDocumentProvider provider = getDocumentProvider();
-	if (provider == null) {
-		// editor has been programmatically closed while the dialog was open
-		return;
-	}
-	if (provider.isDeleted(input) && original != null) {
-		String message = org.eclipse.osgi.util.NLS.bind(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForSavingDeletedFile(self)) FOR editorGen», original.getName());
-		dialog.setErrorMessage(null);
-		dialog.setMessage(message, org.eclipse.jface.dialogs.IMessageProvider.WARNING);
-	}
-	if (dialog.open() == org.eclipse.jface.window.Window.CANCEL) {
-		if (progressMonitor != null) {
-			progressMonitor.setCanceled(true);
-		}
-		return;
-	}
-	org.eclipse.core.runtime.IPath filePath = dialog.getResult();
-	if (filePath == null) {
-		if (progressMonitor != null) {
-			progressMonitor.setCanceled(true);
-		}
-		return;
-	}
-	org.eclipse.core.resources.IWorkspaceRoot workspaceRoot = org.eclipse.core.resources.ResourcesPlugin.getWorkspace().getRoot();
-	org.eclipse.core.resources.IFile file = workspaceRoot.getFile(filePath);
-	final org.eclipse.ui.IEditorInput newInput = new org.eclipse.ui.part.FileEditorInput(file);
-	// Check if the editor is already open
-	org.eclipse.ui.IEditorMatchingStrategy matchingStrategy = getEditorDescriptor().getEditorMatchingStrategy();
-	org.eclipse.ui.IEditorReference[] editorRefs = org.eclipse.ui.PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getEditorReferences();
-	for (int i = 0; i < editorRefs.length; i++) {
-		if (matchingStrategy.matches(editorRefs[i], newInput)) {
-			org.eclipse.jface.dialogs.MessageDialog.openWarning(shell, «EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForSaveAsProblems(self))) FOR editorGen», «EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForSaveAsProblems(self))) FOR editorGen»);
-			return;
-		}
-	}
-	boolean success = false;
-	try {
-		provider.aboutToChange(newInput);
-		getDocumentProvider(newInput).saveDocument(progressMonitor, newInput, getDocumentProvider().getDocument(getEditorInput()), true);
-		success = true;
-	} catch (org.eclipse.core.runtime.CoreException x) {
-		org.eclipse.core.runtime.IStatus status = x.getStatus();
-		if (status == null || status.getSeverity() != org.eclipse.core.runtime.IStatus.CANCEL) {
-			org.eclipse.jface.dialogs.ErrorDialog.openError(shell, «EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForSaveProblems(self))) FOR editorGen», «EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForSaveProblems(self))) FOR editorGen», x.getStatus());
-		}
-	} finally {
-		provider.changed(newInput);
-		if (success) {
-			setInput(newInput);
-		}
-	}
-	if (progressMonitor != null) {
-		progressMonitor.setCanceled(!success);
-	}
-}
-«ENDDEFINE»
-
-«DEFINE getShowInContext FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.ui.part.ShowInContext getShowInContext() {
-	return new org.eclipse.ui.part.ShowInContext(getEditorInput(), «IF hasNavigator(self)»getNavigatorSelection()«ELSE»getGraphicalViewer().getSelection()«ENDIF»);
-}
-«ENDDEFINE»
-
-«DEFINE getNavigatorSelection FOR gmfgen::GenNavigator-»
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.jface.viewers.ISelection getNavigatorSelection() {
-	org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument document = getDiagramDocument();
-	«EXPAND xpt::navigator::NavigatorLinkHelper::findSelectionBody-»
-}
-«ENDDEFINE»
-
-«DEFINE configureGraphicalViewer FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void configureGraphicalViewer() {
-		super.configureGraphicalViewer();
-		«EXPAND xpt::editor::DiagramEditorContextMenuProvider::qualifiedClassName FOR editorGen.diagram» provider =
-				new «EXPAND xpt::editor::DiagramEditorContextMenuProvider::qualifiedClassName FOR editorGen.diagram»(this, getDiagramGraphicalViewer());
-		getDiagramGraphicalViewer().setContextMenu(provider);
-		getSite().registerContextMenu(org.eclipse.gmf.runtime.diagram.ui.actions.ActionIds.DIAGRAM_EDITOR_CONTEXT_MENU, provider, getDiagramGraphicalViewer());
-	}
-«ENDDEFINE»
-
-«DEFINE initializeGraphicalViewer FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected void initializeGraphicalViewer() {
-	super.initializeGraphicalViewer();
-	«EXPAND addDropTargetListener('org.eclipse.jface.util.LocalSelectionTransfer.getTransfer()')-»
-	«EXPAND addDropTargetListener('org.eclipse.emf.edit.ui.dnd.LocalTransfer.getInstance()')-»
-	startupLastClickPositionProvider();
-}
-«ENDDEFINE»
-
-«DEFINE controlLastClickPositionProviderService FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void startupLastClickPositionProvider() {
-		if (myLastClickPositionProvider == null) {
-			myLastClickPositionProvider = new org.eclipse.gmf.tooling.runtime.part.LastClickPositionProvider(this);
-			myLastClickPositionProvider.attachToService();
-		}
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void shutDownLastClickPositionProvider() {
-		if (myLastClickPositionProvider != null) {
-			myLastClickPositionProvider.detachFromService();
-			myLastClickPositionProvider.dispose();
-			myLastClickPositionProvider = null;
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE dispose FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override FOR editorGen.diagram-»
-	public void dispose() {
-		shutDownLastClickPositionProvider();
-		super.dispose();
-	}
-«ENDDEFINE»
-
-«DEFINE addDropTargetListener(transferAccessor : String) FOR gmfgen::GenEditorView-»
-getDiagramGraphicalViewer().addDropTargetListener(new DropTargetListener(getDiagramGraphicalViewer(), «transferAccessor») {
-
-	protected Object getJavaObject(org.eclipse.swt.dnd.TransferData data) {
-		return «transferAccessor».nativeToJava(data);
-	}
-
-});
-«ENDDEFINE»
-
-«DEFINE DropTargetListener FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedClassComment»
-private abstract class DropTargetListener extends org.eclipse.gmf.runtime.diagram.ui.parts.DiagramDropTargetListener {
-
-	«EXPAND DTL_constructor-»
-
-	«EXPAND DTL_getObjectsBeingDropped-»
-
-	«EXPAND DTL_getJavaObject-»
-
-	«EXPAND DTL_additions-»
-}
-«ENDDEFINE»
-
-
-«DEFINE DTL_constructor FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public DropTargetListener(org.eclipse.gef.EditPartViewer viewer, org.eclipse.swt.dnd.Transfer xfer) {
-	super(viewer, xfer);
-}
-«ENDDEFINE»
-
-«DEFINE DTL_getObjectsBeingDropped FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected java.util.List getObjectsBeingDropped() {
-	org.eclipse.swt.dnd.TransferData data = getCurrentEvent().currentDataType;
-	«EXPAND CodeStyle::newGenericInstance('uris', 'java.util.HashSet', 'org.eclipse.emf.common.util.URI') FOR editorGen.diagram»();
-
-	Object transferedObject = getJavaObject(data);
-	if (transferedObject instanceof org.eclipse.jface.viewers.IStructuredSelection) {
-		org.eclipse.jface.viewers.IStructuredSelection selection = (org.eclipse.jface.viewers.IStructuredSelection) transferedObject;
-		for («EXPAND CodeStyle::G('java.util.Iterator', '?') FOR editorGen.diagram» it = selection.iterator(); it.hasNext();) {
-			Object nextSelectedObject = it.next();
-«REM»
-	TODO: move NavigatorItem to some place available in runtime and remove 
-	"genEditor.getEditorGen().getNavigator() != null" test
-«ENDREM»«-»
-			«IF hasNavigator(self)»if (nextSelectedObject instanceof «editorGen.navigator.getNavigatorItemQualifiedClassName()») {
-				org.eclipse.gmf.runtime.notation.View view = ((«editorGen.navigator.getNavigatorItemQualifiedClassName()») nextSelectedObject).getView();
-				nextSelectedObject = view.getElement();
-			} else «ENDIF»if (nextSelectedObject instanceof org.eclipse.core.runtime.IAdaptable) {
-				org.eclipse.core.runtime.IAdaptable adaptable = (org.eclipse.core.runtime.IAdaptable) nextSelectedObject;
-				nextSelectedObject = adaptable.getAdapter(org.eclipse.emf.ecore.EObject.class);
-			}
-
-			if (nextSelectedObject instanceof org.eclipse.emf.ecore.EObject) {
-				org.eclipse.emf.ecore.EObject modelElement = (org.eclipse.emf.ecore.EObject) nextSelectedObject;
-				uris.add(org.eclipse.emf.ecore.util.EcoreUtil.getURI(modelElement));	
-			}
-		}
-	}
-
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.ArrayList', 'org.eclipse.emf.ecore.EObject') FOR editorGen.diagram»(uris.size());
-	«EXPAND CodeStyle::iterate('nextURI', 'org.eclipse.emf.common.util.URI', 'uris') FOR editorGen.diagram -»
-		org.eclipse.emf.ecore.EObject modelObject = getEditingDomain().getResourceSet().getEObject(nextURI, true);
-		result.add(modelObject);
-	}
-	return result;
-}
-«ENDDEFINE»
-
-«DEFINE DTL_getJavaObject FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected abstract Object getJavaObject(org.eclipse.swt.dnd.TransferData data);
-«ENDDEFINE»
-
-«DEFINE implementsList FOR Sequence(String)-»
-«IF not self->isEmpty()» implements «EXPAND implementsListEntry FOREACH self SEPARATOR ', '»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE implementsListEntry FOR String»«self»«ENDDEFINE»
-
-«DEFINE DTL_additions FOR gmfgen::GenEditorView-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenEditorView-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenEditorView-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForSavingDeletedFile(self), 'The original file \"{0}\" has been deleted.')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForSaveAsProblems(self)), 'Problem During Save As...')-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForSaveAsProblems(self)), 'Save could not be completed. Target file is already open in another editor.')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForSaveProblems(self)), 'Save Problems')-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForSaveProblems(self)), 'Could not save file.')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenEditorView-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForSavingDeletedFile(self))-»
-	«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForSaveAsProblems(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForSaveAsProblems(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForSaveProblems(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForSaveProblems(self)))-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ElementChooser.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ElementChooser.xpt
deleted file mode 100644
index 0352e6c1761..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ElementChooser.xpt
+++ /dev/null
@@ -1,148 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::editor::Utils»
-
-«DEFINE ElementChooser FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «elementChooserClassName» «EXPAND extendsList» {
-
-	«EXPAND _constructor-»
-	
-	«EXPAND context-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenDiagram»extends org.eclipse.gmf.tooling.runtime.part.DefaultElementChooserDialog«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «elementChooserClassName»(org.eclipse.swt.widgets.Shell parentShell, org.eclipse.gmf.runtime.notation.View view) {
-		this(parentShell, view, false);
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «elementChooserClassName»(org.eclipse.swt.widgets.Shell parentShell, org.eclipse.gmf.runtime.notation.View view, boolean allowMultiSelection) {
-		super(parentShell, view, new «EXPAND contextClassName»(allowMultiSelection));
-	}
-«ENDDEFINE»
-
-«DEFINE contextClassName FOR gmfgen::GenDiagram»«elementChooserClassName»ContextImpl«ENDDEFINE»
-
-«DEFINE context FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedClassComment»
-	private static class «EXPAND contextClassName» implements org.eclipse.gmf.tooling.runtime.part.DefaultElementChooserDialog.Context {
-			
-		«EXPAND context_attributes»
-			
-		«EXPAND context_constructors»
-			
-		«EXPAND getItemProvidersAdapterFactory»
-			
-		«EXPAND getDiagramPreferencesHint»
-			
-		«EXPAND getFileExtensions»
-			
-		«EXPAND getDialogTitle»
-			
-		«EXPAND getTreeContentProvider»
-			
-		«EXPAND allowMultiSelection»
-		
-		«EXPAND context_additions»
-			
-	}
-«ENDDEFINE»
-
-«DEFINE context_attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static final String[] FILE_EXTENSIONS = new String[]{«FOREACH containsShortcutsTo AS ext SEPARATOR ', '»"«ext»"«ENDFOREACH»};
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final boolean myAllowMultiSelection;
-«ENDDEFINE»
-
-«DEFINE context_constructors FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «EXPAND contextClassName»(boolean allowMultiSelection) {
-		myAllowMultiSelection = allowMultiSelection;
-	}
-«ENDDEFINE»
-
-«DEFINE getItemProvidersAdapterFactory FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::overrideI»
-	public org.eclipse.emf.common.notify.AdapterFactory getAdapterFactory() {
-		return «self.editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getItemProvidersAdapterFactory();
-	}
-«ENDDEFINE»
-
-«DEFINE getDiagramPreferencesHint FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::overrideI»
-	public org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint getPreferenceHint() {
-		return «self.editorGen.plugin.getActivatorQualifiedClassName()».DIAGRAM_PREFERENCES_HINT;
-	}
-«ENDDEFINE»
-
-«DEFINE getFileExtensions FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::overrideI»
-	public String[] getFileExtesions() {
-		return FILE_EXTENSIONS.clone();
-	}
-«ENDDEFINE»
-
-«DEFINE getDialogTitle FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::overrideI»
-	public String getDialogTitle() {
-		return «EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForSelectModelElement(self))) FOR editorGen»;
-	}
-«ENDDEFINE»
-
-«DEFINE getTreeContentProvider FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment-»
-	«EXPAND CodeStyle::overrideI-»
-	public org.eclipse.jface.viewers.ITreeContentProvider getTreeContentProvider() {
-		return new «IF not self.editorGen.application.oclIsUndefined()»new org.eclipse.ui.model.WorkbenchContentProvider«ELSE-»
-		 org.eclipse.ui.model.BaseWorkbenchContentProvider«ENDIF»();
-	}
-«ENDDEFINE»
-	
-«DEFINE allowMultiSelection FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment-»
-	public boolean allowMultiSelection() {
-		return myAllowMultiSelection;
-	}
-«ENDDEFINE»
-
-«DEFINE context_additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForSelectModelElement(self)), 'Select model element')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForSelectModelElement(self)))-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/GenDiagram.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/GenDiagram.qvto
deleted file mode 100644
index 06f9dea6566..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/GenDiagram.qvto
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import gmf.GenModelUtils;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-modeltype ecore uses "http://www.eclipse.org/emf/2002/Ecore";
-
-library GenDiagram;
-
-helper standaloneDomainModel(genDiagram : gmfgen::GenDiagram) : Boolean {
-	return not genDiagram.editorGen.sameFileForDiagramAndModel and genDiagram.domainDiagramElement <> null
-}
-
-helper hasDocumentRoot(genDiagram : gmfgen::GenDiagram) : Boolean {
-	return getDocumentRoot(genDiagram) <> null
-}
-
-helper getDocumentRoot(genDiagram : gmfgen::GenDiagram) : genmodel::GenClass {
-	return (if genDiagram.domainDiagramElement = null then null else getDocumentRoot(genDiagram.domainDiagramElement.genPackage) endif)
-}
-
-helper getDocumentRootSetFeature(genDiagram : gmfgen::GenDiagram) : genmodel::GenFeature {
-	return getDocumentRoot(genDiagram).genFeatures->select(f | isDocRootSetFeature(f, genDiagram.domainDiagramElement.ecoreClass))->first()
-}
-
-helper isDocRootSetFeature(gf : genmodel::GenFeature, eType : ecore::EClass) : Boolean {
-	return not isListType(gf) and gf.ecoreFeature.changeable and (-2 = gf.ecoreFeature.upperBound and (gf.ecoreFeature.oclAsType(ecore::EObject).eClass().name = 'EReference' and gf.ecoreFeature.eType.oclAsType(ecore::EClass).isSuperTypeOf(eType)))
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
deleted file mode 100644
index f2e4aa899b5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/InitDiagramFileAction.xpt
+++ /dev/null
@@ -1,156 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Dmitry Stadnik (Borland) - rewritten in xpand
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::editor::Utils»
-«EXTENSION xpt::StringOperations»
-
-«DEFINE InitDiagramFileAction(editorGen : gmfgen::GenEditorGenerator) FOR gmfgen::InitDiagramAction-»
-«EXPAND InitDiagramFileAction(editorGen, qualifiedClassName)-»
-«ENDDEFINE»
-
-// HACK to deal with the InitDiagramAction instance being constructed at codegen time, and Ant being capable of supplying (existing!) target object only 
-«DEFINE Hack FOR gmfgen::GenEditorGenerator-»
-«EXPAND InitDiagramFileAction(self, diagram.getInitDiagramFileActionQualifiedClassName())-»
-«ENDDEFINE»
-
-«DEFINE InitDiagramFileAction(gmfgen::GenEditorGenerator editorGen, String qualifiedClassName) FOR OclAny-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-«EXPAND xpt::Common::packageStatement FOR qualifiedClassName»
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «qualifiedClassName.xpandSplit('\\.')->last()»
-	«IF editorGen.application = null-»
-implements org.eclipse.ui.IObjectActionDelegate {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.IWorkbenchPart targetPart;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.emf.common.util.URI domainModelURI;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setActivePart(org.eclipse.jface.action.IAction action, org.eclipse.ui.IWorkbenchPart targetPart) {
-		this.targetPart = targetPart;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection selection) {
-		domainModelURI = null;
-		action.setEnabled(false);
-		if (selection instanceof org.eclipse.jface.viewers.IStructuredSelection == false || selection.isEmpty()) {
-			return;
-		}
-		org.eclipse.core.resources.IFile file =
-			(org.eclipse.core.resources.IFile) ((org.eclipse.jface.viewers.IStructuredSelection) selection).getFirstElement();
-		domainModelURI = org.eclipse.emf.common.util.URI.createPlatformResourceURI(file.getFullPath().toString(), true);
-		action.setEnabled(true);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.swt.widgets.Shell getShell() {
-		return targetPart.getSite().getShell();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void run(org.eclipse.jface.action.IAction action) {
-		org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain =
-			org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory.INSTANCE.createEditingDomain();
-		«IF editorGen.sameFileForDiagramAndModel-»
-		org.eclipse.emf.ecore.resource.ResourceSet resourceSet = new org.eclipse.emf.ecore.resource.impl.ResourceSetImpl();
-		«ELSE-»
-		org.eclipse.emf.ecore.resource.ResourceSet resourceSet = editingDomain.getResourceSet();
-		«ENDIF-»
-		org.eclipse.emf.ecore.EObject diagramRoot = null;
-		try {
-			org.eclipse.emf.ecore.resource.Resource resource = resourceSet.getResource(domainModelURI, true);
-			diagramRoot = (org.eclipse.emf.ecore.EObject) resource.getContents().get(0);
-		} catch (org.eclipse.emf.common.util.WrappedException ex) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-				"Unable to load resource: " + domainModelURI, ex);«EXPAND xpt::Common::nonNLS»
-		}
-		if (diagramRoot == null) {
-			org.eclipse.jface.dialogs.MessageDialog.openError(getShell(), 
-                «EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForInitDiagramFileResourceErrorDialog())) FOR editorGen»,
-                «EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForInitDiagramFileResourceErrorDialog())) FOR editorGen»);
-			return;
-		}
-		org.eclipse.jface.wizard.Wizard wizard = new «editorGen.diagram.getNewDiagramFileWizardQualifiedClassName()»(domainModelURI, diagramRoot, editingDomain);
-		wizard.setWindowTitle(org.eclipse.osgi.util.NLS.bind(
-				    «EXPAND xpt::Externalizer::accessorCall(i18nKeyForInitDiagramFileWizardTitle()) FOR editorGen»,
-				    «EXPAND xpt::editor::VisualIDRegistry::modelID FOR editorGen.diagram»));
-		«editorGen.diagram.getDiagramEditorUtilQualifiedClassName()».runWizard(getShell(), wizard, "InitDiagramFile");«EXPAND xpt::Common::nonNLS»
-	}
-	«ELSE-»
-implements org.eclipse.ui.IWorkbenchWindowActionDelegate {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.IWorkbenchWindow window;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void init(org.eclipse.ui.IWorkbenchWindow window) {
-		this.window = window;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void dispose() {
-		window = null;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void selectionChanged(org.eclipse.jface.action.IAction action, org.eclipse.jface.viewers.ISelection selection) {
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.swt.widgets.Shell getShell() {
-		return window.getShell();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void run(org.eclipse.jface.action.IAction action) {
-		org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain =
-			org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory.INSTANCE.createEditingDomain();
-		org.eclipse.emf.ecore.resource.Resource resource =
-				«editorGen.diagram.getDiagramEditorUtilQualifiedClassName()».openModel(getShell(), 
-					«EXPAND xpt::Externalizer::accessorCall(i18nKeyForInitDiagramOpenFileDialogTitle()) FOR editorGen», editingDomain);
-		if (resource == null || resource.getContents().isEmpty()) {
-			return;
-		}
-		org.eclipse.emf.ecore.EObject diagramRoot = (org.eclipse.emf.ecore.EObject) resource.getContents().get(0);
-		org.eclipse.jface.wizard.Wizard wizard = new «editorGen.diagram.getNewDiagramFileWizardQualifiedClassName()»(resource.getURI(), diagramRoot, editingDomain);
-		wizard.setWindowTitle(org.eclipse.osgi.util.NLS.bind(
-				    «EXPAND xpt::Externalizer::accessorCall(i18nKeyForInitDiagramFileWizardTitle()) FOR editorGen»,
-				    «EXPAND xpt::editor::VisualIDRegistry::modelID FOR editorGen.diagram»));
-		«editorGen.diagram.getDiagramEditorUtilQualifiedClassName()».runWizard(getShell(), wizard, "InitDiagramFile");«EXPAND xpt::Common::nonNLS»
-	}
-	«ENDIF-»
-}
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForInitDiagramFileResourceErrorDialog()))-»
-«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForInitDiagramFileResourceErrorDialog()))-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForInitDiagramFileWizardTitle())-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForInitDiagramOpenFileDialogTitle())-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForInitDiagramFileResourceErrorDialog()), 'Error')-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForInitDiagramFileResourceErrorDialog()), 'Model file loading failed')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForInitDiagramFileWizardTitle(), 'Initialize new {0} diagram file')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForInitDiagramOpenFileDialogTitle(), 'Select domain model')-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
deleted file mode 100644
index 362626976ff..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/MatchingStrategy.xpt
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE MatchingStrategy FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «matchingStrategyClassName» implements org.eclipse.ui.IEditorMatchingStrategy {
-
-	«EXPAND matches-»
-
-}
-«ENDDEFINE»
-
-«DEFINE matches FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean matches(org.eclipse.ui.IEditorReference editorRef, org.eclipse.ui.IEditorInput input) {
-	org.eclipse.ui.IEditorInput editorInput;
-	try {
-		editorInput = editorRef.getEditorInput();
-	} catch (org.eclipse.ui.PartInitException e) {
-		return false;
-	}
-        
-	if (editorInput.equals(input)) {
-		return true;
-	}
-«REM»
-	Should be removed then https://bugs.eclipse.org/bugs/show_bug.cgi?id=175260 commited.
-	Problem is: URIEditorInput has no .equals() overriden
-«ENDREM-»
-	if (editorInput instanceof org.eclipse.emf.common.ui.URIEditorInput && input instanceof org.eclipse.emf.common.ui.URIEditorInput) {
-		return ((org.eclipse.emf.common.ui.URIEditorInput) editorInput).getURI().equals(((org.eclipse.emf.common.ui.URIEditorInput) input).getURI());
-	}
-	return false;
-}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
deleted file mode 100644
index f6fcb7a69b3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ModelElementSelectionPage.xpt
+++ /dev/null
@@ -1,89 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Svyatoslav Kovalsky (Montages) - #410477 "same-generated" code extracted to GMFT-runtime 
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::editor::Utils»
-
-«DEFINE className FOR gmfgen::GenDiagram»«defaultModelElementSelectionPageClassName(self)»«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«editorGen.editor.packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenDiagram»extends org.eclipse.gmf.tooling.runtime.part.DefaultModelElementSelectionPage«ENDDEFINE»
-
-«DEFINE ModelElementSelectionPage FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment('Wizard page that allows to select element from model.')»
-public class «EXPAND className» «EXPAND extendsList» {
-	«EXPAND attributes-»
-
-	«EXPAND ctor-»
-
-	«EXPAND getModelElement-»
-
-	«EXPAND setModelElement-»
-
-	«EXPAND createControl-»
-
-	«EXPAND getSelectionTitle-»
-
-	«EXPAND updateSelection-»
-
-	«EXPAND validatePage-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE ctor FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-public «EXPAND className»(String pageName) {
-	super(«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getItemProvidersAdapterFactory(), pageName);
-}
-«ENDDEFINE»
-
-«DEFINE getSelectionTitle FOR gmfgen::GenDiagram»
-«EXPAND xpt::Common::generatedMemberComment('Override to provide custom model element description.')»
-protected String getSelectionTitle() {
-	return «EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForModelElementSelectionPage(self))) FOR editorGen»;
-}
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForModelElementSelectionPage(self)), 'Select model element:')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForModelElementSelectionPage(self)))-»
-«ENDDEFINE»
-
-/**
- * Since 3.1 the code moved to non-generated super class in GMFT-runtime. 
- * Empty xpands are left here to support backward compatibility
- */ 
-«DEFINE attributes FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE getModelElement FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE setModelElement FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE createControl FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE updateSelection FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE validatePage FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
deleted file mode 100644
index 8375b86d314..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/NewDiagramFileWizard.xpt
+++ /dev/null
@@ -1,202 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Dmitry Stadnik (Borland) - rewritten in xpand
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::editor::Utils»
-
-«DEFINE className FOR gmfgen::GenDiagram»«newDiagramFileWizardClassName»«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«editorGen.editor.packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE NewDiagramFileWizard FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND className» extends org.eclipse.jface.wizard.Wizard {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «EXPAND creationPage» myFileCreationPage;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «EXPAND xpt::editor::ModelElementSelectionPage::qualifiedClassName» diagramRootElementSelectionPage;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.emf.transaction.TransactionalEditingDomain myEditingDomain;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «EXPAND className»(org.eclipse.emf.common.util.URI domainModelURI,
-			org.eclipse.emf.ecore.EObject diagramRoot,
-			org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain) {
-		«EXPAND xpt::Common::_assert('domainModelURI != null : \"Domain model uri must be specified\"')-»
-	    «EXPAND xpt::Common::_assert('diagramRoot != null : \"Doagram root element must be specified\"')-»
-	    «EXPAND xpt::Common::_assert('editingDomain != null : \"Editing domain must be specified\"')-»
-
-		myFileCreationPage = new «EXPAND creationPage»(«EXPAND xpt::Externalizer::accessorCall(nameKey(i18nKeyForNewDiagramFileWizardCreationPage(self))) FOR editorGen», org.eclipse.jface.viewers.StructuredSelection.EMPTY);
-		myFileCreationPage.setTitle(«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForNewDiagramFileWizardCreationPage(self))) FOR editorGen»);
-		myFileCreationPage.setDescription(org.eclipse.osgi.util.NLS.bind(
-				«EXPAND xpt::Externalizer::accessorCall(descriptionKey(i18nKeyForNewDiagramFileWizardCreationPage(self))) FOR editorGen», 
-				«EXPAND xpt::editor::VisualIDRegistry::modelID»));
-		org.eclipse.core.runtime.IPath filePath;
-		String fileName = org.eclipse.emf.common.util.URI.decode(domainModelURI.trimFileExtension().lastSegment());
-		if (domainModelURI.isPlatformResource()) {
-			filePath = new org.eclipse.core.runtime.Path(domainModelURI.trimSegments(1).toPlatformString(true));
-		} else if (domainModelURI.isFile()) {
-			filePath = new org.eclipse.core.runtime.Path(domainModelURI.trimSegments(1).toFileString());
-		} else {
-			// TODO : use some default path
-			throw new IllegalArgumentException("Unsupported URI: " + domainModelURI); «EXPAND xpt::Common::nonNLS»
-		}
-		myFileCreationPage.setContainerFullPath(filePath);
-		myFileCreationPage.setFileName(«getDiagramEditorUtilQualifiedClassName()».getUniqueFileName(
-				filePath, fileName, "«editorGen.diagramFileExtension»")); «EXPAND xpt::Common::nonNLS»
-
-		diagramRootElementSelectionPage = new DiagramRootElementSelectionPage(«EXPAND xpt::Externalizer::accessorCall(nameKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self))) FOR editorGen»);
-		diagramRootElementSelectionPage.setTitle(«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self))) FOR editorGen»);
-		diagramRootElementSelectionPage.setDescription(«EXPAND xpt::Externalizer::accessorCall(descriptionKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self))) FOR editorGen»);
-		diagramRootElementSelectionPage.setModelElement(diagramRoot);
-
-	   	myEditingDomain = editingDomain;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void addPages() {
-		addPage(myFileCreationPage);
-		addPage(diagramRootElementSelectionPage);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean performFinish() {
-		«EXPAND CodeStyle::newGenericInstance('affectedFiles', 'java.util.LinkedList', 'org.eclipse.core.resources.IFile')»();
-		«IF null = editorGen.application-»
-		org.eclipse.core.resources.IFile diagramFile = myFileCreationPage.createNewFile();
-		«EXPAND xpt::Common::setCharset('diagramFile')-»
-		affectedFiles.add(diagramFile);
-		org.eclipse.emf.common.util.URI diagramModelURI = org.eclipse.emf.common.util.URI.createPlatformResourceURI(diagramFile.getFullPath().toString(), true);
-		«ELSE-»
-		org.eclipse.core.runtime.IPath diagramModelPath = myFileCreationPage.getContainerFullPath().append(myFileCreationPage.getFileName());
-		org.eclipse.emf.common.util.URI diagramModelURI = org.eclipse.emf.common.util.URI.createFileURI(diagramModelPath.toString());
-		«ENDIF-»
-		org.eclipse.emf.ecore.resource.ResourceSet resourceSet = myEditingDomain.getResourceSet();
-		final org.eclipse.emf.ecore.resource.Resource diagramResource = resourceSet.createResource(diagramModelURI);
-		org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand command =
-			new org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand(
-				myEditingDomain, «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardInitDiagramCommand(self)) FOR editorGen», affectedFiles) {
-
-			protected org.eclipse.gmf.runtime.common.core.command.CommandResult doExecuteWithResult(
-					org.eclipse.core.runtime.IProgressMonitor monitor, org.eclipse.core.runtime.IAdaptable info)
-						throws org.eclipse.core.commands.ExecutionException {
-				int diagramVID = «EXPAND xpt::editor::VisualIDRegistry::getDiagramVisualIDMethodCall»(diagramRootElementSelectionPage.getModelElement());
-				if (diagramVID != «EXPAND xpt::editor::VisualIDRegistry::visualID») {
-					return org.eclipse.gmf.runtime.common.core.command.CommandResult.newErrorCommandResult(
-						«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardIncorrectRootError(self)) FOR editorGen»);
-				}
-				org.eclipse.gmf.runtime.notation.Diagram diagram =
-					org.eclipse.gmf.runtime.diagram.core.services.ViewService.createDiagram(
-						diagramRootElementSelectionPage.getModelElement(), «EXPAND xpt::editor::VisualIDRegistry::modelID»,
-						«EXPAND xpt::plugin::Activator::preferenceHintAccess FOR editorGen»);
-				diagramResource.getContents().add(diagram);
-				«IF editorGen.sameFileForDiagramAndModel-»
-				diagramResource.getContents().add(diagram.getElement());
-				«ENDIF-»
-				«IF not synchronized-»
-				new «getDiagramContentInitializerQualifiedClassName()»().initDiagramContent(diagram);			
-				«ENDIF-»
-				return org.eclipse.gmf.runtime.common.core.command.CommandResult.newOKCommandResult();
-			}
-		};
-		try {
-			org.eclipse.core.commands.operations.OperationHistoryFactory.getOperationHistory().execute(
-				command, new org.eclipse.core.runtime.NullProgressMonitor(), null);
-			diagramResource.save(«EXPAND xpt::Common::getSaveOptions»);
-			«getDiagramEditorUtilQualifiedClassName()».openDiagram(diagramResource);
-		} catch (org.eclipse.core.commands.ExecutionException e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-				"Unable to create model and diagram", e); «EXPAND xpt::Common::nonNLS»
-		} catch (java.io.IOException ex) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-				"Save operation failed for: " + diagramModelURI, ex); «EXPAND xpt::Common::nonNLS»
-		} catch (org.eclipse.ui.PartInitException ex) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-				"Unable to open editor", ex); «EXPAND xpt::Common::nonNLS»
-		}			
-		return true;
-	}
-
-	«EXPAND xpt::Common::generatedClassComment»
-	private static class DiagramRootElementSelectionPage extends «EXPAND xpt::editor::ModelElementSelectionPage::qualifiedClassName» {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected DiagramRootElementSelectionPage(String pageName) {
-			super(pageName);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected String getSelectionTitle() {
-			return «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageSelectionTitle(self)) FOR editorGen»;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		protected boolean validatePage() {
-			if (getModelElement() == null) {
-				setErrorMessage(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageNoSelectionMessage(self)) FOR editorGen»);
-				return false;
-			}
-			boolean result = org.eclipse.gmf.runtime.diagram.core.services.ViewService.getInstance().provides(
-				new org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation(
-					new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(getModelElement()),
-					«EXPAND xpt::editor::VisualIDRegistry::modelID», «EXPAND xpt::plugin::Activator::preferenceHintAccess FOR editorGen»));
-			setErrorMessage(result ? null : «EXPAND xpt::Externalizer::accessorCall(i18nKeyForNewDiagramFileWizardRootSelectionPageInvalidSelectionMessage(self)) FOR editorGen»);
-			return result;
-		}
-	}
-}
-«ENDDEFINE»
-
-«DEFINE creationPage FOR gmfgen::GenDiagram»
-«IF null = editorGen.application-»
-org.eclipse.ui.dialogs.WizardNewFileCreationPage«ELSE-»
-«editorGen.application.packageName».WizardNewFileCreationPage«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::accessorField(nameKey(i18nKeyForNewDiagramFileWizardCreationPage(self)))-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForNewDiagramFileWizardCreationPage(self)))-»
-«EXPAND xpt::Externalizer::accessorField(descriptionKey(i18nKeyForNewDiagramFileWizardCreationPage(self)))-»
-«EXPAND xpt::Externalizer::accessorField(nameKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self)))-»
-«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self)))-»
-«EXPAND xpt::Externalizer::accessorField(descriptionKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self)))-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewDiagramFileWizardRootSelectionPageSelectionTitle(self))-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewDiagramFileWizardRootSelectionPageNoSelectionMessage(self))-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewDiagramFileWizardRootSelectionPageInvalidSelectionMessage(self))-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewDiagramFileWizardInitDiagramCommand(self))-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForNewDiagramFileWizardIncorrectRootError(self))-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(nameKey(i18nKeyForNewDiagramFileWizardCreationPage(self)), 'Initialize new diagram file')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForNewDiagramFileWizardCreationPage(self)), 'Diagram file')-»
-«EXPAND xpt::Externalizer::messageEntry(descriptionKey(i18nKeyForNewDiagramFileWizardCreationPage(self)), 'Create new diagram based on {0} model content')-»
-«EXPAND xpt::Externalizer::messageEntry(nameKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self)), 'Select diagram root element')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self)), 'Diagram root element')-»
-«EXPAND xpt::Externalizer::messageEntry(descriptionKey(i18nKeyForNewDiagramFileWizardRootSelectionPage(self)), 'Select semantic model element to be depicted on diagram')-»"Select diagram root element:"
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewDiagramFileWizardRootSelectionPageSelectionTitle(self), 'Select diagram root element:')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewDiagramFileWizardRootSelectionPageNoSelectionMessage(self), 'Diagram root element is not selected')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewDiagramFileWizardRootSelectionPageInvalidSelectionMessage(self), 'Invalid diagram root element is selected')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewDiagramFileWizardInitDiagramCommand(self), 'Initializing diagram contents')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForNewDiagramFileWizardIncorrectRootError(self), 'Incorrect model object stored as a root resource object')-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
deleted file mode 100644
index a2fb21a63e4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ResourceSetInfo.xpt
+++ /dev/null
@@ -1,338 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«REM»Inner class of DocumentProvider«ENDREM»
-«DEFINE ResourceSetInfo FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedClassComment»	
-protected class ResourceSetInfo extends ElementInfo {
-
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-
-	«EXPAND getModificationStamp-»
-
-	«EXPAND setModificationStamp-»
-	
-	«EXPAND getEditingDomain-»
-
-	«EXPAND getResourceSet-»
-	
-	«EXPAND getLoadedResourcesIterator-»
-
-	«EXPAND getEditorInput-»
-
-	«EXPAND dispose-»
-
-	«EXPAND isSynchronized-»
-
-	«IF null = editorGen.application-»
-		«EXPAND setUnSynchronized-»
-
-		«EXPAND setSynchronized-»
-
-		«EXPAND stopResourceListening-»
-
-		«EXPAND startResourceListening-»
-	
-	«ENDIF-»
-	«EXPAND isUpdateCache-»
-	
-	«EXPAND setUpdateCache-»
-	
-	«EXPAND isModifiable-»
-	
-	«EXPAND setModifiable-»
-	
-	«EXPAND isReadOnly-»
-	
-	«EXPAND setReadOnly-»
-
-	«IF null = editorGen.application-»
-		«EXPAND SynchronizerDelegate-»
-		
-	«ENDIF-»
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
- 	private long myModificationStamp = «IF null = editorGen.application»org.eclipse.core.resources.IResource.NULL_STAMP«ELSE»0«ENDIF»;
-
-	«IF null = editorGen.application-»
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.emf.workspace.util.WorkspaceSynchronizer mySynchronizer;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private «EXPAND CodeStyle::newGenericInstance('myUnSynchronizedResources', 'java.util.LinkedList', 'org.eclipse.emf.ecore.resource.Resource')»();
-	
-	«ENDIF-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument myDocument;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.IEditorInput myEditorInput;
-		
-	«EXPAND xpt::Common::generatedMemberComment»
-	private boolean myUpdateCache = true;
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	private boolean myModifiable = false;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private boolean myReadOnly = true;
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	private ResourceSetModificationListener myResourceSetListener;
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public ResourceSetInfo(org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument document, org.eclipse.ui.IEditorInput editorInput) {
-	super(document);
-	myDocument = document;
-	myEditorInput = editorInput;
-	«IF null = editorGen.application-»
-	startResourceListening();
-	«ENDIF-»
-	myResourceSetListener = new ResourceSetModificationListener(this);
-	getResourceSet().eAdapters().add(myResourceSetListener);
-}
-«ENDDEFINE»
-
-«DEFINE getModificationStamp FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public long getModificationStamp() {
-	return myModificationStamp;
-}
-«ENDDEFINE»
-
-«DEFINE setModificationStamp FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void setModificationStamp(long modificationStamp) {
-	myModificationStamp = modificationStamp;
-}
-«ENDDEFINE»
-
-«DEFINE getEditingDomain FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.emf.transaction.TransactionalEditingDomain getEditingDomain() {
-	return myDocument.getEditingDomain();
-}
-«ENDDEFINE»
-
-«DEFINE getResourceSet FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.emf.ecore.resource.ResourceSet getResourceSet() {
-	return getEditingDomain().getResourceSet();
-}
-«ENDDEFINE»
-
-«REM»
-	XXX Would be nice to change API and to return List instead of Iterator - there seems to be little sense using latter.
-«ENDREM»
-«DEFINE getLoadedResourcesIterator FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public «EXPAND CodeStyle::G('java.util.Iterator', 'org.eclipse.emf.ecore.resource.Resource')» getLoadedResourcesIterator() {
-	return new «EXPAND CodeStyle::G('java.util.ArrayList', 'org.eclipse.emf.ecore.resource.Resource')»(getResourceSet().getResources()).iterator();
-}
-«ENDDEFINE»
-
-«DEFINE getEditorInput FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.ui.IEditorInput getEditorInput() {
-	return myEditorInput;
-}
-«ENDDEFINE»
-
-«DEFINE dispose FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void dispose() {
-	«IF null = editorGen.application-»
-	stopResourceListening();
-	«ENDIF-»
-	getResourceSet().eAdapters().remove(myResourceSetListener);
-	«EXPAND CodeStyle::iterate('resource', 'org.eclipse.emf.ecore.resource.Resource', 'it', 'getLoadedResourcesIterator()')-»
-		resource.unload();
-	}
-«REM»FIXME: Perhaps, should wrap unload into transaction, otherwise each unload triggers a lot of root transactions«ENDREM-»
-	getEditingDomain().dispose();
-}
-«ENDDEFINE»
-
-«DEFINE isSynchronized FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isSynchronized() {
-	«IF null = editorGen.application-»
-	return myUnSynchronizedResources.size() == 0;
-	«ELSE-»
-	return getModificationStamp() == computeModificationStamp(this);
-	«ENDIF-»
-}
-«ENDDEFINE»
-
-«DEFINE setUnSynchronized FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void setUnSynchronized(org.eclipse.emf.ecore.resource.Resource resource) {
-	myUnSynchronizedResources.add(resource);
-}
-«ENDDEFINE»
-
-«DEFINE setSynchronized FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void setSynchronized(org.eclipse.emf.ecore.resource.Resource resource) {
-	myUnSynchronizedResources.remove(resource);
-}
-«ENDDEFINE»
-
-«DEFINE stopResourceListening FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public final void stopResourceListening() {
-	mySynchronizer.dispose();
-	mySynchronizer = null;
-}
-«ENDDEFINE»
-
-«DEFINE startResourceListening FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public final void startResourceListening() {
-	mySynchronizer = new org.eclipse.emf.workspace.util.WorkspaceSynchronizer(getEditingDomain(), new SynchronizerDelegate());
-}
-«ENDDEFINE»
-
-«DEFINE isUpdateCache FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isUpdateCache() {
-	return myUpdateCache;
-}
-«ENDDEFINE»
-
-«DEFINE setUpdateCache FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void setUpdateCache(boolean update) {
-	myUpdateCache = update;
-}
-«ENDDEFINE»
-	
-«DEFINE isModifiable FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isModifiable() {
-	return myModifiable;
-}
-«ENDDEFINE»
-
-«DEFINE setModifiable FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void setModifiable(boolean modifiable) {
-	myModifiable = modifiable;
-}
-«ENDDEFINE»
-	
-«DEFINE isReadOnly FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isReadOnly() {
-	return myReadOnly;
-}
-«ENDDEFINE»
-
-«DEFINE setReadOnly FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void setReadOnly(boolean readOnly) {
-	myReadOnly = readOnly;
-}
-«ENDDEFINE»
-
-«DEFINE SynchronizerDelegate FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedClassComment»	
-private class SynchronizerDelegate implements org.eclipse.emf.workspace.util.WorkspaceSynchronizer.Delegate {
-
-	«EXPAND disposeSD-»
-
-	«EXPAND handleResourceChangedSD-»
-
-	«EXPAND handleResourceDeletedSD-»
-
-	«EXPAND handleResourceMovedSD-»
-	
-	«EXPAND additionsSD-»
-}
-«ENDDEFINE»
-
-«DEFINE disposeSD FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void dispose() {
-}
-«ENDDEFINE»	
-
-«DEFINE handleResourceChangedSD FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean handleResourceChanged(final org.eclipse.emf.ecore.resource.Resource resource) {
-	«EXPAND updateSynchStateSD-»
-	org.eclipse.swt.widgets.Display.getDefault().asyncExec(new java.lang.Runnable() {
-		public void run() {
-			handleElementChanged(ResourceSetInfo.this, resource, null);
-		}
-	});
-	return true;
-}
-«ENDDEFINE»
-
-«DEFINE handleResourceDeletedSD FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean handleResourceDeleted(org.eclipse.emf.ecore.resource.Resource resource) {
-	«EXPAND updateSynchStateSD-»
-	org.eclipse.swt.widgets.Display.getDefault().asyncExec(new java.lang.Runnable() {
-		public void run() {
-			fireElementDeleted(ResourceSetInfo.this.getEditorInput());
-		}
-	});
-	return true;
-}
-«ENDDEFINE»
-
-«DEFINE handleResourceMovedSD FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean handleResourceMoved(org.eclipse.emf.ecore.resource.Resource resource, final org.eclipse.emf.common.util.URI newURI) {
-	«EXPAND updateSynchStateSD-»
-	if (myDocument.getDiagram().eResource() == resource) {
-		org.eclipse.swt.widgets.Display.getDefault().asyncExec(new java.lang.Runnable() {
-			public void run() {
-				handleElementMoved(ResourceSetInfo.this.getEditorInput(), newURI);
-			}
-		});
-	} else {
-		handleResourceDeleted(resource);
-	}
-	return true;
-}
-«ENDDEFINE»
-
-«DEFINE updateSynchStateSD FOR gmfgen::GenDiagram-»
-synchronized (ResourceSetInfo.this) {
-	if (ResourceSetInfo.this.fCanBeSaved) {
-		ResourceSetInfo.this.setUnSynchronized(resource);
-		return true;
-	}
-}
-«ENDDEFINE»
-
-«DEFINE additionsSD FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
deleted file mode 100644
index 73153943de8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ResourceSetModificationListener.xpt
+++ /dev/null
@@ -1,92 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«REM»Inner class of DocumentProvider«ENDREM»
-«DEFINE ResourceSetModificationListener FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedClassComment»	
-private class ResourceSetModificationListener extends org.eclipse.emf.ecore.util.EContentAdapter {
-
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-	
-	«EXPAND notifyChanged-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE» 
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-		«EXPAND xpt::Common::generatedMemberComment»	
-		private org.eclipse.emf.transaction.NotificationFilter myModifiedFilter;
-
-		«EXPAND xpt::Common::generatedMemberComment»	
-		private ResourceSetInfo myInfo;
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»	
-public ResourceSetModificationListener(ResourceSetInfo info) {
-	myInfo = info;
-	myModifiedFilter = org.eclipse.emf.transaction.NotificationFilter.createEventTypeFilter(org.eclipse.emf.common.notify.Notification.SET).or(org.eclipse.emf.transaction.NotificationFilter.createEventTypeFilter(org.eclipse.emf.common.notify.Notification.UNSET)).and(org.eclipse.emf.transaction.NotificationFilter.createFeatureFilter(org.eclipse.emf.ecore.resource.Resource.class, org.eclipse.emf.ecore.resource.Resource.RESOURCE__IS_MODIFIED));
-}
-«ENDDEFINE»
-
-«DEFINE notifyChanged FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»	
-public void notifyChanged(org.eclipse.emf.common.notify.Notification notification) {
-	if (notification.getNotifier() instanceof org.eclipse.emf.ecore.resource.ResourceSet) {
-		super.notifyChanged(notification);
-	}
-	if (!notification.isTouch() && myModifiedFilter.matches(notification)) {
-		if (notification.getNotifier() instanceof org.eclipse.emf.ecore.resource.Resource) {
-			org.eclipse.emf.ecore.resource.Resource resource = (org.eclipse.emf.ecore.resource.Resource) notification.getNotifier();
-			if (resource.isLoaded()) {
-				boolean modified = false;
-				for (java.util.Iterator/*<org.eclipse.emf.ecore.resource.Resource>*/ it = myInfo.getLoadedResourcesIterator(); it.hasNext() && !modified;) {
-					org.eclipse.emf.ecore.resource.Resource nextResource = (org.eclipse.emf.ecore.resource.Resource) it.next();
-					if (nextResource.isLoaded()) {
-						modified = nextResource.isModified();
-					}
-				}
-				boolean dirtyStateChanged = false;
-				synchronized (myInfo) {
-					if (modified != myInfo.fCanBeSaved) {
-						myInfo.fCanBeSaved = modified;
-						dirtyStateChanged = true;
-					}
-	«IF null = editorGen.application-»
-					if (!resource.isModified()) {
-						myInfo.setSynchronized(resource);
-					}
-	«ENDIF-»
-				}
-				if (dirtyStateChanged) {
-					fireElementDirtyStateChanged(myInfo.getEditorInput(), modified);
-	
-					if (!modified) {
-						myInfo.setModificationStamp(computeModificationStamp(myInfo));
-					}
-				}
-			}
-		}
-	}
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
deleted file mode 100644
index 7b9e3a5689a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ShortcutCreationWizard.xpt
+++ /dev/null
@@ -1,157 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::editor::Utils»
-
-«DEFINE className FOR gmfgen::GenDiagram»«defaultShortcutCreationWizardClassName(self)»«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«editorGen.editor.packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE ShortcutCreationWizard FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-/**
- * Allows to select foreign model element and add shortcut to the diagram.
- * 
- * @generated
- */
-public class «EXPAND className» extends org.eclipse.jface.wizard.Wizard {
-
-	/**
-	 * @generated
-	 */
-	private ReferencedElementSelectionPage referencedElementSelectionPage;
-
-	/**
-	 * @generated
-	 */
-	private org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain;
-
-	/**
-	 * @generated
-	 */
-	public «EXPAND className»(org.eclipse.emf.ecore.EObject modelElement, org.eclipse.gmf.runtime.notation.View view,
-			org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain) {
-		referencedElementSelectionPage = new ReferencedElementSelectionPage(«EXPAND xpt::Externalizer::accessorCall(nameKey(i18nKeyForShortcutWizardReferencedElementPage(self))) FOR editorGen», view);
-		referencedElementSelectionPage.setTitle(«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForShortcutWizardReferencedElementPage(self))) FOR editorGen»);
-		referencedElementSelectionPage.setDescription(«EXPAND xpt::Externalizer::accessorCall(descriptionKey(i18nKeyForShortcutWizardReferencedElementPage(self))) FOR editorGen»);
-		referencedElementSelectionPage.setModelElement(modelElement);
-
-		this.editingDomain = editingDomain;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void addPages() {
-		addPage(referencedElementSelectionPage);
-	}
-
-	/**
-	 * @generated
-	 */
-	public boolean performFinish() {
-		org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor viewDescriptor =
-				new org.eclipse.gmf.runtime.diagram.ui.requests.CreateViewRequest.ViewDescriptor(
-						new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(referencedElementSelectionPage.getModelElement()),
-						org.eclipse.gmf.runtime.notation.Node.class, null, «EXPAND xpt::plugin::Activator::preferenceHintAccess FOR editorGen»);
-		org.eclipse.gmf.runtime.common.core.command.ICommand command =
-				new org.eclipse.gmf.runtime.diagram.ui.commands.CreateCommand(
-						editingDomain, viewDescriptor, referencedElementSelectionPage.getView());
-		command = command.compose(new «getCreateShortcutDecorationsCommandQualifiedClassName()»(
-				editingDomain, referencedElementSelectionPage.getView(), viewDescriptor));
-		try {
-			org.eclipse.core.commands.operations.OperationHistoryFactory.getOperationHistory().execute(
-				command, new org.eclipse.core.runtime.NullProgressMonitor(), null);
-		} catch (org.eclipse.core.commands.ExecutionException ee) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Unable to create shortcut", ee);«EXPAND xpt::Common::nonNLS»
-		}
-		return true;
-	}
-
-	/**
-	 * @generated
-	 */
-	private static class ReferencedElementSelectionPage extends «EXPAND xpt::editor::ModelElementSelectionPage::qualifiedClassName» {
-
-		/**
-		 * @generated
-		 */
-		private org.eclipse.gmf.runtime.notation.View view;
-
-		/**
-		 * @generated
-		 */
-		public ReferencedElementSelectionPage(String pageName, org.eclipse.gmf.runtime.notation.View view) {
-			super(pageName);
-			this.view = view;
-		}
-
-		/**
-		 * @generated
-		 */
-		public org.eclipse.gmf.runtime.notation.View getView() {
-			return view;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected String getSelectionTitle() {
-			return «EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForShortcutWizardReferencedElementPage(self))) FOR editorGen»;
-		}
-
-		/**
-		 * @generated
-		 */
-		protected boolean validatePage() {
-			if (selectedModelElement == null) {
-				setErrorMessage(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForShortcutWizardReferencedElementPageEmptyError(self)) FOR editorGen»);
-				return false;
-			}
-			boolean result = org.eclipse.gmf.runtime.diagram.core.services.ViewService.getInstance().provides(
-					org.eclipse.gmf.runtime.notation.Node.class,
-					new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(selectedModelElement),
-					view, null, org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.APPEND, true,
-					«EXPAND xpt::plugin::Activator::preferenceHintAccess FOR editorGen»);
-			setErrorMessage(result ? null : «EXPAND xpt::Externalizer::accessorCall(i18nKeyForShortcutWizardReferencedElementPageInvalidError(self)) FOR editorGen»);
-			return result;
-		}
-	}
-}
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«IF null <> editorGen.application-»
-«EXPAND xpt::Externalizer::messageEntry(nameKey(i18nKeyForShortcutWizardReferencedElementPage(self)), 'Select referenced element')-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForShortcutWizardReferencedElementPage(self)), 'Referenced element')-»
-«EXPAND xpt::Externalizer::messageEntry(descriptionKey(i18nKeyForShortcutWizardReferencedElementPage(self)), 'Select element that the new shortcut will refer to.')-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForShortcutWizardReferencedElementPage(self)), 'Select referenced element:')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForShortcutWizardReferencedElementPageEmptyError(self), 'Referenced element is not selected')-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForShortcutWizardReferencedElementPageInvalidError(self), 'Invalid referenced element is selected')-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-«IF null <> editorGen.application-»
-	«EXPAND xpt::Externalizer::accessorField(nameKey(i18nKeyForShortcutWizardReferencedElementPage(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForShortcutWizardReferencedElementPage(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(descriptionKey(i18nKeyForShortcutWizardReferencedElementPage(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForShortcutWizardReferencedElementPage(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForShortcutWizardReferencedElementPageEmptyError(self))-»
-	«EXPAND xpt::Externalizer::accessorField(i18nKeyForShortcutWizardReferencedElementPageInvalidError(self))-»
-«ENDIF-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt
deleted file mode 100644
index f8c4dbc45f5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ShortcutPropertyTester.xpt
+++ /dev/null
@@ -1,56 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE ShortcutPropertyTester FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «shortcutPropertyTesterClassName» extends org.eclipse.core.expressions.PropertyTester {
-
-	«EXPAND attributes-»
-
-	«EXPAND test-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected static final String SHORTCUT_PROPERTY = "isShortcut"; «EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«DEFINE test FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
-	if (false == receiver instanceof org.eclipse.gmf.runtime.notation.View) {
-		return false;
-	}
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) receiver;
-	if (SHORTCUT_PROPERTY.equals(method)) {
-		org.eclipse.emf.ecore.EAnnotation annotation = view.getEAnnotation("Shortcut"); «EXPAND xpt::Common::nonNLS»
-		if (annotation != null) {
-			return «EXPAND xpt::editor::VisualIDRegistry::modelID».equals(annotation.getDetails().get("modelID")); «EXPAND xpt::Common::nonNLS»
-		}
-	}
-	return false;
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
deleted file mode 100644
index 0d9bac2bab7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/UriEditorInputTester.xpt
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE UriEditorInputTester FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «uriInputTesterClassName» extends org.eclipse.core.expressions.PropertyTester {
-
-	«EXPAND test FOR editorGen-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE test FOR gmfgen::GenEditorGenerator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean test(Object receiver, String method, Object[] args, Object expectedValue) {
-	if (false == receiver instanceof org.eclipse.emf.common.ui.URIEditorInput) {
-		return false;
-	}
-	org.eclipse.emf.common.ui.URIEditorInput editorInput = (org.eclipse.emf.common.ui.URIEditorInput) receiver;
-	return "«diagramFileExtension»".equals(editorInput.getURI().fileExtension()); «EXPAND xpt::Common::nonNLS»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/Utils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/Utils.qvto
deleted file mode 100644
index 7aaad1ebd77..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/Utils.qvto
+++ /dev/null
@@ -1,266 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library Utils;
-
-helper hasNavigator(editorView : gmfgen::GenEditorView) : Boolean {
-	return null <> editorView.editorGen.navigator
-}
-
-helper addGotoMarker(editorView : gmfgen::GenEditorView, implementsList : Sequence(String)) : Sequence(String) {
-	return (if isIDEMode(editorView) then implementsList->including('org.eclipse.ui.ide.IGotoMarker') else implementsList endif)
-}
-
-helper isIDEMode(editorView : gmfgen::GenEditorView) : Boolean {
-	return null = editorView.editorGen.application
-}
-
-helper addReadOnlyPropSheet(editorView : gmfgen::GenEditorView, implementsList : Sequence(String)) : Sequence(String) {
-	return (if hasPropertySheet(editorView) and editorView.editorGen.propertySheet.readOnly then implementsList->including('org.eclipse.gmf.runtime.diagram.ui.properties.views.IReadOnlyDiagramPropertySheetPageContributor') else implementsList endif)
-}
-
-helper hasPropertySheet(editorView : gmfgen::GenEditorView) : Boolean {
-	return null <> editorView.editorGen.propertySheet
-}
-
-helper getEditorImplementsList(editorView : gmfgen::GenEditorView) : Sequence(String) {
-	return addGotoMarker(editorView, addReadOnlyPropSheet(editorView, Sequence {  }))
-}
-
-helper getContainedSemanticNodes(container : gmfgen::GenContainerBase) : Sequence(gmfgen::GenNode) {
-	return container.containedNodes->select(node | null <> node.modelFacet)->asSequence()
-}
-
-helper gmfgen::GenCommonBase::getEssentialVisualChildren() : Collection(gmfgen::GenCommonBase) {
-	return Sequence {  }
-}
-
-helper gmfgen::GenLink::getEssentialVisualChildren() : Collection(gmfgen::GenCommonBase) {
-	return self.labels
-}
-
-helper gmfgen::GenContainerBase::getEssentialVisualChildren() : Collection(gmfgen::GenCommonBase) {
-	return self.containedNodes
-}
-
-helper gmfgen::GenNode::getEssentialVisualChildren() : Collection(gmfgen::GenCommonBase) {
-	return ((Sequence {  })[gmfgen::GenNodeLabel]->union(self.labels->asSequence()))[gmfgen::GenCommonBase]->union(self.compartments->asSequence())->union(self.containedNodes->asSequence())
-}
-
-helper defaultShortcutCreationWizardClassName(diagram : gmfgen::GenDiagram) : String {
-	return 'ShortcutCreationWizard'
-}
-
-helper defaultModelElementSelectionPageClassName(diagram : gmfgen::GenDiagram) : String {
-	return 'ModelElementSelectionPage'
-}
-
-helper defaultValidateActionClassName(diagram : gmfgen::GenDiagram) : String {
-	return 'ValidateAction'
-}
-
-helper i18nKeyForDocumentProvider(diagram : gmfgen::GenDiagram) : String {
-	return diagram.documentProviderClassName
-}
-
-helper i18nKeyForDocumentProviderIsModifiable(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '_isModifiable'
-}
-
-helper i18nKeyForDocumentProviderHandleElementContentChanged(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '_handleElementContentChanged'
-}
-
-helper i18nKeyForDocumentProviderIncorrectInputError(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '.IncorrectInputError'
-}
-
-helper i18nKeyForDocumentProviderNoDiagramInResourceError(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '.NoDiagramInResourceError'
-}
-
-helper i18nKeyForDocumentProviderDiagramLoadingError(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '.DiagramLoadingError'
-}
-
-helper i18nKeyForDocumentUnsynchronizedFileSaveError(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '.UnsynchronizedFileSaveError'
-}
-
-helper i18nKeyForDocumentSaveDiagramTask(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '.SaveDiagramTask'
-}
-
-helper i18nKeyForDocumentSaveNextResourceTask(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '.SaveNextResourceTask'
-}
-
-helper i18nKeyForDocumentSaveAs(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDocumentProvider(diagram) + '.SaveAsOperation'
-}
-
-helper i18nKeyForDiagramEditorUtil(diagram : gmfgen::GenDiagram) : String {
-	return diagram.diagramEditorUtilClassName
-}
-
-helper i18nKeyForOpenModelResourceErrorDialog(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDiagramEditorUtil(diagram) + '.OpenModelResourceErrorDialog'
-}
-
-helper i18nKeyForCreateDiagramProgressTask(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDiagramEditorUtil(diagram) + '.CreateDiagramProgressTask'
-}
-
-helper i18nKeyForCreateDiagramCommandLabel(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForDiagramEditorUtil(diagram) + '.CreateDiagramCommandLabel'
-}
-
-helper i18nKeyForInitDiagramFileResourceErrorDialog() : String {
-	return 'InitDiagramFile.ResourceErrorDialog'
-}
-
-helper i18nKeyForInitDiagramFileWizardTitle() : String {
-	return 'InitDiagramFile.WizardTitle'
-}
-
-helper i18nKeyForInitDiagramOpenFileDialogTitle() : String {
-	return 'InitDiagramFile.OpenModelFileDialogTitle'
-}
-
-helper i18nKeyForNewDiagramFileWizard(diagram : gmfgen::GenDiagram) : String {
-	return diagram.newDiagramFileWizardClassName
-}
-
-helper i18nKeyForNewDiagramFileWizardCreationPage(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForNewDiagramFileWizard(diagram) + '.CreationPage'
-}
-
-helper i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForNewDiagramFileWizard(diagram) + '.RootSelectionPage'
-}
-
-helper i18nKeyForNewDiagramFileWizardRootSelectionPageSelectionTitle(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram) + 'SelectionTitle'
-}
-
-helper i18nKeyForNewDiagramFileWizardRootSelectionPageNoSelectionMessage(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram) + 'NoSelectionMessage'
-}
-
-helper i18nKeyForNewDiagramFileWizardRootSelectionPageInvalidSelectionMessage(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForNewDiagramFileWizardRootSelectionPage(diagram) + 'InvalidSelectionMessage'
-}
-
-helper i18nKeyForNewDiagramFileWizardInitDiagramCommand(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForNewDiagramFileWizard(diagram) + '.InitDiagramCommand'
-}
-
-helper i18nKeyForNewDiagramFileWizardIncorrectRootError(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForNewDiagramFileWizard(diagram) + '.IncorrectRootError'
-}
-
-helper i18nKeyForSavingDeletedFile(editor : gmfgen::GenEditorView) : String {
-	return i18nKeyForEditor(editor) + '.SavingDeletedFile'
-}
-
-helper i18nKeyForSaveAsProblems(editor : gmfgen::GenEditorView) : String {
-	return i18nKeyForEditor(editor) + '.SaveAsError'
-}
-
-helper i18nKeyForSaveProblems(editor : gmfgen::GenEditorView) : String {
-	return i18nKeyForEditor(editor) + '.SaveError'
-}
-
-helper i18nKeyForEditor(editor : gmfgen::GenEditorView) : String {
-	return editor.className
-}
-
-helper i18nKeyForSelectModelElement(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForElementChooser(diagram) + '.SelectModelElement'
-}
-
-helper i18nKeyForElementChooser(diagram : gmfgen::GenDiagram) : String {
-	return diagram.elementChooserClassName
-}
-
-helper i18nKeyForCreateShortcutOpenModel() : String {
-	return 'CreateShortcutAction.OpenModel'
-}
-
-helper i18nKeyForCreateShortcutWizard() : String {
-	return 'CreateShortcutAction.Wizard'
-}
-
-helper i18nKeyForShortcutWizardReferencedElementPage(diagram : gmfgen::GenDiagram) : String {
-	return defaultShortcutCreationWizardClassName(diagram) + '.ReferencedElementSelectionPage'
-}
-
-helper i18nKeyForModelElementSelectionPage(diagram : gmfgen::GenDiagram) : String {
-	return defaultModelElementSelectionPageClassName(diagram)
-}
-
-helper i18nKeyForValidateAction(diagram : gmfgen::GenDiagram) : String {
-	return defaultValidateActionClassName(diagram)
-}
-
-helper i18nKeyForShortcutWizardReferencedElementPageEmptyError(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForShortcutWizardReferencedElementPage(diagram) + 'EmptyError'
-}
-
-helper i18nKeyForShortcutWizardReferencedElementPageInvalidError(diagram : gmfgen::GenDiagram) : String {
-	return i18nKeyForShortcutWizardReferencedElementPage(diagram) + 'InvalidError'
-}
-
-helper i18nKeyForCreationWizard(diagram : gmfgen::GenDiagram) : String {
-	return diagram.creationWizardClassName
-}
-
-helper i18nKeyForCreationWizardDiagramPage(diagram : gmfgen::GenDiagram) : String {
-	return diagram.creationWizardClassName + '.DiagramModelFilePage'
-}
-
-helper i18nKeyForCreationWizardDomainPage(diagram : gmfgen::GenDiagram) : String {
-	return diagram.creationWizardClassName + '.DomainModelFilePage'
-}
-
-helper i18nKeyForCreationWizardOpenEditorError(diagram : gmfgen::GenDiagram) : String {
-	return diagram.creationWizardClassName + 'OpenEditorError'
-}
-
-helper i18nKeyForCreationWizardCreationError(diagram : gmfgen::GenDiagram) : String {
-	return diagram.creationWizardClassName + 'CreationError'
-}
-
-helper i18nKeyForCreationWizardPageExtensionError(diagram : gmfgen::GenDiagram) : String {
-	return diagram.creationWizardPageClassName + 'ExtensionError'
-}
-
-helper titleKey(dialogKey : String) : String {
-	return dialogKey + 'Title'
-}
-
-helper messageKey(dialogKey : String) : String {
-	return dialogKey + 'Message'
-}
-
-helper nameKey(dialogKey : String) : String {
-	return dialogKey + 'Name'
-}
-
-helper descriptionKey(dialogKey : String) : String {
-	return dialogKey + 'Description'
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ValidateAction.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
deleted file mode 100644
index 6f4fe717b18..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ValidateAction.xpt
+++ /dev/null
@@ -1,350 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::editor::Utils»
-«EXTENSION xpt::GenAuditRoot»
-
-«DEFINE className FOR gmfgen::GenDiagram»«defaultValidateActionClassName(self)»«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«editorGen.editor.packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE ValidateAction FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND className» extends org.eclipse.jface.action.Action {
-	«EXPAND attributes-»
-	«EXPAND _constructor-»
-	«EXPAND run-»
-	«EXPAND runValidation-»
-	«EXPAND runNonUIValidation-»
-	«EXPAND runValidationWithEP-»
-	«EXPAND runEMFValidator-»
-	«EXPAND validate-»
-	«EXPAND createMarkersForStatus-»
-	«EXPAND createMarkersForDiagnostic-»
-	«EXPAND addMarker-»
-	«EXPAND diagnosticToStatusSeverity-»
-	«EXPAND collectTargetElementsFromStatus-»
-	«EXPAND collectTargetElementsFromDiagnostic-»
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.IWorkbenchPage page;
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «EXPAND className»(org.eclipse.ui.IWorkbenchPage page) {
-		setText(«EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForValidateAction(self))) FOR editorGen»);
-		this.page = page;
-	}
-«ENDDEFINE»
-
-«DEFINE run FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void run() {
-		org.eclipse.ui.IWorkbenchPart workbenchPart = page.getActivePart();
-		if (workbenchPart instanceof org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart) {
-			final org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart part =	(org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart) workbenchPart;
-			try {
-				«IF editorGen.application = null-»
-				new org.eclipse.ui.actions.WorkspaceModifyDelegatingOperation(
-				«ENDIF-»
-					new org.eclipse.jface.operation.IRunnableWithProgress() {
-
-						public void run(org.eclipse.core.runtime.IProgressMonitor monitor)
-								throws InterruptedException, java.lang.reflect.InvocationTargetException {
-							runValidation(part.getDiagramEditPart(), part.getDiagram());
-						}
-					}
-				«IF editorGen.application = null-»
-				)
-				«ENDIF-»
-				.run(new org.eclipse.core.runtime.NullProgressMonitor());			
-			} catch (Exception e) {
-				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Validation action failed", e);«EXPAND xpt::Common::nonNLS»
-			}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE runValidation FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void runValidation(org.eclipse.gmf.runtime.notation.View view) {
-		try {
-			if («getDiagramEditorUtilQualifiedClassName()».openDiagram(view.eResource())) {
-				org.eclipse.ui.IEditorPart editorPart = org.eclipse.ui.PlatformUI.getWorkbench()
-						.getActiveWorkbenchWindow().getActivePage().getActiveEditor();
-				if (editorPart instanceof org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart) {
-					runValidation(((org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart) editorPart).
-							getDiagramEditPart(), view);
-				} else {
-					runNonUIValidation(view);
-				}
-			}
-		} catch (Exception e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-					"Validation action failed", e); «EXPAND xpt::Common::nonNLS»
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE runNonUIValidation FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void runNonUIValidation(org.eclipse.gmf.runtime.notation.View view) {
-		org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramEditPart =
-				org.eclipse.gmf.runtime.diagram.ui.OffscreenEditPartFactory.getInstance().createDiagramEditPart(
-						view.getDiagram());
-		runValidation(diagramEditPart, view);
-	}		
-«ENDDEFINE»
-
-«DEFINE runValidationWithEP FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void runValidation(org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramEditPart, org.eclipse.gmf.runtime.notation.View view) {
-		final org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart fpart = diagramEditPart;
-		final org.eclipse.gmf.runtime.notation.View fview = view;
-		org.eclipse.emf.transaction.TransactionalEditingDomain txDomain = org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(view);
-		«getValidationProviderQualifiedClassName()».runWithConstraints(txDomain, new Runnable() {
-
-			public void run() {
-				validate(fpart, fview);
-			}
-		});
-	}
-«ENDDEFINE»
-
-«DEFINE runEMFValidator FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static org.eclipse.emf.common.util.Diagnostic runEMFValidator(
-			org.eclipse.gmf.runtime.notation.View target) {
-		if (target.isSetElement() && target.getElement() != null) {
-			return new org.eclipse.emf.ecore.util.Diagnostician() {
-
-				public String getObjectLabel(org.eclipse.emf.ecore.EObject eObject) {
-					return org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil.getQualifiedName(eObject, true);
-				}
-			}.validate(target.getElement());
-		}
-		return org.eclipse.emf.common.util.Diagnostic.OK_INSTANCE;
-	}
-«ENDDEFINE»
-
-«DEFINE validate FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static void validate(org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramEditPart,
-			org.eclipse.gmf.runtime.notation.View view) {
-		«IF editorGen.application = null-»
-		org.eclipse.core.resources.IFile target = view.eResource() != null ?
-				org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(view.eResource()) : null;
-		if (target != null) {
-			«getMarkerNavigationProviderQualifiedClassName()».deleteMarkers(target);
-		}
-		«ELSE-»
-		org.eclipse.gmf.runtime.notation.View target = view;
-		«EXPAND xpt::editor::ValidationMarker::qualifiedClassName».removeAllMarkers(diagramEditPart.getViewer());
-		«ENDIF-»
-		org.eclipse.emf.common.util.Diagnostic diagnostic = runEMFValidator(view);
-		createMarkers(target, diagnostic, diagramEditPart);
-		org.eclipse.emf.validation.service.IBatchValidator validator =
-				(org.eclipse.emf.validation.service.IBatchValidator)
-						org.eclipse.emf.validation.service.ModelValidationService.getInstance().newValidator(
-								org.eclipse.emf.validation.model.EvaluationMode.BATCH);
-		validator.setIncludeLiveConstraints(true);
-		if (view.isSetElement() && view.getElement() != null) {
-			org.eclipse.core.runtime.IStatus status = validator.validate(view.getElement());
-			createMarkers(target, status, diagramEditPart);
-		}
-«IF shouldRunValidateOnDiagram(editorGen.audits)-»
-«IF hasDiagramElementTargetRule(editorGen.audits)-»
-		validator.setTraversalStrategy(«getValidationProviderQualifiedClassName()».getNotationTraversalStrategy(validator));
-«ENDIF-»
-		org.eclipse.core.runtime.IStatus status = validator.validate(view);
-		createMarkers(target, status, diagramEditPart);
-«ENDIF-»
-		«IF editorGen.application <> null and validationDecorators-»
-		«getValidationDecoratorProviderQualifiedClassName()».refreshDecorators(view);
-		for (java.util.Iterator it = view.eAllContents(); it.hasNext();) {
-			org.eclipse.emf.ecore.EObject next = (org.eclipse.emf.ecore.EObject) it.next();
-			if (next instanceof org.eclipse.gmf.runtime.notation.View) {
-				«getValidationDecoratorProviderQualifiedClassName()».refreshDecorators(
-						(org.eclipse.gmf.runtime.notation.View) next);
-			}
-		}
-		«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE createMarkersForStatus FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static void createMarkers(
-			«IF editorGen.application = null»org.eclipse.core.resources.IFile
-			«ELSE»org.eclipse.gmf.runtime.notation.View«ENDIF» target,
-			org.eclipse.core.runtime.IStatus validationStatus,
-			org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramEditPart) {
-		if (validationStatus.isOK()) {
-			return;
-		}
-		final org.eclipse.core.runtime.IStatus rootStatus = validationStatus;
-		java.util.List allStatuses = new java.util.ArrayList();
-		«getDiagramEditorUtilQualifiedClassName()».LazyElement2ViewMap element2ViewMap = new «getDiagramEditorUtilQualifiedClassName()».LazyElement2ViewMap(
-						diagramEditPart.getDiagramView(),
-						collectTargetElements(rootStatus, new «EXPAND CodeStyle::G('java.util.HashSet', 'org.eclipse.emf.ecore.EObject')»(), allStatuses));
-		for (java.util.Iterator it = allStatuses.iterator(); it.hasNext();) {
-			org.eclipse.emf.validation.model.IConstraintStatus nextStatus =
-					(org.eclipse.emf.validation.model.IConstraintStatus) it.next();
-			org.eclipse.gmf.runtime.notation.View view = «getDiagramEditorUtilQualifiedClassName()».findView(
-					diagramEditPart, nextStatus.getTarget(), element2ViewMap);			
-			addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view), 
-					org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil.getQualifiedName(nextStatus.getTarget(), true), 
-					nextStatus.getMessage(), nextStatus.getSeverity());
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE createMarkersForDiagnostic FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static void createMarkers(
-			«IF editorGen.application = null»org.eclipse.core.resources.IFile
-			«ELSE»org.eclipse.gmf.runtime.notation.View«ENDIF» target,
-			org.eclipse.emf.common.util.Diagnostic emfValidationStatus,
-			org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramEditPart) {
-		if (emfValidationStatus.getSeverity() == org.eclipse.emf.common.util.Diagnostic.OK) {
-			return;
-		}
-		final org.eclipse.emf.common.util.Diagnostic rootStatus = emfValidationStatus;
-		java.util.List allDiagnostics = new java.util.ArrayList();
-		«getDiagramEditorUtilQualifiedClassName()».LazyElement2ViewMap element2ViewMap =
-				new «getDiagramEditorUtilQualifiedClassName()».LazyElement2ViewMap(
-						diagramEditPart.getDiagramView(),
-						collectTargetElements(rootStatus, new «EXPAND CodeStyle::G('java.util.HashSet', 'org.eclipse.emf.ecore.EObject')»(), allDiagnostics));
-		for (java.util.Iterator it = emfValidationStatus.getChildren().iterator(); it.hasNext();) {
-			org.eclipse.emf.common.util.Diagnostic nextDiagnostic = (org.eclipse.emf.common.util.Diagnostic) it.next();
-			java.util.List data = nextDiagnostic.getData();
-			if (data != null && !data.isEmpty() && data.get(0) instanceof org.eclipse.emf.ecore.EObject) {
-				org.eclipse.emf.ecore.EObject element = (org.eclipse.emf.ecore.EObject) data.get(0);
-				org.eclipse.gmf.runtime.notation.View view = «getDiagramEditorUtilQualifiedClassName()».findView(
-						diagramEditPart, element, element2ViewMap);
-				addMarker(diagramEditPart.getViewer(), target, view.eResource().getURIFragment(view),
-						org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil.getQualifiedName(element, true),
-						nextDiagnostic.getMessage(), diagnosticToStatusSeverity(nextDiagnostic.getSeverity()));
-			}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE addMarker FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static void addMarker(org.eclipse.gef.EditPartViewer viewer,
-			«IF editorGen.application = null»org.eclipse.core.resources.IFile
-			«ELSE»org.eclipse.gmf.runtime.notation.View«ENDIF» target,
-			String elementId, String location, String message, int statusSeverity) {
-		if (target == null) {
-			return;
-		}
-		«IF editorGen.application = null-»
-		«getMarkerNavigationProviderQualifiedClassName()».addMarker(
-				target, elementId, location, message, statusSeverity);
-		«ELSE-»
-		new «EXPAND xpt::editor::ValidationMarker::qualifiedClassName»(
-				location, message, statusSeverity).add(viewer, elementId);
-		«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE diagnosticToStatusSeverity FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static int diagnosticToStatusSeverity(int diagnosticSeverity) {
-		if (diagnosticSeverity == org.eclipse.emf.common.util.Diagnostic.OK) {
-			return org.eclipse.core.runtime.IStatus.OK;
-		} else if (diagnosticSeverity == org.eclipse.emf.common.util.Diagnostic.INFO) {
-			return org.eclipse.core.runtime.IStatus.INFO;
-		} else if (diagnosticSeverity == org.eclipse.emf.common.util.Diagnostic.WARNING) {
-			return org.eclipse.core.runtime.IStatus.WARNING;
-		} else if (diagnosticSeverity == org.eclipse.emf.common.util.Diagnostic.ERROR
-				|| diagnosticSeverity == org.eclipse.emf.common.util.Diagnostic.CANCEL) {
-			return org.eclipse.core.runtime.IStatus.ERROR;
-		}
-		return org.eclipse.core.runtime.IStatus.INFO;
-	}
-«ENDDEFINE»
-
-«DEFINE collectTargetElementsFromStatus FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static «EXPAND CodeStyle::G('java.util.Set', 'org.eclipse.emf.ecore.EObject')» collectTargetElements(org.eclipse.core.runtime.IStatus status,
-			«EXPAND CodeStyle::G('java.util.Set', 'org.eclipse.emf.ecore.EObject')» targetElementCollector, java.util.List allConstraintStatuses) {
-		if (status instanceof org.eclipse.emf.validation.model.IConstraintStatus) {
-			targetElementCollector.add(((org.eclipse.emf.validation.model.IConstraintStatus) status).getTarget());
-			allConstraintStatuses.add(status);
-		}
-		if (status.isMultiStatus()) {
-			org.eclipse.core.runtime.IStatus[] children = status.getChildren();
-			for (int i = 0; i < children.length; i++) {
-				collectTargetElements(children[i], targetElementCollector, allConstraintStatuses);				
-			}
-		}
-		return targetElementCollector;
-	}
-«ENDDEFINE»
-
-«DEFINE collectTargetElementsFromDiagnostic FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static «EXPAND CodeStyle::G('java.util.Set', 'org.eclipse.emf.ecore.EObject')» collectTargetElements(org.eclipse.emf.common.util.Diagnostic diagnostic,
-			«EXPAND CodeStyle::G('java.util.Set', 'org.eclipse.emf.ecore.EObject')» targetElementCollector, java.util.List allDiagnostics) {
-		java.util.List data = diagnostic.getData();
-		org.eclipse.emf.ecore.EObject target = null;
-		if (data != null && !data.isEmpty() && data.get(0) instanceof org.eclipse.emf.ecore.EObject) {
-			target = (org.eclipse.emf.ecore.EObject) data.get(0);
-			targetElementCollector.add(target);	
-			allDiagnostics.add(diagnostic);
-		}
-		if (diagnostic.getChildren() != null && !diagnostic.getChildren().isEmpty()) {
-			for (java.util.Iterator it = diagnostic.getChildren().iterator(); it.hasNext();) {
-				collectTargetElements((org.eclipse.emf.common.util.Diagnostic) it.next(),
-						targetElementCollector, allDiagnostics);
-			}
-		}
-		return targetElementCollector;
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForValidateAction(self)), 'Validate')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForValidateAction(self)))-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
deleted file mode 100644
index 3a4dcb12a14..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/ValidationMarker.xpt
+++ /dev/null
@@ -1,111 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE className FOR gmfgen::GenDiagram»ValidationMarker«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«editorGen.editor.packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE ValidationMarker FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND className» {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static final String KEY = "validation_marker"; //$NON-NLS-1$
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static final «EXPAND className»[] EMPTY_ARRAY = new «EXPAND className»[0];
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final String location;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final String message;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final int statusSeverity;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «EXPAND className»(String location, String message, int statusSeverity) {
-		this.location = location;
-		this.message = message;
-		this.statusSeverity = statusSeverity;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getLocation() {
-		return location;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getMessage() {
-		return message;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public int getStatusSeverity() {
-		return statusSeverity;	
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static java.util.Map getMarkers(org.eclipse.gef.EditPartViewer viewer) {
-		java.util.Map markers = (java.util.Map) viewer.getProperty(KEY);
-		if (markers == null) {
-			markers = new java.util.HashMap();
-			viewer.setProperty(KEY, markers);
-		}
-		return markers;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static java.util.Set getMarkers(org.eclipse.gef.EditPartViewer viewer, String viewId, boolean create) {
-		java.util.Set markers = (java.util.Set) getMarkers(viewer).get(viewId);
-		if (markers == null) {
-			if (!create) {
-				return java.util.Collections.EMPTY_SET;
-			}
-			markers = new java.util.HashSet();
-			getMarkers(viewer).put(viewId, markers);
-		}
-		return markers;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static «EXPAND className»[] getMarkers(org.eclipse.gef.EditPartViewer viewer, String viewId) {
-		java.util.Set markers = getMarkers(viewer, viewId, false);
-		if (markers.isEmpty()) {
-			return EMPTY_ARRAY;
-		}
-		return («EXPAND className»[]) markers.toArray(new «EXPAND className»[markers.size()]);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void removeAllMarkers(org.eclipse.gef.EditPartViewer viewer) {
-		getMarkers(viewer).clear();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void add(org.eclipse.gef.EditPartViewer viewer, String viewId) {
-		getMarkers(viewer, viewId, true).add(this);
-	}
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
deleted file mode 100644
index d72aabfcb66..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/VisualIDRegistry.xpt
+++ /dev/null
@@ -1,477 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- * 	  Michael Golubev (Montages) - #372479
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION xpt::editor::Utils»
-«EXTENSION xpt::diagram::editpolicies::LinkUtils»
-«EXTENSION xpt::diagram::updater::Utils»
-
-
-«DEFINE VisualIDRegistry FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «editorGen.editor.packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment(
-		'This registry is used to determine which type of visual object should be\n' + 
-		'created for the corresponding Diagram, Node, ChildNode or Link represented\n' + 
-		'by a domain model object.\n'	
-	)»
-public class «visualIDRegistryClassName» {
-
-	«EXPAND attributes-»
-
-	«EXPAND getViewVisualID-»
-	
-	«EXPAND getModelID-»
-	
-	«EXPAND getVisualID-»
-
-	«EXPAND getType-»
-	
-	«EXPAND getDiagramVisualID-»
-	
-	«EXPAND getNodeVisualID-»
-	
-	«EXPAND canCreateNode-»
-	
-	«EXPAND getLinkWithClassVisualID-»
-	
-	«EXPAND isDiagram-»
-
-	«EXPAND _constraintMethods-»
-	
-	«EXPAND checkNodeVisualID-»
-
-	«EXPAND isCompartmentVisualID-»
-
-	«EXPAND isSemanticLeafVisualID-»
-
-	«EXPAND runtimeTypedInstance-»
-
-	«EXPAND additions-»	
-}
-«ENDDEFINE»
-
-«REM»
-	<Definitions of templates for outside usage>
-«ENDREM»
-
-«DEFINE visualID FOR gmfgen::GenCommonBase»«getEditPartQualifiedClassName()».VISUAL_ID«ENDDEFINE»
-
-«DEFINE modelID FOR gmfgen::GenDiagram»«getEditPartQualifiedClassName()».MODEL_ID«ENDDEFINE»
-
-«DEFINE getVisualIDMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND getVisualIdMethodName»«ENDDEFINE»
-
-«DEFINE getModelIDMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND getModelIDMethodName»«ENDDEFINE»
-
-«REM»
-	XXX looks like these methods would produce incorrect result for visualID of GenDiagram itself - ask Vano if
-	getType() method shouldn't be fixed similar to getVisualID, i.e. map diagram's visual id to MODEL_ID instead plain String.valueOf()
-«ENDREM»
-«DEFINE typeMethodCall(visualIdVar : String) FOR gmfgen::GenCommonBase»«getDiagram().getVisualIDRegistryQualifiedClassName()».«EXPAND getTypeMethodName FOR getDiagram()»(«visualIdVar»)«ENDDEFINE»
-«DEFINE typeMethodCall FOR gmfgen::GenCommonBase»«getDiagram().getVisualIDRegistryQualifiedClassName()».«EXPAND getTypeMethodName FOR getDiagram()»(«EXPAND visualID»)«ENDDEFINE»
-
-«DEFINE getDiagramVisualIDMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND getDiagramVisualIDMethodName»«ENDDEFINE»
-
-«DEFINE getNodeVisualIDMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND getNodeVisualIDMethodName»«ENDDEFINE»
-
-«DEFINE canCreateNodeMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND canCreateNodeMethodName»«ENDDEFINE»
-
-«DEFINE getLinkWithClassVisualIDMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND getLinkWithClassVisualIDMethodName»«ENDDEFINE»
-
-«REM»
-	</Definitions of templates for outside usage>
-«ENDREM»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static final String DEBUG_KEY = "«editorGen.plugin.iD»/debug/visualID"; «EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«DEFINE getViewVisualID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static int «EXPAND getVisualIdMethodName»(org.eclipse.gmf.runtime.notation.View view) {
-	if (view instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-		if («EXPAND modelID».equals(view.getType())) {
-			return «EXPAND visualID»;
-		} else {
-			«EXPAND unrecognizedVID-»
-		}
-	}
-	return «EXPAND getVisualIDMethodCall»(view.getType());
-}
-«ENDDEFINE»
-
-«DEFINE getVisualIdMethodName FOR gmfgen::GenDiagram»getVisualID«ENDDEFINE»
-
-«DEFINE getModelID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static String «EXPAND getModelIDMethodName»(org.eclipse.gmf.runtime.notation.View view) {
-	org.eclipse.gmf.runtime.notation.View diagram = view.getDiagram();
-	while (view != diagram) {
-		org.eclipse.emf.ecore.EAnnotation annotation = view.getEAnnotation("Shortcut"); «EXPAND xpt::Common::nonNLS»
-		if (annotation != null) {
-			return (String) annotation.getDetails().get("modelID"); «EXPAND xpt::Common::nonNLS»
-		}
-		view = (org.eclipse.gmf.runtime.notation.View) view.eContainer();
-	}
-	return diagram != null ? diagram.getType() : null;
-}
-«ENDDEFINE»
-
-«DEFINE getModelIDMethodName FOR gmfgen::GenDiagram»getModelID«ENDDEFINE»
-
-«DEFINE getVisualID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static int «EXPAND getVisualIdMethodName»(String type) {
-	try {
-		return Integer.parseInt(type);
-	} catch (NumberFormatException e) {
-		if (Boolean.TRUE.toString().equalsIgnoreCase(org.eclipse.core.runtime.Platform.getDebugOption(DEBUG_KEY))) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Unable to parse view type as a visualID number: " + type);
-		}
-	}
-	«EXPAND unrecognizedVID-»
-}
-«ENDDEFINE»
-
-«REM»
-	XXX getType may be optimized not to return new string each time, instead, cache known visual ids, e.g. with LinkedHashMap with removeEldestEntry?
-	However, even intern() seems too much, as in most usecases returned value is not kept, and unlikely to survive Eden (or whatever name it has) heap space 
-«ENDREM»
-«DEFINE getType FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-public static String «EXPAND getTypeMethodName»(int visualID) {
-	return Integer.toString(visualID);
-}
-«ENDDEFINE»
-
-«DEFINE getTypeMethodName FOR gmfgen::GenDiagram»getType«ENDDEFINE»
-
-«DEFINE getDiagramVisualID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static int «EXPAND getDiagramVisualIDMethodName»(org.eclipse.emf.ecore.EObject domainElement) {
-	if (domainElement == null) {
-		«EXPAND unrecognizedVID-»
-	}
-«IF null <> domainDiagramElement-»
-	«EXPAND returnVisualID-»
-«ENDIF-»
-	«EXPAND unrecognizedVID-»
-}
-«ENDDEFINE»
-
-«DEFINE getDiagramVisualIDMethodName FOR gmfgen::GenDiagram»getDiagramVisualID«ENDDEFINE»
-
-«DEFINE returnVisualID FOR gmfgen::GenCommonBase-»
-if («EXPAND checkSemanticElement») {
-	return «EXPAND visualID»;
-}
-«ENDDEFINE»
-
-«DEFINE checkSemanticElement FOR gmfgen::GenCommonBase-»
-	«ERROR 'checkSemanticElement not supported for: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE checkSemanticElement FOR gmfgen::GenDiagram»«EXPAND checkDomainElementMetaclass FOR domainDiagramElement» && isDiagram(«EXPAND MetaModel::CastEObject('domainElement') FOR domainDiagramElement»)«ENDDEFINE»
-«DEFINE checkSemanticElement FOR gmfgen::GenNode»«EXPAND checkDomainElementMetaclass FOR modelFacet.metaClass»«EXPAND checkDomainElementConstraints(self) FOR modelFacet»«ENDDEFINE»
-«DEFINE checkSemanticElement FOR gmfgen::GenLink»«EXPAND checkSemanticElement(self) FOR modelFacet»«ENDDEFINE»
-
-«DEFINE checkDomainElementMetaclass FOR genmodel::GenClass»«EXPAND MetaModel::MetaClass».isSuperTypeOf(domainElement.eClass())«ENDDEFINE»
-
-«DEFINE checkDomainElementConstraints(commonBase : gmfgen::GenCommonBase) FOR gmfgen::TypeModelFacet-»
-«IF null <> modelElementSelector» && «EXPAND _domainElementConstraintMethodName FOR commonBase»(«EXPAND MetaModel::CastEObject('domainElement') FOR metaClass»)«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE checkSemanticElement(genLink : gmfgen::GenLink) FOR gmfgen::LinkModelFacet»«ERROR 'checkSemanticElement is supported only for TypeLinkModelFacet: ' + self.repr()»«ENDDEFINE»
-«DEFINE checkSemanticElement(genLink : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet»«EXPAND checkDomainElementMetaclass FOR metaClass»«EXPAND checkDomainElementConstraints(genLink)»«ENDDEFINE»
-
-
-«DEFINE getNodeVisualID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static int «EXPAND getNodeVisualIDMethodName»(org.eclipse.gmf.runtime.notation.View containerView, org.eclipse.emf.ecore.EObject domainElement) {
-	if (domainElement == null) {
-		«EXPAND unrecognizedVID-»
-	}
-	String containerModelID = «EXPAND getModelIDMethodCall»(containerView);
-	if (!«EXPAND modelID».equals(containerModelID)«EXPAND checkContainerModelID FOREACH shortcutsProvidedFor») { «EXPAND xpt::Common::nonNLS FOR shortcutsProvidedFor->asSequence()»
-		«EXPAND unrecognizedVID-»
-	}
-	int containerVisualID;
-	if («EXPAND modelID».equals(containerModelID)) {
-		containerVisualID = «EXPAND getVisualIDMethodCall»(containerView);
-	} else {
-		if (containerView instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-			containerVisualID = «EXPAND visualID»;		
-		} else {
-			«EXPAND unrecognizedVID-»
-		}
-	}
-	switch (containerVisualID) {
-		«EXPAND caseDomainContainerVisualID FOREACH getAllContainers()-»
-	}
-	«EXPAND unrecognizedVID-»
-}
-«ENDDEFINE»
-
-«DEFINE getNodeVisualIDMethodName FOR gmfgen::GenDiagram»getNodeVisualID«ENDDEFINE»
-
-«DEFINE caseDomainContainerVisualID FOR gmfgen::GenContainerBase-»
-	«IF getContainedSemanticNodes(self)->size() > 0-»
-«EXPAND xpt::Common::caseVisualID»
-	«EXPAND returnVisualID FOREACH getContainedSemanticNodes(self)-»
-	break;
-	«ENDIF-»
-«ENDDEFINE»
-
-
-«DEFINE canCreateNode FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static boolean «EXPAND canCreateNodeMethodName»(org.eclipse.gmf.runtime.notation.View containerView, int nodeVisualID) {
-	String containerModelID = «EXPAND getModelIDMethodCall»(containerView);
-	if (!«EXPAND modelID».equals(containerModelID)«EXPAND checkContainerModelID FOREACH shortcutsProvidedFor») { «EXPAND xpt::Common::nonNLS FOR shortcutsProvidedFor->asSequence()»
-		return false;
-	}
-	int containerVisualID;
-	if («EXPAND modelID».equals(containerModelID)) {
-		containerVisualID = «EXPAND getVisualIDMethodCall»(containerView);
-	} else {
-		if (containerView instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-			containerVisualID = «EXPAND visualID»;		
-		} else {
-			return false;
-		}
-	}
-	switch (containerVisualID) {
-		«EXPAND caseVisualID FOREACH getAllContainers()->select(e | not e.getEssentialVisualChildren()->isEmpty())-»
-		«EXPAND caseVisualID FOREACH links->select(e | not e.getEssentialVisualChildren()->isEmpty())-»
-	}
-	return false;
-}
-«ENDDEFINE»
-
-«DEFINE canCreateNodeMethodName FOR gmfgen::GenDiagram»canCreateNode«ENDDEFINE»
-
-«DEFINE checkContainerModelID FOR String» && !"«self»".equals(containerModelID)«ENDDEFINE»
-
-«DEFINE caseVisualID FOR gmfgen::GenCommonBase-»
-«EXPAND xpt::Common::caseVisualID»
-	«EXPAND checkEssentialChild FOREACH self.getEssentialVisualChildren()-»
-	break;
-«ENDDEFINE»
-
-«DEFINE checkEssentialChild FOR gmfgen::GenCommonBase-»
-if («EXPAND visualID» == nodeVisualID) {
-	return true;
-}
-«ENDDEFINE»
-
-«DEFINE getLinkWithClassVisualID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static int «EXPAND getLinkWithClassVisualIDMethodName»(org.eclipse.emf.ecore.EObject domainElement) {
-	if (domainElement == null) {
-		«EXPAND unrecognizedVID-»
-	}
-	«EXPAND returnVisualID FOREACH links->select(isTypeLink())-»
-	«EXPAND unrecognizedVID-»
-}
-«ENDDEFINE»
-
-«DEFINE getLinkWithClassVisualIDMethodName FOR gmfgen::GenDiagram»getLinkWithClassVisualID«ENDDEFINE»
-
-
-«DEFINE isDiagram FOR gmfgen::GenDiagram-»
-	«IF null <> domainDiagramElement-»
-		«EXPAND xpt::Common::generatedMemberComment(
-			'User can change implementation of this method to handle some specific\n' + 
-			'situations not covered by default logic.\n'
-		)»
-private static boolean isDiagram(«EXPAND MetaModel::QualifiedClassName FOR domainDiagramElement» element) {
-	return true;
-}
-	«ENDIF-»
-«ENDDEFINE»
-
-
-«REM»
-
-		Support for extra contstraints to check about model element.
-		Includes expression fields for interpreted constrains (like ocl or regexp).
-		For each model element that has an associated constraint, there's a method is<DomainElement>_<UID>()
-		that performs extra specification as defined by value expression 
-
-		FIXME don't use static fields, replace with instance/separate cache (e.g. accessible from Activator)
-«ENDREM»
-
-«DEFINE _constraintMethods FOR gmfgen::GenDiagram-»
-«IF null <> editorGen.expressionProviders-»
-	«EXPAND _constraintMethod FOREACH topLevelNodes->select(n | n.modelFacet.modelElementSelector <> null)-»
-	«EXPAND _constraintMethod FOREACH childNodes->select(n | n.modelFacet.modelElementSelector <> null)-»
-	«FOREACH links AS l»«EXPAND _constraintMethod(l) FOR l.modelFacet»«ENDFOREACH»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE _constraintMethod FOR gmfgen::GenNode-»
-«EXPAND _domainElementConstraintMethod(self, modelFacet.modelElementSelector, modelFacet.metaClass) FOR modelFacet.modelElementSelector.provider»
-«ENDDEFINE»
-
-«DEFINE _constraintMethod(l : gmfgen::GenLink) FOR gmfgen::LinkModelFacet»«ENDDEFINE» // no-op
-«DEFINE _constraintMethod(l : gmfgen::GenLink) FOR gmfgen::TypeLinkModelFacet-»
-«IF modelElementSelector <> null»«EXPAND _domainElementConstraintMethod(l, modelElementSelector, metaClass) FOR modelElementSelector.provider»«ENDIF-»
-«ENDDEFINE»
-
-
-«DEFINE _domainElementConstraintMethodName FOR gmfgen::GenCommonBase»is«getUniqueIdentifier()»«ENDDEFINE»
-
-«DEFINE _domainElementConstraintMethod(diagramElement : gmfgen::GenCommonBase, expression : gmfgen::ValueExpression, context : genmodel::GenClass) FOR gmfgen::GenExpressionProviderBase»«ERROR 'Constraint method is not supported for ' + self.repr()»«ENDDEFINE»
-
-«DEFINE _domainElementConstraintMethod(diagramElement : gmfgen::GenCommonBase, expression : gmfgen::ValueExpression, context : genmodel::GenClass) FOR gmfgen::GenJavaExpressionProvider-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static boolean «EXPAND _domainElementConstraintMethodName FOR diagramElement»(«EXPAND MetaModel::QualifiedClassName FOR context» domainElement) {
-«IF injectExpressionBody and (expression.body <> null and expression.body.size() <> 0)-»
-		«expression.body»
-«ELSEIF throwException or (injectExpressionBody and (expression.body = null or expression.body.size() = 0))-»
-		// FIXME: implement this method 
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new java.lang.UnsupportedOperationException("No java implementation provided in '«EXPAND _domainElementConstraintMethodName FOR diagramElement»' operation");«EXPAND xpt::Common::nonNLS»
-«ELSE-»
-		return false;
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-// FIXME move these methods to ElementInitializers or any other more suitable place
-«DEFINE _domainElementConstraintMethod(diagramElement : gmfgen::GenCommonBase, expression : gmfgen::ValueExpression, context : genmodel::GenClass) FOR gmfgen::GenExpressionInterpreter-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static boolean «EXPAND _domainElementConstraintMethodName FOR diagramElement»(«EXPAND MetaModel::QualifiedClassName FOR context» domainElement) {
-		Object result = «EXPAND xpt::expressions::getExpression::getExpression(expression, context)».evaluate(domainElement);
-		return result instanceof Boolean && ((Boolean)result).booleanValue();
-	}			
-«ENDDEFINE»
-
-«REM»
-		Constraints support end.
-«ENDREM»
-
-
-«DEFINE unrecognizedVID FOR gmfgen::GenDiagram-»
-return -1;
-«ENDDEFINE»
-
-«DEFINE checkNodeVisualIDMethodName FOR gmfgen::GenDiagram»checkNodeVisualID«ENDDEFINE»
-«DEFINE checkNodeVisualIDMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND checkNodeVisualIDMethodName»«ENDDEFINE»
-
-«DEFINE checkNodeVisualID FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static boolean «EXPAND checkNodeVisualIDMethodName»(org.eclipse.gmf.runtime.notation.View containerView, org.eclipse.emf.ecore.EObject domainElement, int candidate) {
-		if (candidate == -1){
-			//unrecognized id is always bad
-			return false;
-		}
-		«REM»For now there are only one possibility, but this may be changed in moderately near future«ENDREM»«-»
-		int basic = «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodName»(containerView, domainElement);
-		return basic == candidate;
-	}
-«ENDDEFINE»
-
-«DEFINE isCompartmentVisualIDMethodName FOR gmfgen::GenDiagram»isCompartmentVisualID«ENDDEFINE»
-«DEFINE isCompartmentVisualIDMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND isCompartmentVisualIDMethodName»«ENDDEFINE»
-
-«DEFINE isCompartmentVisualID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static boolean «EXPAND isCompartmentVisualIDMethodName»(int visualID) {
-		«IF not compartments->isEmpty()-»
-			switch (visualID) {
-				«EXPAND xpt::Common::caseVisualID FOREACH compartments»
-					return true;
-				default:
-					break;
-			}
-		«ENDIF-»
-		return false;
-	}
-«ENDDEFINE»
-
-«DEFINE isSemanticLeafVisualIDMethodName FOR gmfgen::GenDiagram»isSemanticLeafVisualID«ENDDEFINE»
-«DEFINE isSemanticLeafVisualIDMethodCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND isSemanticLeafVisualIDMethodName»«ENDDEFINE»
-
-«DEFINE isSemanticLeafVisualID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static boolean «EXPAND isSemanticLeafVisualIDMethodName»(int visualID) {
-		switch (visualID) {
-			«REM»We need to ensure at last one case, this is legitimate way«ENDREM»«-»
-			«EXPAND xpt::Common::caseVisualID FOR self»
-				return false;
-			«LET self.getAllNodes()->asSequence()->select(n | getSemanticChildren(n)->isEmpty() and n.compartments->forAll(c | getSemanticChildren(c)->isEmpty())) AS leafs-»
-			«IF not leafs->isEmpty()-»
-			«EXPAND xpt::Common::caseVisualID FOREACH leafs->sortedBy(n | n.visualID)»
-				return true;
-			«ENDIF-»
-			«ENDLET-»
-			default:
-				break;
-		}
-		return false;
-	}
-«ENDDEFINE»
-
-«DEFINE runtimeTypedInstanceName FOR gmfgen::GenDiagram»TYPED_INSTANCE«ENDDEFINE»
-«DEFINE runtimeTypedInstanceCall FOR gmfgen::GenDiagram»«getVisualIDRegistryQualifiedClassName()».«EXPAND runtimeTypedInstanceName»«ENDDEFINE»
-
-«DEFINE runtimeTypedInstance FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedClassComment»
-	public static final org.eclipse.gmf.tooling.runtime.structure.DiagramStructure «EXPAND runtimeTypedInstanceName» = new org.eclipse.gmf.tooling.runtime.structure.DiagramStructure() {
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI»
-		public int «EXPAND xpt::editor::VisualIDRegistry::getVisualIdMethodName»(org.eclipse.gmf.runtime.notation.View view) {
-			return «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(view);
-		}
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI»
-		public String «EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodName»(org.eclipse.gmf.runtime.notation.View view) {
-			return «EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(view);
-		}
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI»
-		public int «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodName»(org.eclipse.gmf.runtime.notation.View containerView, org.eclipse.emf.ecore.EObject domainElement) {
-			return «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(containerView, domainElement);
-		}
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI»
-		public boolean «EXPAND checkNodeVisualIDMethodName»(org.eclipse.gmf.runtime.notation.View containerView, org.eclipse.emf.ecore.EObject domainElement, int candidate) {
-			return «EXPAND checkNodeVisualIDMethodCall»(containerView, domainElement, candidate);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI»
-		public boolean «EXPAND isCompartmentVisualIDMethodName»(int visualID) {
-			return «EXPAND isCompartmentVisualIDMethodCall»(visualID);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::overrideI»
-		public boolean «EXPAND isSemanticLeafVisualIDMethodName»(int visualID) {
-			return «EXPAND isSemanticLeafVisualIDMethodCall»(visualID);
-		}
-	};
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/extensions.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/extensions.xpt
deleted file mode 100644
index d9c30ae67f1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/extensions.xpt
+++ /dev/null
@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE extensions FOR gmfgen::GenEditorGenerator»
-   <extension point="org.eclipse.ui.editors" id="gmf-editor">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <editor
-         id="«editor.iD»"
-         name="%editorName"
-         icon="«editor.iconPathX»"
-         extensions="«diagramFileExtension»"
-         default="true"
-         class="«editor.getQualifiedClassName()»"
-         matchingStrategy="«diagram.getMatchingStrategyQualifiedClassName()»"
-         contributorClass="«editor.getActionBarContributorQualifiedClassName()»">
-      </editor>
-   </extension>
-   
-   <extension point="org.eclipse.ui.contexts" id="ui-context">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <context
-         description="%context.description"
-         id="«editor.contextID»"
-         name="%context.name"
-         parentId="org.eclipse.gmf.runtime.diagram.ui.diagramContext">
-      </context>
-   </extension>
-
-   <extension point="org.eclipse.ui.newWizards" id="creation-wizard">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-  	  <wizard
-  	     name="%newWizardName"
-  	     icon="«diagram.creationWizardIconPathX»"
-  	     category="«diagram.creationWizardCategoryID»"
-  	     class="«diagram.getCreationWizardQualifiedClassName()»"
-  	     id="«diagram.getCreationWizardQualifiedClassName()»ID">
-  	  	 <description>%newWizardDesc</description>  
-      </wizard>
-   </extension>
-
-«IF diagram.generateInitDiagramAction()-»
-   «IF null = application»<extension point="org.eclipse.ui.popupMenus" id="init-diagram-action">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <objectContribution
-            id="«plugin.iD».InitDiagram"
-            nameFilter="*.«domainFileExtension»"
-            objectClass="org.eclipse.core.resources.IFile">
-         <action
-               label="%initDiagramActionLabel"
-               class="«diagram.getInitDiagramFileActionQualifiedClassName()»"
-               menubarPath="additions"
-               enablesFor="1"
-               id="«plugin.iD».InitDiagramAction">
-         </action>
-      </objectContribution>
-   </extension>
-	«ELSE-»
-   <extension point="org.eclipse.ui.actionSets" id="init-diagram-action">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <actionSet
-            label="%initDiagramActionLabel"
-            visible="true"
-            id="«plugin.iD».InitDiagram">
-         <action
-               label="%initDiagramActionLabel"
-               class="«diagram.getInitDiagramFileActionQualifiedClassName()»"
-               menubarPath="file/additions"
-               id="«plugin.iD».InitDiagramAction">
-         </action>
-      </actionSet>
-   </extension>
-	«ENDIF-»
-«ENDIF-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
deleted file mode 100644
index 42a508e034c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/palette/PaletteFactory.xpt
+++ /dev/null
@@ -1,285 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION xpt::editor::palette::Utils»
-
-«DEFINE Factory FOR gmfgen::Palette»
-«EXPAND xpt::Common::copyright FOR diagram.editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «factoryClassName» {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void fillPalette(org.eclipse.gef.palette.PaletteRoot paletteRoot) {
-«IF definesStandardTools()-»
-		cleanStandardTools(paletteRoot);
-«ENDIF-»
-		«EXPAND addEntry('paletteRoot') FOREACH groups-»
-	}
-«IF definesStandardTools()»
-«EXPAND cleanStandardToolsHack-»
-«ENDIF-»
-
-«EXPAND createGroup FOREACH collectGroups(self)»
-«EXPAND createEntry FOREACH collectTools(self)»
-
-«EXPAND generateToolEntryClasses»
-}
-«ENDDEFINE»
-
-«REM»Override this method with «EXPAND generateToolEntryClasses(true)» if you need to generate ToolEntry classes
-     override also «DEFINE newEntry(toolVarName : String) FOR gmfgen::Palette»«ENDREM»
-«DEFINE generateToolEntryClasses FOR gmfgen::Palette»«EXPAND generateToolEntryClasses(false)»«ENDDEFINE»
-
-«DEFINE generateToolEntryClasses(shouldGenerateEntryClasses : Boolean) FOR gmfgen::Palette-»
-	«IF needsNodeToolEntryClass(self) and shouldGenerateEntryClasses»«EXPAND nodeToolEntry»«ENDIF-»
-	«IF needsLinkToolEntryClass(self) and shouldGenerateEntryClasses»«EXPAND linkToolEntry»«ENDIF-»
-«ENDDEFINE»
-
-
-«DEFINE createGroup FOR gmfgen::ToolGroup-»
-	«EXPAND xpt::Common::generatedMemberComment('Creates \"' + title + '\" palette tool group')»
-	private org.eclipse.gef.palette.PaletteContainer «createMethodName»() {
-		«EXPAND newContainer('paletteContainer')-»
-		«EXPAND setIdentity('paletteContainer')-»
-		«EXPAND setDescription('paletteContainer', self) FOR description-»
-		«EXPAND setSmallImage('paletteContainer', palette)-»
-		«EXPAND setLargeImage('paletteContainer', palette)-»
-		«EXPAND addEntry('paletteContainer') FOREACH entries-»
-		return paletteContainer;
-	}
-«ENDDEFINE»
-
-«DEFINE newContainer(varName : String) FOR gmfgen::ToolGroup-»
-«IF collapse and toolsOnly-»
-		org.eclipse.gef.palette.PaletteDrawer «varName» = new org.eclipse.gef.palette.PaletteDrawer(«EXPAND i18nTitle»);
-«ELSEIF stack-»
-		org.eclipse.gef.palette.PaletteStack «varName» = new org.eclipse.gef.palette.PaletteStack(«EXPAND i18nTitle», null, null);
-«ELSE-»
-		org.eclipse.gef.palette.PaletteGroup «varName» = new org.eclipse.gef.palette.PaletteGroup(«EXPAND i18nTitle»);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE setDescription(varName : String, gr : gmfgen::ToolGroup) FOR String-»
-«varName».setDescription(«EXPAND i18nDesc FOR gr»);
-«ENDDEFINE»
-
-«DEFINE addEntry(varName : String) FOR gmfgen::ToolGroupItem»
-«ERROR 'abstract addEntry(ToolGroupItem,String) template'»
-«ENDDEFINE»
-
-«DEFINE addEntry(varName : String) FOR gmfgen::AbstractToolEntry-»
-«varName».add(«createMethodName»());
-«IF _default and group.stack-»
-«varName».setActiveEntry((org.eclipse.gef.palette.ToolEntry) paletteContainer.getChildren().get(paletteContainer.getChildren().size() - 1));
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE addEntry(varName : String) FOR gmfgen::Separator-»
-«varName».add(new org.eclipse.gef.palette.PaletteSeparator());
-«ENDDEFINE»
-
-«DEFINE addEntry(varName : String) FOR gmfgen::ToolGroup-»
-«varName».add(«createMethodName»());
-«ENDDEFINE»
-
-«DEFINE createEntry FOR gmfgen::AbstractToolEntry-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gef.palette.ToolEntry «createMethodName»() {
-		«EXPAND newEntry('entry')-»
-		«EXPAND setIdentity('entry')-»
-		«EXPAND setSmallImage('entry', group.palette)-»
-		«EXPAND setLargeImage('entry', group.palette)-»
-		«EXPAND setToolClass('entry')-»
-		«EXPAND setToolProperty('entry') FOREACH properties-»
-		return entry;
-	}
-«ENDDEFINE»
-
-«DEFINE newEntry(toolVarName : String) FOR gmfgen::AbstractToolEntry-»
-«ERROR 'abstract newEntry(AbstractToolEntry,String) template'»
-«ENDDEFINE»
-
-«REM»Override this method with «EXPAND newEntry(toolVarName, false)» if you need to generate ToolEntry classes
-     override also «EXPAND generateToolEntryClasses(shouldGenerateEntryClasses : Boolean)» FOR gmfgen::Palette»«ENDREM»
-«DEFINE newEntry(toolVarName : String) FOR gmfgen::ToolEntry»«EXPAND newEntry(toolVarName, false)»«ENDDEFINE»
-«DEFINE newEntry(toolVarName : String, shouldGenerateEntryClasses : Boolean) FOR gmfgen::ToolEntry-»
-«IF elements->isEmpty()-»
-org.eclipse.gef.palette.ToolEntry «toolVarName» = new org.eclipse.gef.palette.ToolEntry(«EXPAND i18nTitle», «EXPAND i18nDesc», null, null) {};
-«ELSE-»
-«LET (if genNodes->isEmpty() 
-	then (if shouldGenerateEntryClasses then 'LinkToolEntry' else 'org.eclipse.gmf.tooling.runtime.part.DefaultLinkToolEntry' endif) 
-	else (if shouldGenerateEntryClasses then 'NodeToolEntry' else 'org.eclipse.gmf.tooling.runtime.part.DefaultNodeToolEntry' endif) endif) 
-	AS toolEntryClass-»
-«IF elements->size() > 1-»
-«EXPAND CodeStyle::newGenericInstance('types', 'java.util.ArrayList', 'org.eclipse.gmf.runtime.emf.type.core.IElementType') FOR elements->any(true)»(«elements->size()»);
-«FOREACH elements->asSequence() AS e-»
-types.add(«EXPAND xpt::providers::ElementTypes::accessElementType FOR e»);
-«ENDFOREACH-»
-«ENDIF-»
-«toolEntryClass» «toolVarName» = new «toolEntryClass»(«EXPAND i18nTitle», «EXPAND i18nDesc», «IF elements->size() > 1»types«ELSE»java.util.Collections.singletonList(«EXPAND xpt::providers::ElementTypes::accessElementType FOR elements->first()»)«ENDIF»);
-«ENDLET-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE newEntry(toolVarName : String) FOR gmfgen::StandardEntry-»
-«IF gmfgen::StandardEntryKind::SELECT = kind -»
-«EXPAND newStdSelectEntry(toolVarName)-»
-«ELSEIF kind = gmfgen::StandardEntryKind::MARQUEE-»
-«EXPAND newStdMarqueeEntry(toolVarName)-»
-«ELSEIF kind = gmfgen::StandardEntryKind::ZOOM-»
-«EXPAND newStdZoomEntry(toolVarName)-»
-«ELSE-»
-«EXPAND newStdOtherEntry(toolVarName)-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE newStdSelectEntry(toolVarName : String) FOR gmfgen::StandardEntry-»
-org.eclipse.gef.palette.PanningSelectionToolEntry «toolVarName» = new org.eclipse.gef.palette.PanningSelectionToolEntry();
-«ENDDEFINE»
-
-«DEFINE newStdMarqueeEntry(toolVarName : String) FOR gmfgen::StandardEntry-»
-org.eclipse.gef.palette.MarqueeToolEntry «toolVarName» = new org.eclipse.gef.palette.MarqueeToolEntry();
-«ENDDEFINE»
-
-«DEFINE newStdZoomEntry(toolVarName : String) FOR gmfgen::StandardEntry-»
-FIXME
-«ENDDEFINE»
-
-«DEFINE newStdOtherEntry(toolVarName : String) FOR gmfgen::StandardEntry-»
-«ERROR 'override newStdOtherEntry(StandardEntry, String) for kind ' + kind.repr()»
-«ENDDEFINE»
-
-// FIXME: odd code - FOR EntryBase, while most of the template is valid for ToolEntry only!!!
-«DEFINE setSmallImage(toolVarName : String, palette : gmfgen::Palette) FOR gmfgen::EntryBase-»
-«IF null <> smallIconPath-»
-«toolVarName».setSmallIcon(«palette.activatorFQN()».findImageDescriptor("«smallIconPath»"));«EXPAND xpt::Common::nonNLS»
-«ELSEIF not (Sequence { self })[gmfgen::ToolEntry].elements->isEmpty()-»
-«LET self.oclAsType(gmfgen::ToolEntry) AS toolEntry-»
-«toolVarName».setSmallIcon(«palette.diagram.getElementTypesQualifiedClassName()».getImageDescriptor(«EXPAND xpt::providers::ElementTypes::accessElementType FOR toolEntry.elements->first()»));
-«ENDLET-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE setLargeImage(toolVarName : String, palette : gmfgen::Palette) FOR gmfgen::EntryBase-»
-«IF null <> largeIconPath-»
-«toolVarName».setLargeIcon(«palette.activatorFQN()».findImageDescriptor("«largeIconPath»")); «EXPAND xpt::Common::nonNLS»
-«ELSEIF not (Sequence { self })[gmfgen::ToolEntry].elements->isEmpty()-»
-«toolVarName».setLargeIcon(«toolVarName».getSmallIcon());
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE setToolClass(toolVarName : String) FOR gmfgen::AbstractToolEntry-»
-«IF null <> qualifiedToolName-»
-«toolVarName».setToolClass(«qualifiedToolName».class);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE setToolProperty(toolVarName : String) FOR ecore::EStringToStringMapEntry-»
-«toolVarName».setToolProperty(«key», «value»);
-«ENDDEFINE»
-
-«DEFINE i18nTitle FOR gmfgen::ToolEntry-»
-«IF title = null»null«ELSE»«EXPAND xpt::Externalizer::accessorCall(i18nTitleKey(self)) FOR group.palette.diagram.editorGen»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nTitle FOR gmfgen::ToolGroup-»
-«IF title = null»null«ELSE»«EXPAND xpt::Externalizer::accessorCall(i18nTitleKey(self)) FOR palette.diagram.editorGen»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nDesc FOR gmfgen::ToolEntry-»
-«IF null = description»null«ELSE»«EXPAND xpt::Externalizer::accessorCall(i18nDescKey(self)) FOR group.palette.diagram.editorGen»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nDesc FOR gmfgen::ToolGroup-»
-«IF null = description»null«ELSE»«EXPAND xpt::Externalizer::accessorCall(i18nDescKey(self)) FOR palette.diagram.editorGen»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::Palette-»
-«EXPAND internal_i18n_accessors FOREACH collectGroups(self)-»
-«EXPAND internal_i18n_accessors FOREACH collectTools(self)-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::Palette-»
-«EXPAND internal_i18n_values FOREACH collectGroups(self)-»
-«EXPAND internal_i18n_values FOREACH collectTools(self)-»
-«ENDDEFINE»
-
-«DEFINE internal_i18n_accessors FOR gmfgen::EntryBase-»
-«IF null <> title»«EXPAND xpt::Externalizer::accessorField(i18nTitleKey(self))»«ENDIF-»
-«IF null <> description»«EXPAND xpt::Externalizer::accessorField(i18nDescKey(self))»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE internal_i18n_values FOR gmfgen::EntryBase-»
-«IF null <> title»«EXPAND xpt::Externalizer::messageEntry(i18nTitleKey(self), title)»«ENDIF-»
-«IF null <> description»«EXPAND xpt::Externalizer::messageEntry(i18nDescKey(self), description)»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE cleanStandardToolsHack FOR gmfgen::Palette»
-	«EXPAND xpt::Common::generatedMemberComment('Workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=159289')»
-	private void cleanStandardTools(org.eclipse.gef.palette.PaletteRoot paletteRoot) {
-		for (java.util.Iterator it = paletteRoot.getChildren().iterator(); it.hasNext();) {
-			org.eclipse.gef.palette.PaletteEntry entry = (org.eclipse.gef.palette.PaletteEntry) it.next();
-			if (!"standardGroup".equals(entry.getId())) { «EXPAND xpt::Common::nonNLS»
-				continue;
-			}
-			for (java.util.Iterator it2 = ((org.eclipse.gef.palette.PaletteContainer) entry).getChildren().iterator(); it2.hasNext();) {
-				org.eclipse.gef.palette.PaletteEntry entry2 = (org.eclipse.gef.palette.PaletteEntry) it2.next();
-				if ("zoomTool".equals(entry2.getId())) { «EXPAND xpt::Common::nonNLS»
-					it2.remove();
-				} else if ("noteStack".equals(entry2.getId())) { «EXPAND xpt::Common::nonNLS»
-					it2.remove();
-				} else if ("selectionTool".equals(entry2.getId())) { «EXPAND xpt::Common::nonNLS»
-					it2.remove();
-				}
-				if (paletteRoot.getDefaultEntry() == entry2) {
-					paletteRoot.setDefaultEntry(null);
-				}
-			}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE nodeToolEntry FOR gmfgen::Palette»
-	«EXPAND xpt::Common::generatedClassComment»
-	private static class NodeToolEntry extends org.eclipse.gmf.tooling.runtime.part.DefaultNodeToolEntry {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private NodeToolEntry(String title, String description, java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> elementTypes) {
-			super(title, description, elementTypes);
-		}
-		
-	}
-«ENDDEFINE»
-
-«DEFINE linkToolEntry FOR gmfgen::Palette»
-	«EXPAND xpt::Common::generatedClassComment»
-	private static class LinkToolEntry extends org.eclipse.gmf.tooling.runtime.part.DefaultLinkToolEntry {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private LinkToolEntry(String title, String description, java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> elementTypes) {
-			super(title, description, elementTypes);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE setIdentity(toolVarName : String) FOR gmfgen::EntryBase-»
-«IF id <> null and id.size() <> 0-»
-		 «toolVarName».setId(«id»);«IF id.isQuoted('\"')»«EXPAND xpt::Common::nonNLS»«ENDIF»
-«ENDIF-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/palette/Utils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/palette/Utils.qvto
deleted file mode 100644
index 1a6ec8cf4e4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/editor/palette/Utils.qvto
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library Utils;
-
-helper gmfgen::Palette::activatorFQN() : String {
-	return self.diagram.editorGen.plugin.getActivatorQualifiedClassName()
-}
-
-helper gmfgen::AbstractToolEntry::activatorFQN() : String {
-	return self.group.palette.activatorFQN()
-}
-
-helper gmfgen::ToolGroup::activatorFQN() : String {
-	return self.palette.activatorFQN()
-}
-
-helper i18nKey(group : gmfgen::EntryBase) : String {
-	return let rv = group.createMethodName in (if rv.startsWith('get') then rv.substringAfter('get') else (if rv.startsWith('create') then rv.substringAfter('create') else rv endif) endif)
-}
-
-helper i18nTitleKey(group : gmfgen::EntryBase) : String {
-	return i18nKey(group) + '_title'
-}
-
-helper i18nDescKey(group : gmfgen::EntryBase) : String {
-	return i18nKey(group) + '_desc'
-}
-
-helper collectGroups(palette : gmfgen::Palette) : Sequence(gmfgen::ToolGroup) {
-	return palette.groups->asSequence()->union(palette.groups->collect(it | collectSubGroups(it)))->asOrderedSet()->asSequence()
-}
-
-helper collectSubGroups(group : gmfgen::ToolGroup) : Sequence(gmfgen::ToolGroup) {
-	return let rv = (group.entries)[gmfgen::ToolGroup] in rv->union(rv->collect(g | collectSubGroups(g))->flatten()->asSet())->asSequence()
-}
-
-helper collectTools(palette : gmfgen::Palette) : Sequence(gmfgen::AbstractToolEntry) {
-	return collectGroups(palette).entries[gmfgen::AbstractToolEntry]
-}
-
-helper needsNodeToolEntryClass(palette : gmfgen::Palette) : Boolean {
-	return collectTools(palette)[gmfgen::ToolEntry]->exists(genNodes->notEmpty())
-}
-
-helper needsLinkToolEntryClass(palette : gmfgen::Palette) : Boolean {
-	return collectTools(palette)[gmfgen::ToolEntry]->exists(genLinks->notEmpty())
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt
deleted file mode 100644
index b3a908dde76..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/AbstractExpression.xpt
+++ /dev/null
@@ -1,150 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE AbstractExpression FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.expressionProviders.expressionsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public abstract class «editorGen.expressionProviders.abstractExpressionClassName» «EXPAND supertypes»{
-
-«EXPAND status-»
-
-«EXPAND body-»
-
-«EXPAND context-»
-
-«EXPAND ctors-»
-
-«EXPAND evaluate-»
-
-«EXPAND performCast-»
-
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE supertypes FOR gmfgen::GenDiagram»«ENDDEFINE»
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE status FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.core.runtime.IStatus status = org.eclipse.core.runtime.Status.OK_STATUS;	
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void setStatus(int severity, String message, Throwable throwable) {		
-		String pluginID = «editorGen.plugin.getActivatorQualifiedClassName()».ID;
-		this.status = new org.eclipse.core.runtime.Status(severity, pluginID, -1, (message != null) ? message : "", throwable);«EXPAND xpt::Common::nonNLS»
-		if(!this.status.isOK()) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Expression problem:" + message + "body:"+ body(), throwable);«EXPAND xpt::Common::nonNLS»«EXPAND xpt::Common::nonNLS(2)»
-		}
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.core.runtime.IStatus getStatus() {
-		return status;
-	}
-«ENDDEFINE»
-
-«DEFINE body FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final String myBody;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String body() {
-		return myBody;
-	}
-«ENDDEFINE»
-
-«DEFINE context FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final org.eclipse.emf.ecore.EClassifier myContext;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EClassifier context() {
-		return myContext;
-	}
-«ENDDEFINE»
-
-«DEFINE ctors FOR gmfgen::GenDiagram-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «editorGen.expressionProviders.abstractExpressionClassName»(String body, org.eclipse.emf.ecore.EClassifier context) {
-		myBody = body;
-		myContext = context;
-	}
-«ENDDEFINE»
-
-«DEFINE evaluate FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::SuppressWarnings('"rawtypes"')-»
-	protected abstract Object doEvaluate(Object context, java.util.Map env);
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public Object evaluate(Object context) {
-		return evaluate(context, java.util.Collections.EMPTY_MAP);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::SuppressWarnings('"rawtypes"')-»
-	public Object evaluate(Object context, java.util.Map env) {
-		if(context().isInstance(context)) {
-			try {
-				return doEvaluate(context, env);
-			} catch(Exception e) {
-				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Expression evaluation failure: " + body(), e);«EXPAND xpt::Common::nonNLS»
-			}
-		}
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE performCast FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment('Expression may return number value which is not directly compatible with feature type (e.g. Double when Integer is expected), or EEnumLiteral meta-object when literal instance is expected')»
-	public static Object performCast(Object value, org.eclipse.emf.ecore.EDataType targetType) {
-		if (targetType instanceof org.eclipse.emf.ecore.EEnum) {
-			if (value instanceof org.eclipse.emf.ecore.EEnumLiteral) {
-				org.eclipse.emf.ecore.EEnumLiteral literal = (org.eclipse.emf.ecore.EEnumLiteral) value;
-				return (literal.getInstance() != null) ? literal.getInstance() : literal;
-			}
-		}
-		if (false == value instanceof Number || targetType == null || targetType.getInstanceClass() == null) {
-			return value;
-		}
-		Class«EXPAND CodeStyle::G('?')» targetClass = targetType.getInstanceClass();
-		Number num = (Number) value;
-		Class«EXPAND CodeStyle::G('?')» valClass = value.getClass();
-		Class«EXPAND CodeStyle::G('?')» targetWrapperClass = targetClass;
-		if (targetClass.isPrimitive()) {
-			targetWrapperClass = org.eclipse.emf.ecore.util.EcoreUtil.wrapperClassFor(targetClass);
-		}
-		if (valClass.equals(targetWrapperClass)) {
-			return value;
-		}
-		if (Number.class.isAssignableFrom(targetWrapperClass)) {
-			if (targetWrapperClass.equals(Byte.class)) return new Byte(num.byteValue());
-			if (targetWrapperClass.equals(Integer.class)) return new Integer(num.intValue());
-			if (targetWrapperClass.equals(Short.class)) return new Short(num.shortValue());
-			if (targetWrapperClass.equals(Long.class)) return new Long(num.longValue());
-			if (targetWrapperClass.equals(java.math.BigInteger.class)) return java.math.BigInteger.valueOf(num.longValue());
-			if (targetWrapperClass.equals(Float.class)) return new Float(num.floatValue());
-			if (targetWrapperClass.equals(Double.class)) return new Double(num.doubleValue());
-			if (targetWrapperClass.equals(java.math.BigDecimal.class)) return new java.math.BigDecimal(num.doubleValue());
-		}
-		return value;
-	}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt
deleted file mode 100644
index d07f7d49a08..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/OCLExpressionFactory.xpt
+++ /dev/null
@@ -1,169 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE OCLExpressionFactory FOR gmfgen::GenExpressionInterpreter-»
-«EXPAND xpt::Common::copyright FOR container.editorGen-»
-package «container.expressionsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «className» {
-
-	«EXPAND _initInterpreterFactory»
-
-	«EXPAND xpt::Common::generatedMemberComment('This is factory method, callers are responsible to keep reference to the return value if they want to reuse parsed expression')»
-	public static «container.getAbstractExpressionQualifiedClassName()» getExpression(String body, org.eclipse.emf.ecore.EClassifier context, java.util.Map«EXPAND CodeStyle::G2('String', 'org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram» environment) {
-		return new Expression(body, context, environment);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment('This method will become private in the next release')»«REM»FIXME private or completely remove in the next release. Besides, no real need to pass emptyMap when null would suffice «ENDREM»
-	public static «container.getAbstractExpressionQualifiedClassName()» getExpression(String body, org.eclipse.emf.ecore.EClassifier context) {
-		return getExpression(body, context, «EXPAND CodeStyle::emptyMap('String, org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram»);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static class Expression extends «container.getAbstractExpressionQualifiedClassName()» {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private final org.eclipse.ocl.ecore.OCL oclInstance;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.ocl.ecore.OCLExpression oclExpression;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public Expression(String body, org.eclipse.emf.ecore.EClassifier context, java.util.Map«EXPAND CodeStyle::G2('String', 'org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram» environment) {
-			super(body, context);
-			oclInstance = org.eclipse.ocl.ecore.OCL.newInstance();
-			initCustomEnv(oclInstance.getEnvironment(), environment);
-			«REM»
-			   I've moved expression initialization right into constructor because:
-			   - Caching and weak references done at the caller are more effective for this usecase (we have an instance/static field to reference this Expression anyway)
-			   - Expression's status is known right away, not only after protected getQuery get invoked 
-			«ENDREM»«-»
-			org.eclipse.ocl.ecore.OCL.Helper oclHelper = oclInstance.createOCLHelper();
-			oclHelper.setContext(context());
-			try {
-				oclExpression = oclHelper.createQuery(body());
-				setStatus(org.eclipse.core.runtime.IStatus.OK, null, null);
-			} catch (org.eclipse.ocl.ParserException e) {
-				setStatus(org.eclipse.core.runtime.IStatus.ERROR, e.getMessage(), e);
-			}
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::SuppressWarnings('"rawtypes"') FOR container.editorGen.diagram-»
-		protected Object doEvaluate(Object context, java.util.Map env) {
-			if (oclExpression == null) {
-				return null;
-			}
-			// on the first call, both evalEnvironment and extentMap are clear, for later we have finally, below.
-			org.eclipse.ocl.EvaluationEnvironment«EXPAND CodeStyle::G('?,?,?,?,?') FOR container.editorGen.diagram»  evalEnv = oclInstance.getEvaluationEnvironment();
-			// initialize environment«REM»Using Object below because Map env comes as raw type, and Object(unlike String) works fine for both Iterator<Type> = iterable.iterator() and for (Type a : iterable) code styles «ENDREM»
-			«EXPAND CodeStyle::iterate('nextKey', 'Object', 'env.keySet()') FOR container.editorGen.diagram-»
-				evalEnv.replace((String) nextKey, env.get(nextKey));
-			}
-			try {
-				Object result = oclInstance.evaluate(context, oclExpression);
-				return oclInstance.isInvalid(result) ? null : result;
-			} finally {
-				evalEnv.clear();
-				oclInstance.setExtentMap(null); // clear allInstances cache, and get the oclInstance ready for the next call
-			}
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private static void initCustomEnv(org.eclipse.ocl.Environment«EXPAND CodeStyle::G('?,org.eclipse.emf.ecore.EClassifier,?,?,?,org.eclipse.emf.ecore.EParameter,?,?,?,?,?,?') FOR container.editorGen.diagram» ecoreEnv, java.util.Map«EXPAND CodeStyle::G2('String', 'org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram» environment) {
-			«EXPAND initializeEnvironment('ecoreEnv')-»
-			«EXPAND CodeStyle::iterate('varName', 'String', 'environment.keySet()') FOR container.editorGen.diagram-»
-				org.eclipse.emf.ecore.EClassifier varType = «EXPAND CodeStyle::castTyped('org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram»environment.get(varName);
-				ecoreEnv.addElement(varName, createVar(ecoreEnv, varName, varType), false);
-			}
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private static org.eclipse.ocl.ecore.Variable createVar(org.eclipse.ocl.Environment«EXPAND CodeStyle::G('?,org.eclipse.emf.ecore.EClassifier,?,?,?,?,?,?,?,?,?,?') FOR container.editorGen.diagram» ecoreEnv, String name, org.eclipse.emf.ecore.EClassifier type) {
-			org.eclipse.ocl.ecore.Variable var = org.eclipse.ocl.ecore.EcoreFactory.eINSTANCE.createVariable();
-			var.setName(name);
-			var.setType(«EXPAND CodeStyle::castTyped('org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram»ecoreEnv.getUMLReflection().getOCLType(type));
-			return var;
-		}
-	}
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«REM»
-  Clients may override if they don't need
-«ENDREM»
-«DEFINE initializeEnvironment(String environmentVar) FOR gmfgen::GenExpressionInterpreter-»
-// Use EObject as implicit root class for any object, to allow eContainer() and other EObject operations from OCL expressions
-org.eclipse.ocl.options.ParsingOptions.setOption(«environmentVar», org.eclipse.ocl.options.ParsingOptions.implicitRootClass(«environmentVar»), org.eclipse.emf.ecore.EcorePackage.eINSTANCE.getEObject());
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenExpressionInterpreter»«ENDDEFINE»
-
-// just to avoid identical piece of template in the RegexpExpressionFactory
-«DEFINE _initInterpreterFactory FOR gmfgen::GenExpressionInterpreter-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final «container.getAbstractExpressionQualifiedClassName()»[] expressions; 
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	private final String [] expressionBodies;	
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected «className»() {
-		this.expressions = new «container.getAbstractExpressionQualifiedClassName()»[«expressions->size()»];
-		this.expressionBodies = new String[] {
-				«FOREACH expressions.getBodyString() AS b»«b», «EXPAND xpt::Common::nonNLS»
-				«ENDFOREACH-»
-			};
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static «className» getInstance() {
-		«className» instance = «EXPAND plugin::Activator::instanceAccess FOR container.editorGen».get«className»();
-		if (instance == null) {			
-			«EXPAND plugin::Activator::instanceAccess FOR container.editorGen».set«className»(instance = new «className»());
-		}
-		return instance;
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static String getExpressionBody(int index) {
-		return getInstance().expressionBodies[index];
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	«REM»
-			- I'm not quite sure indexes instead of string bodies are good approach, may revisit this later.
-			- There's no confidence we shouldn't keep Map/Set instead of fixed length array for expressions.
-			  The reason I didn't use Map/Set right away is uncertainty with the key - i.e. body only, body + context, or
-			  body+context+environment(how). I.e. if it's possible (reasonable) to have same body for different contexts - 
-			  of course, 'self.oclIsUndefined()' may be run in different contexts, but it's useless example.
-			- DGMT and reuse of gmfgen::ValueExpressions might be related here - if we decide identical body is enough to
-			  reuse an expression (and change DGMT#bindToProvider accordingly), then the answer to previous point would become obvious (i.e. "body is enough")   
-	«ENDREM-»
-	public static «container.getAbstractExpressionQualifiedClassName()» getExpression(int index, org.eclipse.emf.ecore.EClassifier context, java.util.Map«EXPAND CodeStyle::G2('String', 'org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram» environment) {
-		«className» cached = getInstance();
-		if (index < 0 || index >= cached.expressions.length) {
-			throw new IllegalArgumentException();
-		}
-		if (cached.expressions[index] == null) {			
-			cached.expressions[index] = getExpression(cached.expressionBodies[index], context, environment == null ? «EXPAND CodeStyle::emptyMap('String, org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram» : environment);
-		}
-		return cached.expressions[index];
-	}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/OclTracker.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/OclTracker.qvto
deleted file mode 100644
index 41fb756a119..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/OclTracker.qvto
+++ /dev/null
@@ -1,11 +0,0 @@
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library OclTracker;
-
-helper isForcedImpactAnalyzerKind(oclExpression : String) : Boolean {
-	return null != oclExpression and oclExpression.startsWith('--IA');
-}
-
-
-
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt
deleted file mode 100644
index 1ccd7813688..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/RegexpExpressionFactory.xpt
+++ /dev/null
@@ -1,75 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE RegexpExpressionFactory FOR gmfgen::GenExpressionInterpreter-»
-«EXPAND xpt::Common::copyright FOR container.editorGen-»
-package «container.expressionsPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «className» {
-
-	«EXPAND xpt::expressions::OCLExpressionFactory::_initInterpreterFactory»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static «container.getAbstractExpressionQualifiedClassName()» getExpression(String body, org.eclipse.emf.ecore.EClassifier context, java.util.Map«EXPAND CodeStyle::G2('String', 'org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram» environment) {
-		return new Expression(body, context, environment);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment('This method will become private in the next release')»«REM»FIXME private or completely remove in the next release «ENDREM»
-	public static «container.getAbstractExpressionQualifiedClassName()» getExpression(String body, org.eclipse.emf.ecore.EClassifier context) {
-		return getExpression(body, context, «EXPAND CodeStyle::emptyMap('String, org.eclipse.emf.ecore.EClassifier') FOR container.editorGen.diagram»);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static class Expression extends «container.getAbstractExpressionQualifiedClassName()» {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private final java.util.regex.Pattern pattern;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::SuppressWarnings('"rawtypes"') FOR container.editorGen.diagram-»
-		public Expression(String body, org.eclipse.emf.ecore.EClassifier context, java.util.Map environment) {
-			super(body, context);
-			java.util.regex.Pattern p;
-			try {
-				p = java.util.regex.Pattern.compile(body);
-			} catch (java.util.regex.PatternSyntaxException e) {
-				setStatus(org.eclipse.core.runtime.IStatus.ERROR, e.getMessage(), e);
-				p = null;
-			}
-			this.pattern = p;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::SuppressWarnings('"rawtypes"') FOR container.editorGen.diagram-»
-		protected Object doEvaluate(Object contextInstance, java.util.Map env) {
-			if (pattern == null) {
-				return null;
-			}
-			if (context() instanceof org.eclipse.emf.ecore.EDataType) {
-				contextInstance = org.eclipse.emf.ecore.util.EcoreUtil.convertToString(
-						(org.eclipse.emf.ecore.EDataType) context(), contextInstance);
-			}
-			java.util.regex.Matcher matcher = this.pattern.matcher(String.valueOf(contextInstance));
-			return Boolean.valueOf(«IF language = gmfgen::GenLanguage::nregexp»!«ENDIF»matcher.matches());
-		}
-	}
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenExpressionInterpreter»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/getExpression.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/getExpression.xpt
deleted file mode 100644
index 74a9264fc06..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/expressions/getExpression.xpt
+++ /dev/null
@@ -1,45 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
- 
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-
-«DEFINE getExpressionBody FOR gmfgen::ValueExpression-»
-«EXPAND getExpressionBody(self) FOR provider»
-«ENDDEFINE»
-
-«DEFINE getExpressionBody(gmfgen::ValueExpression valueExpr) FOR gmfgen::GenExpressionProviderBase»«ERROR 'Abstract template call: getExpression'»«ENDDEFINE»
-
-«DEFINE getExpressionBody(gmfgen::ValueExpression valueExpr) FOR gmfgen::GenExpressionInterpreter-»
-«getQualifiedClassName()».getExpressionBody(«expressions->indexOf(valueExpr) - 1»)«-»
-«ENDDEFINE»
-
-
-«DEFINE getExpression(gmfgen::ValueExpression valueExpr, genmodel::GenClassifier context) FOR gmfgen::GenExpressionProviderBase»«ERROR 'Abstract template call: getExpression'»«ENDDEFINE»
-
-«DEFINE getExpression(gmfgen::ValueExpression valueExpr, genmodel::GenClassifier context) FOR gmfgen::GenExpressionInterpreter-»
-«EXPAND getExpression(valueExpr, context, 'null')-»
-«ENDDEFINE»
-
-// occasionally we need to use some well-known context type, i.e. String
-«DEFINE getExpression(gmfgen::ValueExpression valueExpr, String contextMetaClassifier) FOR gmfgen::GenExpressionInterpreter-»
-«getQualifiedClassName()».«getExpressionAccessor(valueExpr)»(«expressions->indexOf(valueExpr) - 1», «contextMetaClassifier», 'null')«-»
-«ENDDEFINE»
-
-// pass specific environment to obtain expression 
-«DEFINE getExpression(gmfgen::ValueExpression valueExpr, genmodel::GenClassifier context, String environmentArg) FOR gmfgen::GenExpressionInterpreter-»
-«getQualifiedClassName()».«getExpressionAccessor(valueExpr)»(«expressions->indexOf(valueExpr) - 1», «EXPAND MetaModel::MetaClass FOR context», «environmentArg»)«-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
deleted file mode 100644
index b36803b7113..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/AbstractNavigatorItem.xpt
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE AbstractNavigatorItem FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public abstract class «abstractNavigatorItemClassName» extends org.eclipse.core.runtime.PlatformObject {
-
-«IF null <> editorGen.propertySheet»
-	«EXPAND registerAdapterFactory-»
-«ENDIF-»
-	
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-	
-	«EXPAND getParent-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE registerAdapterFactory FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-static {
-	final Class[] supportedTypes = new Class[] { org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor.class };
-	final org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor propertySheetPageContributor = new org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor() {
-		public String getContributorId() {
-			return "«editorGen.plugin.iD»"; «EXPAND xpt::Common::nonNLS»
-		}
-	};
-	org.eclipse.core.runtime.Platform.getAdapterManager().registerAdapters(new org.eclipse.core.runtime.IAdapterFactory() {
-		
-		public Object getAdapter(Object adaptableObject, Class adapterType) {
-			if (adaptableObject instanceof «getAbstractNavigatorItemQualifiedClassName()» && adapterType == org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor.class) {
-				return propertySheetPageContributor;				
-			}
-			return null;
-		}
-
-		public Class[] getAdapterList() {
-			return supportedTypes;
-		}
-	}, «getAbstractNavigatorItemQualifiedClassName()».class);
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private Object myParent;
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-protected «abstractNavigatorItemClassName»(Object parent) {
-	myParent = parent;
-}
-«ENDDEFINE»
-
-«DEFINE getParent FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public Object getParent() {
-	return myParent;
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
deleted file mode 100644
index d93d798c1bb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorContentProvider.xpt
+++ /dev/null
@@ -1,101 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
- 
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE DomainNavigatorContentProvider FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «domainContentProviderClassName» implements org.eclipse.ui.navigator.ICommonContentProvider {
-
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-
-	«EXPAND xpt::navigator::NavigatorContentProvider::iContentProvider-»
-	
-	«EXPAND xpt::navigator::NavigatorContentProvider::iStructuredContentProvider-»
-	
-	«EXPAND xpt::navigator::NavigatorContentProvider::iMementoAware-»
-    
-    «EXPAND xpt::navigator::NavigatorContentProvider::iCommonContentProvider-»
-    
-    «EXPAND iTreeContentProvider-»
-    
-    «EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider myAdapterFctoryContentProvier;
-
-	«EXPAND xpt::navigator::NavigatorContentProvider::attributes-»
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public «domainContentProviderClassName»() {
-	myAdapterFctoryContentProvier = new org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider(«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getItemProvidersAdapterFactory());
-	«EXPAND xpt::navigator::NavigatorContentProvider::initCommonAttributes-»
-}
-«ENDDEFINE»
-
-«DEFINE iTreeContentProvider FOR gmfgen::GenNavigator-»
-	«EXPAND getChildren-»
-	
-	«EXPAND wrapEObjects-»
-	
-	«EXPAND xpt::navigator::NavigatorContentProvider::getParent-»
-	
-	«EXPAND xpt::navigator::NavigatorContentProvider::hasChildren-»
-«ENDDEFINE»
-
-«DEFINE getChildren FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public Object[] getChildren(Object parentElement) {
-	if (parentElement instanceof org.eclipse.core.resources.IFile) {
-		«EXPAND xpt::navigator::NavigatorContentProvider::getFileResource-»
-		return wrapEObjects(myAdapterFctoryContentProvier.getChildren(resource), parentElement);
-	}
-	
-	if (parentElement instanceof «getDomainNavigatorItemQualifiedClassName()») {
-		return wrapEObjects(myAdapterFctoryContentProvier.getChildren(((«getDomainNavigatorItemQualifiedClassName()») parentElement).getEObject()), parentElement);
-	}
-	«EXPAND getOtherChildren-»
-}
-«ENDDEFINE»
-
-«DEFINE getOtherChildren FOR gmfgen::GenNavigator-»
-return EMPTY_ARRAY;
-«ENDDEFINE»
-
-«DEFINE wrapEObjects FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public Object[] wrapEObjects(Object[] objects, Object parentElement) {
-	java.util.Collection result = new java.util.ArrayList();
-	for (int i = 0; i < objects.length; i++) {
-		if (objects[i] instanceof org.eclipse.emf.ecore.EObject) {
-			result.add(new «getDomainNavigatorItemQualifiedClassName()»((org.eclipse.emf.ecore.EObject) objects[i], parentElement, myAdapterFctoryContentProvier));
-		}
-	}
-	return result.toArray();
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
deleted file mode 100644
index dd2f0a8e0d5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorItem.xpt
+++ /dev/null
@@ -1,124 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE DomainNavigatorItem FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «domainNavigatorItemClassName» extends org.eclipse.core.runtime.PlatformObject {
-
-	«EXPAND registerAdapterFactory-»
-	
-	«EXPAND xpt::navigator::AbstractNavigatorItem::attributes-»
-	
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-	
-	«EXPAND xpt::navigator::AbstractNavigatorItem::getParent-»
-	
-	«EXPAND getEObject-»
-	
-	«EXPAND getPropertySourceProvider-»
-	
-	«EXPAND equals-»
-	
-	«EXPAND hashCode-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE registerAdapterFactory FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-static {
-	final Class[] supportedTypes = new Class[] { org.eclipse.emf.ecore.EObject.class, org.eclipse.ui.views.properties.IPropertySource.class };
-	org.eclipse.core.runtime.Platform.getAdapterManager().registerAdapters(new org.eclipse.core.runtime.IAdapterFactory() {
-		
-		public Object getAdapter(Object adaptableObject, Class adapterType) {
-			if (adaptableObject instanceof «getDomainNavigatorItemQualifiedClassName()») {
-				«getDomainNavigatorItemQualifiedClassName()» domainNavigatorItem = («getDomainNavigatorItemQualifiedClassName()») adaptableObject;
-				org.eclipse.emf.ecore.EObject eObject = domainNavigatorItem.getEObject();
-				if (adapterType == org.eclipse.emf.ecore.EObject.class) {
-					return eObject;
-				}
-				if (adapterType == org.eclipse.ui.views.properties.IPropertySource.class) {
-					return domainNavigatorItem.getPropertySourceProvider().getPropertySource(eObject);
-				}
-			}
-		
-			return null;
-		}
-
-		public Class[] getAdapterList() {
-			return supportedTypes;
-		}
-	}, «getDomainNavigatorItemQualifiedClassName()».class);
-}
-«ENDDEFINE»
-
-«DEFINE  attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.emf.ecore.EObject myEObject;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.ui.views.properties.IPropertySourceProvider myPropertySourceProvider;
-«ENDDEFINE»
-
-«DEFINE  _constructor FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public «domainNavigatorItemClassName»(org.eclipse.emf.ecore.EObject eObject, Object parent, org.eclipse.ui.views.properties.IPropertySourceProvider propertySourceProvider) {
-	myParent = parent;
-	myEObject = eObject;
-	myPropertySourceProvider = propertySourceProvider;
-}
-«ENDDEFINE»
-
-«DEFINE  getEObject FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.emf.ecore.EObject getEObject() {
-	return myEObject;
-}
-«ENDDEFINE»
-
-«DEFINE getPropertySourceProvider FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.ui.views.properties.IPropertySourceProvider getPropertySourceProvider() {
-	return myPropertySourceProvider;
-}
-«ENDDEFINE»
-
-«DEFINE  equals FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean equals(Object obj) {
-	if (obj instanceof «getDomainNavigatorItemQualifiedClassName()») {
-		return org.eclipse.emf.ecore.util.EcoreUtil.getURI(getEObject()).equals(org.eclipse.emf.ecore.util.EcoreUtil.getURI(((«getDomainNavigatorItemQualifiedClassName()») obj).getEObject()));
-	}
-	return super.equals(obj);
-}
-«ENDDEFINE»
-	
-«DEFINE  hashCode FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public int hashCode() {
-	return org.eclipse.emf.ecore.util.EcoreUtil.getURI(getEObject()).hashCode();
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
deleted file mode 100644
index c9591ad51e6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/DomainNavigatorLabelProvider.xpt
+++ /dev/null
@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
- 
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE DomainNavigatorLabelProvider FOR gmfgen::GenNavigator-»
-		«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «domainLabelProviderClassName» implements org.eclipse.ui.navigator.ICommonLabelProvider {
-
-	«EXPAND attributes-»
-	
-	«EXPAND iCommonLabelProvider-»
-	
-	«EXPAND iLabelProvider-»
-	
-	«EXPAND iBaseLabelProvider-»
-	
-	«EXPAND xpt::navigator::NavigatorContentProvider::iMementoAware-»
-	
-	«EXPAND iDescriptionProvider-»
-	
-    «EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider myAdapterFactoryLabelProvider = new org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider(«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getItemProvidersAdapterFactory());
-«ENDDEFINE»
-
-«DEFINE iCommonLabelProvider FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void init(org.eclipse.ui.navigator.ICommonContentExtensionSite aConfig) {
-}
-«ENDDEFINE»
-
-«DEFINE iLabelProvider FOR gmfgen::GenNavigator-»
-	«EXPAND getImage-»
-	
-	«EXPAND getText-»
-«ENDDEFINE»
-
-«DEFINE iBaseLabelProvider FOR gmfgen::GenNavigator-»
-	«EXPAND addListener-»
-
-	«EXPAND dispose-»
-
-	«EXPAND isLabelProperty-»
-
-	«EXPAND removeListener-»
-«ENDDEFINE»
-
-«DEFINE iDescriptionProvider FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public String getDescription(Object anElement) {
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE addListener FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void addListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
-	myAdapterFactoryLabelProvider.addListener(listener);
-}
-«ENDDEFINE»
-
-«DEFINE dispose FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void dispose() {
-	myAdapterFactoryLabelProvider.dispose();
-}
-«ENDDEFINE»
-
-«DEFINE isLabelProperty FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isLabelProperty(Object element, String property) {
-	return myAdapterFactoryLabelProvider.isLabelProperty(element, property);
-}
-«ENDDEFINE»
-
-«DEFINE removeListener FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void removeListener(org.eclipse.jface.viewers.ILabelProviderListener listener) {
-	myAdapterFactoryLabelProvider.removeListener(listener);
-}
-«ENDDEFINE»
-
-«DEFINE getImage FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.swt.graphics.Image getImage(Object element) {
-	if (element instanceof «getDomainNavigatorItemQualifiedClassName()») {
-		return myAdapterFactoryLabelProvider.getImage(«EXPAND getEObject»);
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE getEObject FOR gmfgen::GenNavigator»((«getDomainNavigatorItemQualifiedClassName()») element).getEObject()«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public String getText(Object element) {
-	if (element instanceof «getDomainNavigatorItemQualifiedClassName()») {
-		return myAdapterFactoryLabelProvider.getText(«EXPAND getEObject»);
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt
deleted file mode 100644
index bf002a508c9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorActionProvider.xpt
+++ /dev/null
@@ -1,194 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::navigator::Utils»
-
-«DEFINE NavigatorActionProvider FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «actionProviderClassName»  extends org.eclipse.ui.navigator.CommonActionProvider {
-
-	«EXPAND attributes-»
-	
-	«EXPAND _init-»
-	
-	«EXPAND makeActions-»
-	
-	«EXPAND fillActionBars-»
-	
-	«EXPAND fillContextMenu-»
-	
-	«EXPAND OpenDiagramAction-»
-
-    «EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private boolean myContribute;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private OpenDiagramAction myOpenDiagramAction;
-«ENDDEFINE»
-
-«DEFINE _init FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void init(org.eclipse.ui.navigator.ICommonActionExtensionSite aSite) {
-	super.init(aSite);
-	if (aSite.getViewSite() instanceof org.eclipse.ui.navigator.ICommonViewerWorkbenchSite) {
-		myContribute = true;
-		makeActions((org.eclipse.ui.navigator.ICommonViewerWorkbenchSite) aSite.getViewSite());
-	} else {
-		myContribute = false;
-	}
-}
-«ENDDEFINE»
-
-«DEFINE makeActions FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private void makeActions(org.eclipse.ui.navigator.ICommonViewerWorkbenchSite viewerSite) {
-	myOpenDiagramAction = new OpenDiagramAction(viewerSite);
-}
-«ENDDEFINE»
-
-«DEFINE fillActionBars FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void fillActionBars(org.eclipse.ui.IActionBars actionBars) {
-	if (!myContribute) {
-		return;
-	}
-	org.eclipse.jface.viewers.IStructuredSelection selection = (org.eclipse.jface.viewers.IStructuredSelection) getContext().getSelection();
-	myOpenDiagramAction.selectionChanged(selection);
-	if (myOpenDiagramAction.isEnabled()) {
-		actionBars.setGlobalActionHandler(org.eclipse.ui.navigator.ICommonActionConstants.OPEN, myOpenDiagramAction);
-	}
-}
-«ENDDEFINE»
-
-«DEFINE fillContextMenu FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void fillContextMenu(org.eclipse.jface.action.IMenuManager menu) {
-«REM»
-/*
- * Put following code into the template to generate popup menu
- *
-		if (!myContribute || getContext().getSelection().isEmpty()) {
-			return;
-		}
-
-		org.eclipse.jface.viewers.IStructuredSelection selection = (org.eclipse.jface.viewers.IStructuredSelection) getContext().getSelection();
-
-		myOpenDiagramAction.selectionChanged(selection);
-		if (myOpenDiagramAction.isEnabled()) {
-			menu.insertAfter(org.eclipse.ui.navigator.ICommonMenuConstants.GROUP_OPEN, myOpenDiagramAction);
-		}*/
-«ENDREM»«-»		
-}
-«ENDDEFINE»
-
-«DEFINE OpenDiagramAction FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedClassComment»
-private static class OpenDiagramAction extends org.eclipse.jface.action.Action {
-
-	«EXPAND ODA_attributes-»
-	
-	«EXPAND ODA_constructor-»
-	
-	«EXPAND ODA_selectionChanged-»
-	
-	«EXPAND ODA_run-»
-	
-	«EXPAND ODA_getEditorInput-»
-	
-	«EXPAND ODA_additions-»
-}
-«ENDDEFINE»
-
-«DEFINE ODA_attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.notation.Diagram myDiagram;
-		
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.ui.navigator.ICommonViewerWorkbenchSite myViewerSite;
-«ENDDEFINE»
-
-«DEFINE ODA_constructor FOR gmfgen::GenNavigator-»	
-«EXPAND xpt::Common::generatedMemberComment»
-public OpenDiagramAction(org.eclipse.ui.navigator.ICommonViewerWorkbenchSite viewerSite) {
-	super(«EXPAND xpt::Externalizer::accessorCall(i18nKeyForOpenDiagramActionName()) FOR editorGen»);
-	myViewerSite = viewerSite;
-}
-«ENDDEFINE»
-
-«DEFINE ODA_selectionChanged FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public final void selectionChanged(org.eclipse.jface.viewers.IStructuredSelection selection) {
-	myDiagram = null;
-	if (selection.size() == 1) {
-		Object selectedElement = selection.getFirstElement();
-		if (selectedElement instanceof «getNavigatorItemQualifiedClassName()») {
-			selectedElement = ((«getNavigatorItemQualifiedClassName()») selectedElement).getView();
-		} else if (selectedElement instanceof org.eclipse.core.runtime.IAdaptable) {
-			selectedElement = ((org.eclipse.core.runtime.IAdaptable) selectedElement).getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-		}
-		if (selectedElement instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-			org.eclipse.gmf.runtime.notation.Diagram diagram = (org.eclipse.gmf.runtime.notation.Diagram) selectedElement;
-			if («EXPAND xpt::editor::VisualIDRegistry::modelID FOR editorGen.diagram».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall FOR editorGen.diagram»(diagram))) {
-				myDiagram = diagram;
-			}
-		}
-	}
-	setEnabled(myDiagram != null);
-}
-«ENDDEFINE»
-
-«DEFINE ODA_run FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public void run() {
-	if (myDiagram == null || myDiagram.eResource() == null) {
-		return;
-	}
-			
-	org.eclipse.ui.IEditorInput editorInput = getEditorInput(myDiagram);
-	org.eclipse.ui.IWorkbenchPage page = myViewerSite.getPage();
- 	try {
-		page.openEditor(editorInput, «editorGen.editor.getQualifiedClassName()».ID);
-	} catch (org.eclipse.ui.PartInitException e) {
-		«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Exception while openning diagram", e); «EXPAND xpt::Common::nonNLS»
-	}
-}
-«ENDDEFINE»
-		
-«DEFINE ODA_getEditorInput FOR gmfgen::GenNavigator-»
-«EXPAND xpt::navigator::getEditorInput::getEditorInput FOR editorGen-»
-«ENDDEFINE»
-
-«DEFINE ODA_additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Externalizer::messageEntry(i18nKeyForOpenDiagramActionName(), 'Open Diagram')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Externalizer::accessorField(i18nKeyForOpenDiagramActionName())-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
deleted file mode 100644
index 9328fe6564d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorContentProvider.xpt
+++ /dev/null
@@ -1,521 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
- 
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::navigator::Utils»
-«EXTENSION gmf::CodeGenerationUtils»
-
-«DEFINE NavigatorContentProvider FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «contentProviderClassName» implements org.eclipse.ui.navigator.ICommonContentProvider {
-
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-
-	«EXPAND iContentProvider-»
-	
-	«EXPAND iStructuredContentProvider-»
-	
-	«EXPAND iMementoAware-»
-    
-    «EXPAND iCommonContentProvider-»
-    
-    «EXPAND iTreeContentProvider-»
-    
-    «EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private static final Object[] EMPTY_ARRAY = new Object[0];
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.jface.viewers.Viewer myViewer;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain myEditingDomain;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.emf.workspace.util.WorkspaceSynchronizer myWorkspaceSynchronizer;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private Runnable myViewerRefreshRunnable;
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-«EXPAND CodeStyle::SuppressWarnings('{ "unchecked", "serial", "rawtypes" }') FOR editorGen.diagram-»
-public «contentProviderClassName»() {
-	«EXPAND initCommonAttributes-»
-}
-«ENDDEFINE»
-
-«DEFINE initCommonAttributes FOR gmfgen::GenNavigator-»
-org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain = «EXPAND createEditingDomain»;
-myEditingDomain = (org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain) editingDomain;
-myEditingDomain.setResourceToReadOnlyMap(new java.util.HashMap() {
-	public Object get(Object key) {
-		if (!containsKey(key)) {
-			put(key, Boolean.TRUE);
-		}
-		return super.get(key);
-	}
-});
-myViewerRefreshRunnable = new Runnable() {
-	public void run() {
-		if (myViewer != null) {
-			myViewer.refresh();
-		}
-	}
-};
-myWorkspaceSynchronizer = new org.eclipse.emf.workspace.util.WorkspaceSynchronizer(editingDomain, new org.eclipse.emf.workspace.util.WorkspaceSynchronizer.Delegate() {
-	public void dispose() {
-	}
-
-	public boolean handleResourceChanged(final org.eclipse.emf.ecore.resource.Resource resource) {
-		«EXPAND processChanges-»
-	}
-	
-	public boolean handleResourceDeleted(org.eclipse.emf.ecore.resource.Resource resource) {
-		«EXPAND processChanges-»
-	}
-	
-	public boolean handleResourceMoved(org.eclipse.emf.ecore.resource.Resource resource, final org.eclipse.emf.common.util.URI newURI) {
-		«EXPAND processChanges-»
-	}
-});
-«ENDDEFINE»
-
-«DEFINE processChanges FOR gmfgen::GenNavigator-»
-unloadAllResources();
-asyncRefresh();
-return true;
-«ENDDEFINE»
-
-«DEFINE iContentProvider FOR gmfgen::GenNavigator-»
-	«EXPAND dispose-»
-	
-	«EXPAND inputChanged-»
-	
-	«REM»unloadAllResources and asyncRefresh are package-visible because are accessed from WorkspaceSynchronizer.Delegate inner class«ENDREM»
-	«EXPAND xpt::Common::generatedMemberComment»
-	void unloadAllResources() {
-		«EXPAND CodeStyle::iterate('nextResource', 'org.eclipse.emf.ecore.resource.Resource', 'myEditingDomain.getResourceSet().getResources()') FOR editorGen.diagram-»
-			nextResource.unload();
-		}
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	void asyncRefresh() {
-		if (myViewer != null && !myViewer.getControl().isDisposed()) {
-			myViewer.getControl().getDisplay().asyncExec(myViewerRefreshRunnable);
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE dispose FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public void dispose() {
-	myWorkspaceSynchronizer.dispose();
-	myWorkspaceSynchronizer = null;
-	myViewerRefreshRunnable = null;
-	myViewer = null;
-	unloadAllResources();
-	((org.eclipse.emf.transaction.TransactionalEditingDomain) myEditingDomain).dispose();
-	myEditingDomain = null;
-}
-«ENDDEFINE»
-
-«DEFINE inputChanged FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void inputChanged(org.eclipse.jface.viewers.Viewer viewer, Object oldInput, Object newInput) {
-	myViewer = viewer;
-}
-«ENDDEFINE»
-
-«DEFINE iStructuredContentProvider FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public Object[] getElements(Object inputElement) {
-	return getChildren(inputElement);
-}
-«ENDDEFINE»
-
-«DEFINE iMementoAware FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public void restoreState(org.eclipse.ui.IMemento aMemento) {
-}
-
-«EXPAND xpt::Common::generatedMemberComment»
-public void saveState(org.eclipse.ui.IMemento aMemento) {
-}
-«ENDDEFINE»
-
-«DEFINE iCommonContentProvider FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public void init(org.eclipse.ui.navigator.ICommonContentExtensionSite aConfig) {
-}
-«ENDDEFINE»
-
-«DEFINE iTreeContentProvider FOR gmfgen::GenNavigator-»
-	«EXPAND getChildren-»
-	
-	«EXPAND getParent-»
-	
-	«EXPAND hasChildren-»
-«ENDDEFINE»
-
-«DEFINE getChildren FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public Object[] getChildren(Object parentElement) {
-	if (parentElement instanceof org.eclipse.core.resources.IFile) {
-	«EXPAND getFileChildren-»
-   	} 
-    	
-   	if (parentElement instanceof «getNavigatorGroupQualifiedClassName()») {
-	«EXPAND getGroupChildren-»
-	} 
-		
-	if (parentElement instanceof «getNavigatorItemQualifiedClassName()») {
-	«EXPAND getItemChildren-»
-	}
-		
-	«IF editorGen.diagram.generateShortcutIcon()-»
-		«EXPAND getAdaptableChildren»
-	«ENDIF-»
-	«EXPAND getOtherChildren-»
-}
-    
-	«EXPAND getViewChildren-»
-    
-    «EXPAND utilityMethods-»
-«ENDDEFINE»
-
-«DEFINE getParent FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public Object getParent(Object element) {
-	if (element instanceof «getAbstractNavigatorItemQualifiedClassName()») {
-    	«getAbstractNavigatorItemQualifiedClassName()» abstractNavigatorItem = («getAbstractNavigatorItemQualifiedClassName()») element;
-		return abstractNavigatorItem.getParent();
-	}
-	return null;
-}
-«ENDDEFINE»
-
-«DEFINE hasChildren FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-public boolean hasChildren(Object element) {
-	return element instanceof org.eclipse.core.resources.IFile || getChildren(element).length > 0;
-}
-«ENDDEFINE»
-
-«DEFINE getFileChildren FOR gmfgen::GenNavigator-»
-	«EXPAND getFileResource-»
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.ArrayList', getNavigatorItemQualifiedClassName()) FOR editorGen.diagram»();
-	«LET getChildReferencesFrom(self, null) AS _references-»
-		«EXPAND initGroupVariables(self, _references, 'file', null) FOREACH getGroupNames(_references)-»
-		«EXPAND CodeStyle::newGenericInstance('topViews', 'java.util.ArrayList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»(resource.getContents().size());
-		«EXPAND CodeStyle::iterate('o', 'org.eclipse.emf.ecore.EObject', 'resource.getContents()') FOR editorGen.diagram-»
-			if (o instanceof org.eclipse.gmf.runtime.notation.View) {
-				topViews.add((org.eclipse.gmf.runtime.notation.View) o);
-			}
-		}
-		«FOREACH _references AS ref-»
-			«EXPAND addNavigatorItemsPrefix FOR ref»selectViewsByType(topViews, «EXPAND getChildViewType FOR ref.child»)«EXPAND addNavigatorItemsSuffix('file', false) FOR ref-»
-		«ENDFOREACH-»
-		«EXPAND addGroups(_references) FOREACH getGroupNames(_references)-»
-	«ENDLET-»
-	return result.toArray();
-«ENDDEFINE»
-
-// TODO remove this incorectly named template in the next release, and inline, perhaps?
-«DEFINE getFileResoruce FOR gmfgen::GenNavigator-»
-// FIXME type in the template has been fixed (getFileResoruce --> getFileResource), please update your dynamic templates !!!
-«EXPAND getFileResource-»
-«ENDDEFINE»
-«DEFINE getFileResource FOR gmfgen::GenNavigator-»
-org.eclipse.core.resources.IFile file = (org.eclipse.core.resources.IFile) parentElement;
-org.eclipse.emf.common.util.URI fileURI = org.eclipse.emf.common.util.URI.createPlatformResourceURI(file.getFullPath().toString(), true);
-org.eclipse.emf.ecore.resource.Resource resource = myEditingDomain.getResourceSet().getResource(fileURI, true);
-«ENDDEFINE»
-
-«DEFINE getGroupChildren FOR gmfgen::GenNavigator-»
-«getNavigatorGroupQualifiedClassName()» group = («getNavigatorGroupQualifiedClassName()») parentElement;
-return group.getChildren();
-«ENDDEFINE»
-
-«DEFINE getItemChildren FOR gmfgen::GenNavigator-»
-«getNavigatorItemQualifiedClassName()» navigatorItem = («getNavigatorItemQualifiedClassName()») parentElement;
-if (navigatorItem.isLeaf() || !isOwnView(navigatorItem.getView())) {
-	return EMPTY_ARRAY;
-}
-return getViewChildren(navigatorItem.getView(), parentElement);
-«ENDDEFINE»
-
-«DEFINE getAdaptableChildren FOR gmfgen::GenNavigator-»
-/*
- * Due to plugin.xml restrictions this code will be called only for views representing
- * shortcuts to this diagram elements created on other diagrams. 
-*/ 
-if (parentElement instanceof org.eclipse.core.runtime.IAdaptable) {
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) ((org.eclipse.core.runtime.IAdaptable) parentElement).getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-	if (view != null) {
-		return getViewChildren(view, parentElement);
-	}
-}
-«ENDDEFINE»
-
-«DEFINE getOtherChildren FOR gmfgen::GenNavigator-»
-return EMPTY_ARRAY;
-«ENDDEFINE»
-
-«DEFINE getViewChildren FOR gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-private Object[] getViewChildren(org.eclipse.gmf.runtime.notation.View view, Object parentElement) {
-   	switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»(view)) {
-	«EXPAND caseNavigatorNode(self) FOREACH getNavigatorContainerNodes(self)-»
-	}
-	return EMPTY_ARRAY;
-}
-«ENDDEFINE»
-
-«DEFINE utilityMethods FOR  gmfgen::GenNavigator-»
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» getLinksSourceByType(«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.Edge') FOR editorGen.diagram» edges, String type) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»();
- 	«EXPAND CodeStyle::iterate('nextEdge', 'org.eclipse.gmf.runtime.notation.Edge', 'edges') FOR editorGen.diagram-»
- 		org.eclipse.gmf.runtime.notation.View nextEdgeSource = nextEdge.getSource();
- 		if (type.equals(nextEdgeSource.getType()) && isOwnView(nextEdgeSource)) {
- 			result.add(nextEdgeSource);
- 		}
- 	}
- 	return result;
-}
-	
-«EXPAND xpt::Common::generatedMemberComment»
- private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» getLinksTargetByType(«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.Edge') FOR editorGen.diagram» edges, String type) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»();
- 	«EXPAND CodeStyle::iterate('nextEdge', 'org.eclipse.gmf.runtime.notation.Edge', 'edges') FOR editorGen.diagram-»
- 		org.eclipse.gmf.runtime.notation.View nextEdgeTarget = nextEdge.getTarget();
- 		if (type.equals(nextEdgeTarget.getType()) && isOwnView(nextEdgeTarget)) {
- 			result.add(nextEdgeTarget);
- 		}
- 	}
- 	return result;
-}
-
-«EXPAND xpt::Common::generatedMemberComment»
- private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» getOutgoingLinksByType(«EXPAND CodeStyle::G('java.util.Collection', '? extends org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» nodes, String type) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»();
- 	«EXPAND CodeStyle::iterate('nextNode', 'org.eclipse.gmf.runtime.notation.View', 'nodes') FOR editorGen.diagram-»
-		result.addAll(selectViewsByType(nextNode.getSourceEdges(), type));
- 	}
- 	return result;
-}
-	
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» getIncomingLinksByType(«EXPAND CodeStyle::G('java.util.Collection', '? extends org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» nodes, String type) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»();
- 	«EXPAND CodeStyle::iterate('nextNode', 'org.eclipse.gmf.runtime.notation.View', 'nodes') FOR editorGen.diagram-»
-		result.addAll(selectViewsByType(nextNode.getTargetEdges(), type));
- 	}
- 	return result;
-}
-	
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» getChildrenByType(«EXPAND CodeStyle::G('java.util.Collection', '? extends org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» nodes, String type) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»();
-	«EXPAND CodeStyle::iterate('nextNode', 'org.eclipse.gmf.runtime.notation.View', 'nodes') FOR editorGen.diagram-»
-		result.addAll(selectViewsByType(nextNode.getChildren(), type));
-	}
-	return result;
-}
-	
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» getDiagramLinksByType(«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.Diagram') FOR editorGen.diagram» diagrams, String type) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.ArrayList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»();
-	«EXPAND CodeStyle::iterate('nextDiagram', 'org.eclipse.gmf.runtime.notation.Diagram', 'diagrams') FOR editorGen.diagram-»
-		result.addAll(selectViewsByType(nextDiagram.getEdges(), type));
-	}
-	return result;
-}
-
-// TODO refactor as static method
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» selectViewsByType(«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» views, String type) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.ArrayList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»();
-	«EXPAND CodeStyle::iterate('nextView', 'org.eclipse.gmf.runtime.notation.View', 'views') FOR editorGen.diagram-»
-		if (type.equals(nextView.getType()) && isOwnView(nextView)) {
-			result.add(nextView);
-		}
-	}
-	return result;
-}
-	
-«EXPAND xpt::Common::generatedMemberComment»
-private boolean isOwnView(org.eclipse.gmf.runtime.notation.View view) {
-	return «EXPAND xpt::editor::VisualIDRegistry::modelID FOR editorGen.diagram».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall FOR editorGen.diagram»(view));
-}
-	
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', getNavigatorItemQualifiedClassName()) FOR editorGen.diagram» createNavigatorItems(«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram» views, Object parent, boolean isLeafs) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.ArrayList', getNavigatorItemQualifiedClassName()) FOR editorGen.diagram»(views.size());
-	«EXPAND CodeStyle::iterate('nextView', 'org.eclipse.gmf.runtime.notation.View', 'views') FOR editorGen.diagram-»
-		result.add(new «getNavigatorItemQualifiedClassName()»(nextView, parent, isLeafs));
-	}
-	return result;
-}
-«EXPAND getForeignShortcuts-»
-«ENDDEFINE»
-
-«DEFINE getForeignShortcuts FOR gmfgen::GenNavigator-»
-	«IF editorGen.diagram.generateCreateShortcutAction() and getChildReferencesFrom(self, editorGen.diagram)->size() > 0-»
-	
-«EXPAND xpt::Common::generatedMemberComment»
-private «EXPAND CodeStyle::G('java.util.Collection', getNavigatorItemQualifiedClassName()) FOR editorGen.diagram» getForeignShortcuts(org.eclipse.gmf.runtime.notation.Diagram diagram, Object parent) {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', 'org.eclipse.gmf.runtime.notation.View') FOR editorGen.diagram»();
-	«EXPAND CodeStyle::iterate('nextView', 'org.eclipse.gmf.runtime.notation.View', 'it', 'diagram.getChildren().iterator()') FOR editorGen.diagram-»
-		if (!isOwnView(nextView) && nextView.getEAnnotation("Shortcut") != null) {«EXPAND xpt::Common::nonNLS»
-			result.add(nextView);
-		}
-	}
-	return createNavigatorItems(result, parent, false);
-}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE createEditingDomain FOR gmfgen::GenNavigator»org.eclipse.gmf.runtime.emf.core.GMFEditingDomainFactory.INSTANCE.createEditingDomain()«ENDDEFINE»
-
-«DEFINE initGroupVariables(navigator : gmfgen::GenNavigator, _references : Sequence(gmfgen::GenNavigatorChildReference), parentVarName : String, contextElement : gmfgen::GenCommonBase) FOR String-»
-	«navigator.getNavigatorGroupQualifiedClassName()» «validJavaIdentifier(self)» = new «navigator.getNavigatorGroupQualifiedClassName()»(
-	«EXPAND xpt::Externalizer::accessorCall(i18nKeyForGroup(self, contextElement)) FOR navigator.editorGen»,
-	"«getNavigatorReference(self, _references).groupIcon»", «parentVarName»); «EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«DEFINE addNavigatorItemsPrefix FOR gmfgen::GenNavigatorChildReference»«IF isInsideGroup()»«validJavaIdentifier(groupName)».addChildren(«ELSE»result.addAll(«ENDIF»createNavigatorItems(«ENDDEFINE»
-
-«DEFINE addNavigatorItemsSuffix(parentVarName : String, isLeaf : Boolean) FOR gmfgen::GenNavigatorChildReference-»
-, «IF isInsideGroup()»«validJavaIdentifier(groupName)»«ELSE»«parentVarName»«ENDIF», «isLeaf»));
-«ENDDEFINE»
-
-«DEFINE addGroups(_references : Sequence(gmfgen::GenNavigatorChildReference)) FOR String-»
-	«LET getNavigatorReference(self, _references) AS ref-»
-		«IF ref.hideIfEmpty-»
-			if (!«validJavaIdentifier(self)».isEmpty()) {«ENDIF-»
-		result.add(«validJavaIdentifier(self)»);
-		«IF ref.hideIfEmpty-»
-			}«ENDIF-»
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE getChildViewType FOR gmfgen::GenDiagram»«EXPAND xpt::editor::VisualIDRegistry::modelID»«ENDDEFINE»
-
-«DEFINE getChildViewType FOR gmfgen::GenCommonBase»«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»«ENDDEFINE»
-
-«DEFINE caseNavigatorNode(navigator : gmfgen::GenNavigator) FOR gmfgen::GenCommonBase»
-«EXPAND xpt::Common::caseVisualID» {
-	«EXPAND CodeStyle::newGenericInstance('result', 'java.util.LinkedList', navigator.getAbstractNavigatorItemQualifiedClassName())»();
-	«EXPAND addForeignShortcuts FOR self-»
-	«EXPAND _nailedDownVariable('sv', 'view')»
-	«LET getChildReferencesFrom(navigator, self) AS _references-»
-		«EXPAND initGroupVariables(navigator, _references, 'parentElement', self) FOREACH getGroupNames(_references)-»
-		«IF _references->notEmpty() and _references->findConnectionPaths()->notEmpty()-»
-		«EXPAND CodeStyle::G('java.util.Collection', 'org.eclipse.gmf.runtime.notation.View')» connectedViews;
-		«FOREACH _references AS reference-»
-			«FOREACH reference.findConnectionPaths() AS path-»
-				«FOREACH path.segments->asSequence() AS segment ITERATOR segmentsIterator-»
-					connectedViews = «EXPAND childrenMethodName(reference.referenceType, segment) FOR segment._from-»
-					(«IF segmentsIterator.isFirstIteration()»java.util.Collections.singleton(sv)«ELSE»connectedViews«ENDIF-»
-					, «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall FOR segment.to»);
-				«ENDFOREACH-»
-				«EXPAND addNavigatorItemsPrefix FOR reference»connectedViews«EXPAND addNavigatorItemsSuffix('parentElement', reference.referenceType <> gmfgen::GenNavigatorReferenceType::children) FOR reference-»
-			«ENDFOREACH-»
-		«ENDFOREACH-»
-		«ENDIF-»
-		«EXPAND addGroups(_references) FOREACH getGroupNames(_references)-»
-	«ENDLET-»
-	return result.toArray();
-}
-«ENDDEFINE»
-
-«DEFINE _nailedDownVariable(String varName, String expressionToCast) FOR gmfgen::GenCommonBase»«REM»NO-OP, all specific subclasses should be handled«ENDREM»«ENDDEFINE»
-«DEFINE _nailedDownVariable(String varName, String expressionToCast) FOR gmfgen::GenLink-»
-org.eclipse.gmf.runtime.notation.Edge «varName» = (org.eclipse.gmf.runtime.notation.Edge) «expressionToCast»;«ENDDEFINE»
-«DEFINE _nailedDownVariable(String varName, String expressionToCast) FOR gmfgen::GenNode-»
-org.eclipse.gmf.runtime.notation.Node «varName» = (org.eclipse.gmf.runtime.notation.Node) «expressionToCast»;«ENDDEFINE»
-«DEFINE _nailedDownVariable(String varName, String expressionToCast) FOR gmfgen::GenDiagram-»
-org.eclipse.gmf.runtime.notation.Diagram «varName» = (org.eclipse.gmf.runtime.notation.Diagram) «expressionToCast»;«ENDDEFINE»
-
-
-«DEFINE addForeignShortcuts FOR gmfgen::GenDiagram-»
-«IF generateCreateShortcutAction()-»
-result.addAll(getForeignShortcuts((org.eclipse.gmf.runtime.notation.Diagram) view, parentElement));
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE addForeignShortcuts FOR gmfgen::GenCommonBase»«ENDDEFINE»
-
-«DEFINE childrenMethodName(referenceType : gmfgen::GenNavigatorReferenceType, segment : gmfgen::GenNavigatorPathSegment) FOR gmfgen::GenLink-»
-	«IF referenceType = gmfgen::GenNavigatorReferenceType::out_target»getLinksTargetByType«ELSE»getLinksSourceByType«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE childrenMethodName(referenceType : gmfgen::GenNavigatorReferenceType, segment : gmfgen::GenNavigatorPathSegment) FOR gmfgen::GenCommonBase-»
-	«IF referenceType = gmfgen::GenNavigatorReferenceType::out_target-»
-		getOutgoingLinksByType«-»
-	«ELSEIF referenceType = gmfgen::GenNavigatorReferenceType::in_source-»
-		getIncomingLinksByType«-»
-	«ELSE-»
-		«IF segment._from.oclIsKindOf(gmfgen::GenDiagram) and segment.to.oclIsKindOf(gmfgen::GenLink)-»
-			getDiagramLinksByType«ELSE-»
-			getChildrenByType«ENDIF-»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenNavigator-»
-	«LET getChildReferencesFrom(self, null) AS _references-»
-        «EXPAND internal_i18nAccessors(null) FOREACH getGroupNames(_references)-»
-	«ENDLET-»
-	«FOREACH getNavigatorContainerNodes(self) AS contextElement-»
-        «LET getChildReferencesFrom(self, contextElement) AS _references-»
-            «EXPAND internal_i18nAccessors(contextElement) FOREACH getGroupNames(_references)-»
-        «ENDLET-»
-	«ENDFOREACH-»
-«ENDDEFINE»
-
-«DEFINE internal_i18nAccessors(contextElement : gmfgen::GenCommonBase) FOR String-»
-«IF null <> self»«EXPAND xpt::Externalizer::accessorField(i18nKeyForGroup(self, contextElement))»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenNavigator-»
-«LET getChildReferencesFrom(self, null) AS _references-»
-«EXPAND internal_i18nValues(null) FOREACH getGroupNames(_references)-»
-«ENDLET-»
-«FOREACH getNavigatorContainerNodes(self) AS contextElement-»
-«LET getChildReferencesFrom(self, contextElement) AS _references-»
-«EXPAND internal_i18nValues(contextElement) FOREACH getGroupNames(_references)-»
-«ENDLET-»
-«ENDFOREACH-»
-«ENDDEFINE»
-
-«DEFINE internal_i18nValues(contextElement : gmfgen::GenCommonBase) FOR String-»
-«IF null <> self»«EXPAND xpt::Externalizer::messageEntry(i18nKeyForGroup(self, contextElement), self)»«ENDIF-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
deleted file mode 100644
index e064267be02..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorGroup.xpt
+++ /dev/null
@@ -1,132 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE NavigatorGroup FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «navigatorGroupClassName» extends «getAbstractNavigatorItemQualifiedClassName()» {
-
-	«EXPAND attributes-»
-
-	«EXPAND _constructor-»
-	
-	«EXPAND getGroupName-»
-	
-	«EXPAND getIcon-»
-	
-	«EXPAND getChildren-»
-	
-	«EXPAND addChildren-»
-	
-	«EXPAND addChild-»
-	
-	«EXPAND isEmpty-»
-	
-	«EXPAND equals-»
-	
-	«EXPAND hashCode-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private String myGroupName;
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-private String myIcon;
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-private java.util.Collection myChildren = new java.util.LinkedList();
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-«navigatorGroupClassName»(String groupName, String icon, Object parent) {
-	super(parent);
-	myGroupName = groupName;
-	myIcon = icon;
-}
-«ENDDEFINE»
-	
-«DEFINE getGroupName FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public String getGroupName() {
-	return myGroupName;
-}
-«ENDDEFINE»
-	
-«DEFINE getIcon FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public String getIcon() {
-	return myIcon;
-}
-«ENDDEFINE»
-	
-«DEFINE getChildren FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public Object[] getChildren() {
-	return myChildren.toArray();
-}
-«ENDDEFINE»
-	
-«DEFINE addChildren FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void addChildren(java.util.Collection children) {
-	myChildren.addAll(children);
-}
-«ENDDEFINE»
-	
-«DEFINE addChild FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void addChild(Object child) {
-	myChildren.add(child);
-}
-«ENDDEFINE»
-	
-«DEFINE isEmpty FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isEmpty() {
-	return myChildren.size() == 0;
-}
-«ENDDEFINE»
-	
-«DEFINE equals FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean equals(Object obj) {
-	if (obj instanceof «getNavigatorGroupQualifiedClassName()») {
-		«getNavigatorGroupQualifiedClassName()» anotherGroup = («getNavigatorGroupQualifiedClassName()») obj;
-		if (getGroupName().equals(anotherGroup.getGroupName())) {
-			return getParent().equals(anotherGroup.getParent());
-		}
-	}
-	return super.equals(obj);
-}
-«ENDDEFINE»
-	
-«DEFINE hashCode FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public int hashCode() {
-	return getGroupName().hashCode();
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
deleted file mode 100644
index 89eb072bd6f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorItem.xpt
+++ /dev/null
@@ -1,112 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE NavigatorItem FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «navigatorItemClassName» extends «getAbstractNavigatorItemQualifiedClassName()» {
-
-	«EXPAND registerAdapterFactory-»
-	
-	«EXPAND attributes-»
-	
-	«EXPAND _constructor-»
-	
-	«EXPAND getView-»
-	
-	«EXPAND isLeaf-»
-
-	«EXPAND equals-»
-	
-	«EXPAND hashCode-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE registerAdapterFactory FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-static {
-	final Class[] supportedTypes = new Class[] { org.eclipse.gmf.runtime.notation.View.class, org.eclipse.emf.ecore.EObject.class };
-	org.eclipse.core.runtime.Platform.getAdapterManager().registerAdapters(new org.eclipse.core.runtime.IAdapterFactory() {
-		
-		public Object getAdapter(Object adaptableObject, Class adapterType) {
-			if (adaptableObject instanceof «getNavigatorItemQualifiedClassName()» && (adapterType == org.eclipse.gmf.runtime.notation.View.class || adapterType == org.eclipse.emf.ecore.EObject.class)) {
-				return ((«getNavigatorItemQualifiedClassName()») adaptableObject).getView();
-			}
-			return null;
-		}
-
-		public Class[] getAdapterList() {
-			return supportedTypes;
-		}
-	}, «getNavigatorItemQualifiedClassName()».class);
-}
-«ENDDEFINE»
-
-«DEFINE  attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.gmf.runtime.notation.View myView;
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-private boolean myLeaf = false;	
-«ENDDEFINE»
-	
-«DEFINE  _constructor FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public «navigatorItemClassName»(org.eclipse.gmf.runtime.notation.View view, Object parent, boolean isLeaf) {
-	super(parent);
-	myView = view;
-	myLeaf = isLeaf;
-}
-«ENDDEFINE»
-	
-«DEFINE  getView FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.gmf.runtime.notation.View getView() {
-	return myView;
-}
-«ENDDEFINE»
-	
-«DEFINE  isLeaf FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean isLeaf() {
-	return myLeaf;
-}
-«ENDDEFINE»
-
-«DEFINE  equals FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean equals(Object obj) {
-	if (obj instanceof «getNavigatorItemQualifiedClassName()») {
-		return org.eclipse.emf.ecore.util.EcoreUtil.getURI(getView()).equals(org.eclipse.emf.ecore.util.EcoreUtil.getURI(((«getNavigatorItemQualifiedClassName()») obj).getView()));
-	}
-	return super.equals(obj);
-}
-«ENDDEFINE»
-	
-«DEFINE  hashCode FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public int hashCode() {
-	return org.eclipse.emf.ecore.util.EcoreUtil.getURI(getView()).hashCode();
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
deleted file mode 100644
index 395067f47ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorLabelProvider.xpt
+++ /dev/null
@@ -1,429 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
- 
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-«EXTENSION xpt::navigator::Utils»
- 
-«DEFINE NavigatorLabelProvider FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «labelProviderClassName» extends org.eclipse.jface.viewers.LabelProvider implements org.eclipse.ui.navigator.ICommonLabelProvider, org.eclipse.jface.viewers.ITreePathLabelProvider {
-
-	«EXPAND staticInitializer-»
-	
-	«EXPAND updateLabel-»
-	
-	«EXPAND getImage-»
-	
-	«EXPAND getViewImage-»
-	
-	«EXPAND getImageByKey-»
-	
-	«EXPAND getText-»
-	
-	«EXPAND getViewText-»
-	
-	«EXPAND getTextMethod FOREACH getNavigatorContainedNodes(self)-»
-	
-	«EXPAND getUnknownElementText-»
-	
-	«EXPAND getUnresolvedDomainElementProxyText-»
-	
-	«EXPAND _init-»
-
-	«EXPAND restoreState-»
-
-	«EXPAND saveState-»
-	
-	«EXPAND getDescription-»
-	
-	«EXPAND isOwnView-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE staticInitializer FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-static {
-	«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getImageRegistry().put(«EXPAND unknownElementKey», org.eclipse.jface.resource.ImageDescriptor.getMissingImageDescriptor()); «EXPAND xpt::Common::nonNLS»
-	«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getImageRegistry().put(«EXPAND notFoundElementKey», org.eclipse.jface.resource.ImageDescriptor.getMissingImageDescriptor()); «EXPAND xpt::Common::nonNLS»
-}
-«ENDDEFINE»
-
-«DEFINE updateLabel FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void updateLabel(org.eclipse.jface.viewers.ViewerLabel label, org.eclipse.jface.viewers.TreePath elementPath) {
-	Object element = elementPath.getLastSegment();
-	if (element instanceof «getNavigatorItemQualifiedClassName()» && !isOwnView(((«getNavigatorItemQualifiedClassName()») element).getView())) {
-		return;
-	}
-	label.setText(getText(element));
-	label.setImage(getImage(element));
-}
-«ENDDEFINE»
-
-«DEFINE getImage FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.swt.graphics.Image getImage(Object element) {
-	«EXPAND getNavigatorGroupImage-»
-
-	«EXPAND getNavigatorItemImage-»
-
-	«EXPAND getAdaptableImage-»
-
-	«EXPAND getAdditionalInputImage-»
-	return super.getImage(element);
-}
-«ENDDEFINE»
-
-«DEFINE getNavigatorGroupImage FOR gmfgen::GenNavigator-»
-if (element instanceof «getNavigatorGroupQualifiedClassName()») {
-	«getNavigatorGroupQualifiedClassName()» group = («getNavigatorGroupQualifiedClassName()») element;
-	return «editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getBundledImage(group.getIcon());
-}
-«ENDDEFINE»
-
-«DEFINE getNavigatorItemImage FOR gmfgen::GenNavigator-»
-if (element instanceof «getNavigatorItemQualifiedClassName()») {
-	«getNavigatorItemQualifiedClassName()» navigatorItem = («getNavigatorItemQualifiedClassName()») element;
-	if (!isOwnView(navigatorItem.getView())) {
-		return super.getImage(element);
-	}
-	return getImage(navigatorItem.getView());
-}
-«ENDDEFINE»
-
-«DEFINE getAdaptableImage FOR gmfgen::GenNavigator-»
-«IF editorGen.diagram.generateShortcutIcon()-»
-// Due to plugin.xml content will be called only for "own" views
-if (element instanceof org.eclipse.core.runtime.IAdaptable) {
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) ((org.eclipse.core.runtime.IAdaptable) element).getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-	if (view != null && isOwnView(view)) {
-		return getImage(view);
-	}
-}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getAdditionalInputImage FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
-
-«DEFINE getViewImage FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.swt.graphics.Image getImage(org.eclipse.gmf.runtime.notation.View view) {
-	«IF not getNavigatorContainedNodes(self)->isEmpty()-»
-	switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»(view)) {
-		«EXPAND caseImage FOREACH getNavigatorContainedNodes(self)-»
-	}
-	«ENDIF-»
-	return getImage(«EXPAND unknownElementKey», null); «EXPAND xpt::Common::nonNLS»
-}
-«ENDDEFINE»
-
-«DEFINE caseImage FOR gmfgen::GenCommonBase-»
-«EXPAND xpt::Common::caseVisualID»
-	return getImage("«EXPAND key»", «IF null <> elementType»«EXPAND xpt::providers::ElementTypes::accessElementType»«ELSE»null«ENDIF»);«EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«DEFINE getImageByKey FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.swt.graphics.Image getImage(String key, org.eclipse.gmf.runtime.emf.type.core.IElementType elementType) {
-	org.eclipse.jface.resource.ImageRegistry imageRegistry = «editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getImageRegistry();
-	org.eclipse.swt.graphics.Image image = imageRegistry.get(key);
-	if (image == null && elementType != null && «editorGen.diagram.getElementTypesQualifiedClassName()».isKnownElementType(elementType)) {
-		image = «editorGen.diagram.getElementTypesQualifiedClassName()».getImage(elementType);
-		imageRegistry.put(key, image);
-	}
-			
-	if (image == null) {
-		image = imageRegistry.get(«EXPAND notFoundElementKey»); «EXPAND xpt::Common::nonNLS»
-		imageRegistry.put(key, image);
-	}
-	return image;
-}
-«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public String getText(Object element) {
-	«EXPAND getNavigatorGroupText-»
-
-	«EXPAND getNavigatorItemText-»
-
-	«EXPAND getAdaptableText-»
-
-	«EXPAND getAdditionalInputText-»
-	return super.getText(element);
-}
-«ENDDEFINE»
-
-«DEFINE getNavigatorGroupText FOR gmfgen::GenNavigator-»
-if (element instanceof «getNavigatorGroupQualifiedClassName()») {
-	«getNavigatorGroupQualifiedClassName()» group = («getNavigatorGroupQualifiedClassName()») element;
-	return group.getGroupName();
-}
-«ENDDEFINE»
-
-«DEFINE getNavigatorItemText FOR gmfgen::GenNavigator-»
-if (element instanceof «getNavigatorItemQualifiedClassName()») {
-	«getNavigatorItemQualifiedClassName()» navigatorItem = («getNavigatorItemQualifiedClassName()») element;
-   		if (!isOwnView(navigatorItem.getView())) {
-   			return null;
-   		}
-   		return getText(navigatorItem.getView());
-	}
-«ENDDEFINE»
-
-«DEFINE getAdaptableText FOR gmfgen::GenNavigator-»
-«IF editorGen.diagram.generateShortcutIcon()-»
-// Due to plugin.xml content will be called only for "own" views
-if (element instanceof org.eclipse.core.runtime.IAdaptable) {
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) ((org.eclipse.core.runtime.IAdaptable) element).getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-	if (view != null && isOwnView(view)) {
-		return getText(view);
-	}
-}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getAdditionalInputText FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
-
-«DEFINE getViewText FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public String getText(org.eclipse.gmf.runtime.notation.View view) {
-	if (view.getElement() != null && view.getElement().eIsProxy()) {
-		return getUnresolvedDomainElementProxyText(view);
-	}
-	«IF not getNavigatorContainedNodes(self)->isEmpty()-»
-	switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»(view)) {
-		«EXPAND caseText FOREACH getNavigatorContainedNodes(self)-»
-	}
-	«ENDIF-»
-	return getUnknownElementText(view);
-}
-«ENDDEFINE»
-
-«DEFINE caseText FOR gmfgen::GenCommonBase-»
-«EXPAND xpt::Common::caseVisualID»
-	return «EXPAND getTextMethodName»(view);
-«ENDDEFINE»
-
-«DEFINE getTextMethodName FOR gmfgen::GenCommonBase»get«getUniqueIdentifier()»Text«ENDDEFINE»
-
-«DEFINE getTextMethod FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private String «EXPAND getTextMethodName»(org.eclipse.gmf.runtime.notation.View view) {
-	«EXPAND getText-»
-}
-«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenCommonBase»«ERROR 'Incorrect GenCommonBase: ' + self.repr()»«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenDiagram-»
-	«EXPAND getLabelFeatureText(domainDiagramElement)-»
-«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenChildLabelNode-»
-«EXPAND getDiagramLabelText(self, labelModelFacet)-»
-«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenLinkLabel»«EXPAND getDiagramLabelText(link, modelFacet)»«ENDDEFINE»
-«DEFINE getText FOR gmfgen::GenNodeLabel»«EXPAND getDiagramLabelText(node, modelFacet)»«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenNode-»
-«IF labels->isEmpty()-»
-	«IF null <> modelFacet-»
-		«EXPAND getLabelFeatureText(modelFacet.metaClass)-»
-	«ELSE-»
-		«EXPAND returnEmptyString-»
-	«ENDIF-»
-«ELSE-»
-	«EXPAND getDiagramLabelText(labels->asSequence())-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenLink-»
-«IF labels->isEmpty()-»
-	«IF null <> modelFacet-»
-		«EXPAND getText(modelFacet)-»
-	«ELSE-»
-		«EXPAND returnEmptyString-»
-	«ENDIF-»
-«ELSE-»
-	«EXPAND getDiagramLabelText(labels->asSequence())-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getDiagramLabelText(labels : Sequence(gmfgen::GenLabel)) FOR gmfgen::GenCommonBase-»
-	«IF labels->isEmpty()-»
-		«ERROR 'Empty list of labels passed'-»
-	«ENDIF-»
-	«LET labels->first() AS label-»
-	«EXPAND getDiagramLabelText(self, label.modelFacet) FOR label-»
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE getText(modelFacet : gmfgen::LinkModelFacet) FOR gmfgen::GenLink-»
-	«EXPAND returnEmptyString-»
-«ENDDEFINE»
-
-«DEFINE getText(modelFacet : gmfgen::TypeLinkModelFacet) FOR gmfgen::GenLink-»
-	«EXPAND getLabelFeatureText(modelFacet.metaClass)-»
-«ENDDEFINE»
-
-«DEFINE getText FOR gmfgen::GenCompartment-»
-return "«title»"; «EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«REM»FIXME: Refactor. Need to reuse parts of TextAware.xpt«ENDREM»
-/*
- * this/self - aka hintHolder, visual element to present a text
- * elementTypeHolder - model element being displayed
- * modelFacet - may be null 
- */
-«DEFINE getDiagramLabelText(elementTypeHolder : gmfgen::GenCommonBase, labelModelFacet : gmfgen::LabelModelFacet) FOR gmfgen::GenCommonBase-»
-org.eclipse.gmf.runtime.common.ui.services.parser.IParser parser = «EXPAND parsers::ParserProvider::accessorCall(elementTypeHolder, labelModelFacet, 'view.getElement() != null ? view.getElement() : view')»;
-if (parser != null) {
-	return parser.getPrintString(new org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter(view.getElement() != null ? view.getElement() : view), org.eclipse.gmf.runtime.common.ui.services.parser.ParserOptions.NONE.intValue());
-} else {
-	«getDiagram().editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Parser was not found for label " + «visualID»);«EXPAND xpt::Common::nonNLS»
-	«EXPAND returnEmptyString-»
-}
-«ENDDEFINE»
-
-
-«DEFINE getLabelFeatureText(genClass : genmodel::GenClass) FOR gmfgen::GenCommonBase-»
-	«IF null <> genClass and null <> genClass.labelFeature-»
-«EXPAND MetaModel::DeclareAndAssign('domainModelElement', 'view.getElement()') FOR genClass»
-if (domainModelElement != null) {
-	return «IF not isStringFeature(genClass.labelFeature)»String.valueOf(«ENDIF»«EXPAND MetaModel::getFeatureValue('domainModelElement', genClass) FOR genClass.labelFeature»«IF not isStringFeature(genClass.labelFeature)»)«ENDIF»;
-} else {
-	«getDiagram().editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("No domain element for view with visualID = " + «visualID»); «EXPAND xpt::Common::nonNLS»
-		«EXPAND returnEmptyString-»
-}
-	«ELSE-»
-		«EXPAND returnEmptyString-»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE returnEmptyString FOR OclAny-»
-return ""; «EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«DEFINE getUnknownElementText FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private String getUnknownElementText(org.eclipse.gmf.runtime.notation.View view) {
-	return "<UnknownElement Visual_ID = " + view.getType() + ">"; «EXPAND xpt::Common::nonNLS(1)» «EXPAND xpt::Common::nonNLS(2)»
-}
-«ENDDEFINE»
-
-«DEFINE getUnresolvedDomainElementProxyText FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private String getUnresolvedDomainElementProxyText(org.eclipse.gmf.runtime.notation.View view) {
-	return "<Unresolved domain element Visual_ID = " + view.getType() + ">"; «EXPAND xpt::Common::nonNLS(1)» «EXPAND xpt::Common::nonNLS(2)»
-}
-«ENDDEFINE»
-
-«DEFINE _init FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void init(org.eclipse.ui.navigator.ICommonContentExtensionSite aConfig) {
-}
-«ENDDEFINE»
-
-«DEFINE restoreState FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void restoreState(org.eclipse.ui.IMemento aMemento) {
-}
-«ENDDEFINE»
-
-«DEFINE saveState FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void saveState(org.eclipse.ui.IMemento aMemento) {
-}
-«ENDDEFINE»
-	
-«DEFINE getDescription FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public String getDescription(Object anElement) {
-	return null;
-}
-«ENDDEFINE»
-	
-«DEFINE isOwnView FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private boolean isOwnView(org.eclipse.gmf.runtime.notation.View view) {
-	return «EXPAND xpt::editor::VisualIDRegistry::modelID FOR editorGen.diagram».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall FOR editorGen.diagram»(view));
-}
-«ENDDEFINE»
-
-«DEFINE unknownElementKey FOR OclAny»"«EXPAND commonKeyPrefix»UnknownElement"«ENDDEFINE»
-
-«DEFINE notFoundElementKey FOR OclAny»"«EXPAND commonKeyPrefix»ImageNotFound"«ENDDEFINE»
-
-«DEFINE key FOR gmfgen::GenCommonBase»«ERROR 'Incorrect GenCommonBase: ' + self.repr()»«ENDDEFINE»
-
-«DEFINE key FOR gmfgen::GenDiagram»«EXPAND commonKeyPrefix»Diagram?«EXPAND keyFragment FOR domainDiagramElement»«ENDDEFINE»
-
-«DEFINE key FOR gmfgen::GenNode»«EXPAND commonKeyPrefix»«EXPAND keyFragment»«IF null <> modelFacet»«EXPAND keyFragment FOR modelFacet.metaClass»«ELSE»«EXPAND keyFragment FOR viewmap»«ENDIF»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::GenNode»Node?«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::GenTopLevelNode»TopLevelNode?«ENDDEFINE»
-
-«DEFINE key FOR gmfgen::GenLink»«EXPAND commonKeyPrefix»Link?«IF null <> modelFacet»«EXPAND keyFragment FOR modelFacet»«ELSE»«EXPAND keyFragment FOR viewmap»«ENDIF»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::LinkModelFacet»«ERROR 'Incorrect link model facet passed: ' + self.repr()»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::TypeLinkModelFacet»«EXPAND keyFragment FOR metaClass»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::FeatureLinkModelFacet»«EXPAND keyFragment FOR metaFeature»«ENDDEFINE»
-
-«DEFINE key FOR gmfgen::GenCompartment»«EXPAND key FOR node»?Compartment?«title»«ENDDEFINE»
-
-«DEFINE key FOR gmfgen::GenLabel»«ERROR 'Incorrect GenLabel:' + self.repr()»«ENDDEFINE»
-
-«DEFINE key FOR gmfgen::GenNodeLabel»«EXPAND key FOR node»«EXPAND keyFragment»«ENDDEFINE»
-
-«DEFINE key FOR gmfgen::GenLinkLabel»«EXPAND key FOR link»«EXPAND keyFragment»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::GenLabel»?Label?«EXPAND keyFragment(self) FOR modelFacet»«ENDDEFINE»
-
-«DEFINE keyFragment FOR genmodel::GenClass»«genPackage.ecorePackage.nsURI»?«ecoreClass.name»«ENDDEFINE»
-
-«DEFINE keyFragment FOR genmodel::GenFeature»«EXPAND keyFragment FOR genClass»?«ecoreFeature.name»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::Viewmap»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::FigureViewmap»«figureQualifiedClassName»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::InnerClassViewmap»«className»«ENDDEFINE»
-
-«DEFINE keyFragment FOR gmfgen::ParentAssignedViewmap»«figureQualifiedClassName»«ENDDEFINE»
-
-«DEFINE keyFragment(label : gmfgen::GenLabel) FOR gmfgen::LabelModelFacet»«ERROR 'Incorrect label model facet: ' + self.repr()»«ENDDEFINE»
-
-«DEFINE keyFragment(label : gmfgen::GenLabel) FOR gmfgen::FeatureLabelModelFacet»«EXPAND keyFragment FOREACH metaFeatures»«ENDDEFINE»
-
-«DEFINE keyFragment(label : gmfgen::GenLabel) FOR gmfgen::DesignLabelModelFacet»«EXPAND keyFragment FOR label.viewmap»«ENDDEFINE»
-
-«DEFINE commonKeyPrefix FOR OclAny»Navigator?«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
deleted file mode 100644
index 4e631b61855..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorLinkHelper.xpt
+++ /dev/null
@@ -1,138 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::navigator::Utils»
-
-«DEFINE NavigatorLinkHelper FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «linkHelperClassName» implements org.eclipse.ui.navigator.ILinkHelper {
-
-	«EXPAND xpt::navigator::getEditorInput::getEditorInput FOR editorGen-»
-
-	«EXPAND findSelection-»
-	
-	«EXPAND activateEditor-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE findSelection FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public org.eclipse.jface.viewers.IStructuredSelection findSelection(org.eclipse.ui.IEditorInput anInput) {
-	«EXPAND defineDiagramDocument FOR editorGen.plugin-»
-	«EXPAND findSelectionBody-»
-}
-«ENDDEFINE»
-
-«DEFINE defineDiagramDocument FOR gmfgen::GenPlugin-»
-org.eclipse.gmf.runtime.diagram.ui.resources.editor.document.IDiagramDocument document = «getActivatorQualifiedClassName()».getInstance().getDocumentProvider().getDiagramDocument(anInput);
-«ENDDEFINE»
-
-«DEFINE findSelectionBody FOR gmfgen::GenNavigator-»
-	«EXPAND getDiagramSelection FOR getDiagramTopReference(self)-»
-	return org.eclipse.jface.viewers.StructuredSelection.EMPTY;
-«ENDDEFINE»
-
-«REM»
-	Linking with editor currently supported only for the navigators conteining top 
-	reference to the diagram. In this case diagram node will be selected in navigator.
-«ENDREM»
-«DEFINE getDiagramSelection FOR gmfgen::GenNavigatorChildReference-»
-«EXPAND getDiagram FOR navigator.editorGen-»
-if (diagram == null || diagram.eResource() == null) {
-	return org.eclipse.jface.viewers.StructuredSelection.EMPTY;
-}
-org.eclipse.core.resources.IFile file = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(diagram.eResource());
-if (file != null) {
-	«IF isInsideGroup()-»
-	«navigator.getNavigatorGroupQualifiedClassName()» parentGroup = new «navigator.getNavigatorGroupQualifiedClassName()»("«groupName»", "«groupIcon»", «EXPAND xpt::editor::VisualIDRegistry::modelID FOR navigator.editorGen.diagram», file);
-	«ENDIF-»
-	«navigator.getNavigatorItemQualifiedClassName()» item = new «navigator.getNavigatorItemQualifiedClassName()»(diagram, «IF isInsideGroup()»parentGroup«ELSE»file«ENDIF», false);
-	«IF isInsideGroup()-»
-	parentGroup.addChild(item);
-	«ENDIF-»
-	return new org.eclipse.jface.viewers.StructuredSelection(«IF isInsideGroup()»parentGroup«ELSE»item«ENDIF»);
-}
-«ENDDEFINE»
-
-«DEFINE getDiagram FOR gmfgen::GenEditorGenerator-»
-if (document == null) {
-	return org.eclipse.jface.viewers.StructuredSelection.EMPTY;
-}
-org.eclipse.gmf.runtime.notation.Diagram diagram = document.getDiagram();
-«ENDDEFINE»
-
-«DEFINE activateEditor FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void activateEditor(org.eclipse.ui.IWorkbenchPage aPage, org.eclipse.jface.viewers.IStructuredSelection aSelection) {
-	if (aSelection == null || aSelection.isEmpty()) {
-		return;
-	}
-	if (false == aSelection.getFirstElement() instanceof «getAbstractNavigatorItemQualifiedClassName()») {
-		return;
-	}
-		
-	«getAbstractNavigatorItemQualifiedClassName()» abstractNavigatorItem = («getAbstractNavigatorItemQualifiedClassName()») aSelection.getFirstElement();
-	org.eclipse.gmf.runtime.notation.View navigatorView = null;
-	if (abstractNavigatorItem instanceof «getNavigatorItemQualifiedClassName()») {
-		navigatorView = ((«getNavigatorItemQualifiedClassName()») abstractNavigatorItem).getView();
-	} else if (abstractNavigatorItem instanceof «getNavigatorGroupQualifiedClassName()») {
-		«getNavigatorGroupQualifiedClassName()» navigatorGroup = («getNavigatorGroupQualifiedClassName()») abstractNavigatorItem;
-		if (navigatorGroup.getParent() instanceof «getNavigatorItemQualifiedClassName()») {
-			navigatorView = ((«getNavigatorItemQualifiedClassName()») navigatorGroup.getParent()).getView();
-		}«EXPAND getViewFromShortcut-»
-	}
-	if (navigatorView == null) {
-		return;
-	}
-	org.eclipse.ui.IEditorInput editorInput = getEditorInput(navigatorView.getDiagram());
-	org.eclipse.ui.IEditorPart editor = aPage.findEditor(editorInput);
-	if (editor == null) {
-		return;
-	}
-	aPage.bringToTop(editor);
-	if (editor instanceof «EXPAND diagramEditorClassFQName») {
-		«EXPAND diagramEditorClassFQName» diagramEditor = («EXPAND diagramEditorClassFQName») editor;
-		org.eclipse.emf.ecore.resource.ResourceSet diagramEditorResourceSet = diagramEditor.getEditingDomain().getResourceSet();
-		org.eclipse.emf.ecore.EObject selectedView = diagramEditorResourceSet.getEObject(org.eclipse.emf.ecore.util.EcoreUtil.getURI(navigatorView), true);	
-		if (selectedView == null) {
-			return;
-		}
-		org.eclipse.gef.GraphicalViewer graphicalViewer = (org.eclipse.gef.GraphicalViewer) diagramEditor.getAdapter(org.eclipse.gef.GraphicalViewer.class);
-		org.eclipse.gef.EditPart selectedEditPart = (org.eclipse.gef.EditPart) graphicalViewer.getEditPartRegistry().get(selectedView);
-		if (selectedEditPart != null) {
-			graphicalViewer.select(selectedEditPart);
-		}
-	}
-}
-«ENDDEFINE»
-
-«DEFINE getViewFromShortcut FOR gmfgen::GenNavigator-»
-	«IF editorGen.diagram.generateShortcutIcon()-»
-else if (navigatorGroup.getParent() instanceof org.eclipse.core.runtime.IAdaptable) {
-	navigatorView = (org.eclipse.gmf.runtime.notation.View) ((org.eclipse.core.runtime.IAdaptable) navigatorGroup.getParent()).getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-}
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE diagramEditorClassFQName FOR gmfgen::GenNavigator»org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt
deleted file mode 100644
index 7e520d2b581..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/NavigatorSorter.xpt
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::navigator::Utils»
-
-«DEFINE NavigatorSorter FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «sorterClassName»  extends org.eclipse.jface.viewers.ViewerSorter {
-
-	«EXPAND attributes-»
-	
-	«EXPAND category-»
-
-    «EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private static final int GROUP_CATEGORY = «getMaxVisualID(self) + 2»;
-	«IF editorGen.diagram.generateCreateShortcutAction()-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private static final int SHORTCUTS_CATEGORY = «getMaxVisualID(self) + 1»;
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE category FOR gmfgen::GenNavigator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public int category(Object element) {
-	if (element instanceof «getNavigatorItemQualifiedClassName()») {
-		«getNavigatorItemQualifiedClassName()» item = («getNavigatorItemQualifiedClassName()») element;
-	«IF editorGen.diagram.generateCreateShortcutAction()-»
-		if (item.getView().getEAnnotation("Shortcut") != null) { «EXPAND xpt::Common::nonNLS»
-			return SHORTCUTS_CATEGORY;
-		}
-	«ENDIF-»
-		return «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»(item.getView());
-	}
-	return GROUP_CATEGORY;
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenNavigator-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/Utils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/Utils.qvto
deleted file mode 100644
index 82ecc7fb125..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/Utils.qvto
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import gmf.CodeGenerationUtils;
-import xpt.OclMigrationProblems;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-
-library Utils;
-
-helper getMaxVisualID(navigator : gmfgen::GenNavigator) : Integer {
-	return getNavigatorNodes(navigator)->sortedBy(n | n.visualID)->last().visualID;
-}
-
-helper isStringFeature(feature : genmodel::GenFeature) : Boolean {
-	return feature.ecoreFeature.eType.name = 'EString'
-}
-
--- MODIFIERS: cached
-helper getNavigatorContainerNodes(navigator : gmfgen::GenNavigator) : Sequence(gmfgen::GenCommonBase) {
-	return getNavigatorNodes(navigator)->select(n | getChildReferencesFrom(navigator, n)->size() > 0)
-}
-
--- MODIFIERS: cached
-helper getNavigatorContainedNodes(navigator : gmfgen::GenNavigator) : Sequence(gmfgen::GenCommonBase) {
-	return getNavigatorNodes(navigator)->select(n | getChildReferencesTo(navigator, n)->size() > 0)
-}
-
--- MODIFIERS: private
-helper getNavigatorNodes(navigator : gmfgen::GenNavigator) : Sequence(gmfgen::GenCommonBase) {
-	return navigator.editorGen.diagram.getAllContainers()[gmfgen::GenCommonBase]->union(navigator.editorGen.diagram.links)->asSequence()->sortedBy(n | n.visualID)
-}
-
-helper getGroupNames(_references : Sequence(gmfgen::GenNavigatorChildReference)) : Set(String) {
-	return _references->select(ref | ref.isInsideGroup())->collect(ref | ref.groupName)->asOrderedSet()
-}
-
-helper getNavigatorReference(groupName : String, childReferences : Sequence(gmfgen::GenNavigatorChildReference)) : gmfgen::GenNavigatorChildReference {
-	return childReferences->select(r | r.groupName = groupName)->first()
-}
-
-helper getChildReferencesFrom(navigator : gmfgen::GenNavigator, parent : gmfgen::GenCommonBase) : Sequence(gmfgen::GenNavigatorChildReference) {
-	return if parent.oclIsUndefined() 
-		then navigator.childReferences->select(r | r.parent.oclIsUndefined())->asSequence()
-		else navigator.childReferences->select(r | undefinedAsFalse(parent.visualID = r.parent.visualID))->asSequence()
-	endif
-}
-
-helper getChildReferencesTo(navigator : gmfgen::GenNavigator, child : gmfgen::GenCommonBase) : Sequence(gmfgen::GenNavigatorChildReference) {
-	return navigator.childReferences->select(r | child.visualID = r.child.visualID)->asSequence()
-}
-
-helper getDiagramTopReference(navigator : gmfgen::GenNavigator) : gmfgen::GenNavigatorChildReference {
-	return let diagramTopReferences = navigator.childReferences->select(cr | null = cr.parent)->select(cr | cr.child = navigator.editorGen.diagram) in (if diagramTopReferences->size() = 0 then null else diagramTopReferences->at(0 + 1) endif)
-}
-
-
-helper i18nKeyForGroup(groupName : String, contextElement : gmfgen::GenCommonBase) : String {
-	return 'NavigatorGroupName.' + (if null <> contextElement then contextElement.getUniqueIdentifier() else 'File' endif) + '.' + validJavaIdentifier(groupName)
-}
-
-helper i18nKeyForOpenDiagramActionName() : String {
-	return 'NavigatorActionProvider.OpenDiagramActionName'
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/extensions.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/extensions.xpt
deleted file mode 100644
index 251e4c8e0aa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/extensions.xpt
+++ /dev/null
@@ -1,167 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE extensions FOR gmfgen::GenNavigator-»
-	«EXPAND editorInputPropertyTester('URIEditorInput', 'org.eclipse.emf.common.ui.URIEditorInput', getUriInputTesterQualifiedClassName())-»
-«IF editorGen.diagram.generateShortcutIcon()-»
-
-	«EXPAND editorInputPropertyTester('Shortcut', 'org.eclipse.gmf.runtime.notation.View', editorGen.diagram.getShortcutPropertyTesterQualifiedClassName())-»
-«ENDIF-»
-
-	«EXPAND registerBindings-»
-
-   <extension point="org.eclipse.ui.navigator.navigatorContent" id="navigator-content">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <navigatorContent
-            id="«contentExtensionID»" 
-            name="«contentExtensionName»" 
-            priority="«contentExtensionPriority»" 
-            contentProvider="«getContentProviderQualifiedClassName()»" 
-            labelProvider="«getLabelProviderQualifiedClassName()»"
-            icon="«editorGen.editor.iconPathX»"
-            activeByDefault="true">
-         <triggerPoints>
-            <or>
-	           <and>
-    	          <instanceof value="org.eclipse.core.resources.IFile"/>
-        	      <test property="org.eclipse.core.resources.extension" value="«editorGen.diagramFileExtension»"/>
-               </and>
-               <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
-«IF editorGen.diagram.generateShortcutIcon()-»
-           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
-           	      <test property="«editorGen.plugin.iD».isShortcut"/>
-           	   </adapt>
-«ENDIF-»
-            </or>
-         </triggerPoints>
-         <possibleChildren>
-            <or>
-         	   <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
-«IF editorGen.diagram.generateShortcutIcon()-»
-           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
-           	      <test property="«editorGen.plugin.iD».isShortcut"/>
-           	   </adapt>
-«ENDIF-»
-            </or>
-         </possibleChildren>
-         <commonSorter 
-               id="«sorterExtensionID»" 
-               class="«getSorterQualifiedClassName()»">
-            <parentExpression>
-               <or>
-	              <and>
-    	             <instanceof value="org.eclipse.core.resources.IFile"/>
-        	         <test property="org.eclipse.core.resources.extension" value="«editorGen.diagramFileExtension»"/>
-                  </and>
-                  <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
-               </or>
-            </parentExpression>
-         </commonSorter>
-      </navigatorContent>
-«IF generateDomainModelNavigator and null <> editorGen.domainGenModel-»
-      <navigatorContent
-            id="«domainContentExtensionID»" 
-            name="«domainContentExtensionName»" 
-            priority="«domainContentExtensionPriority»" 
-            contentProvider="«getDomainContentProviderQualifiedClassName()»" 
-            labelProvider="«getDomainLabelProviderQualifiedClassName()»"
-            icon="«editorGen.editor.iconPathX»"
-            activeByDefault="true">
-         <triggerPoints>
-            <or>
-	           <and>
-    	          <instanceof value="org.eclipse.core.resources.IFile"/>
-        	      <test property="org.eclipse.core.resources.extension" value="«editorGen.domainFileExtension»"/>
-               </and>
-               <instanceof value="«getDomainNavigatorItemQualifiedClassName()»"/>
-            </or>
-         </triggerPoints>
-         <possibleChildren>
-            <instanceof value="«getDomainNavigatorItemQualifiedClassName()»"/>
-         </possibleChildren>
-      </navigatorContent>
-«ENDIF-»
-      <actionProvider
-            id="«actionProviderID»"
-            class="«getActionProviderQualifiedClassName()»">
-         <enablement>
-            <or>
-               <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
-«IF editorGen.diagram.generateShortcutIcon()-»
-           	   <adapt type="org.eclipse.gmf.runtime.notation.View">
-           	      <test property="«editorGen.plugin.iD».isShortcut"/>
-           	   </adapt>
-«ENDIF-»
-            </or>
-         </enablement>
-      </actionProvider>
-   </extension>
-   
-	«EXPAND registerLinkHelper-»
-«ENDDEFINE»
-
-«DEFINE editorInputPropertyTester(_property : String, type : String, testerClass : String) FOR gmfgen::GenNavigator-»
-   <extension point="org.eclipse.core.expressions.propertyTesters" id="navigator-proptest.is«_property»">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-       <propertyTester
-           id="«editorGen.plugin.iD».«_property»PropertyTester"
-           type="«type»"
-           namespace="«editorGen.plugin.iD»"
-           properties="is«_property»"
-           class="«testerClass»">
-       </propertyTester>
-   </extension>
-«ENDDEFINE»
-
-«DEFINE registerBindings FOR gmfgen::GenNavigator-»
-   <extension point="org.eclipse.ui.navigator.viewer" id="navigator-viewbinding">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <viewerContentBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
-         <includes>
-            <contentExtension pattern="«contentExtensionID»"/>
-«IF generateDomainModelNavigator and null <> editorGen.domainGenModel-»
-			<contentExtension pattern="«domainContentExtensionID»"/>
-«ENDIF-»
-            <contentExtension pattern="«linkHelperExtensionID»"/>
-         </includes>
-      </viewerContentBinding>
-      <viewerActionBinding viewerId="org.eclipse.ui.navigator.ProjectExplorer">
-         <includes>
-            <actionExtension pattern="«actionProviderID»"/>
-         </includes>
-      </viewerActionBinding>
-   </extension>
-«ENDDEFINE»
-
-«DEFINE registerLinkHelper FOR gmfgen::GenNavigator-»
-   <extension point="org.eclipse.ui.navigator.linkHelper" id="navigator-linkhelper">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <linkHelper
-            id="«linkHelperExtensionID»"
-            class="«getLinkHelperQualifiedClassName()»">
-         <editorInputEnablement>
-            <and>
-               <instanceof value="org.eclipse.emf.common.ui.URIEditorInput"/>
-               <test property="«editorGen.plugin.iD».isURIEditorInput"/>
-            </and>
-         </editorInputEnablement>
-         <selectionEnablement>
-            <instanceof value="«getAbstractNavigatorItemQualifiedClassName()»"/>
-         </selectionEnablement>
-      </linkHelper>
-   </extension>
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
deleted file mode 100644
index c19e79f97fb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/getEditorInput.xpt
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE getEditorInput FOR gmfgen::GenEditorGenerator-»
-«EXPAND xpt::Common::generatedMemberComment»
-private static org.eclipse.ui.IEditorInput getEditorInput(org.eclipse.gmf.runtime.notation.Diagram diagram) {
-	org.eclipse.emf.ecore.resource.Resource diagramResource = diagram.eResource();
-«IF null = application-»
-	«EXPAND CodeStyle::iterate('nextEObject', 'org.eclipse.emf.ecore.EObject', 'diagramResource.getContents()') FOR diagram-»
-		if (nextEObject == diagram) {
-			return new org.eclipse.ui.part.FileEditorInput(org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(diagramResource));
-		}
-		if (nextEObject instanceof org.eclipse.gmf.runtime.notation.Diagram) {
-			break;
-		}
-	}
-«ENDIF-»
-	«EXPAND defineURIEditorInput('diagram', 'editorInput') FOR diagram-»
-	return editorInput;
-}
-«ENDDEFINE»
-
-«DEFINE defineURIEditorInput(diagramVarName : String, editorInputVarName : String) FOR gmfgen::GenDiagram-»
-org.eclipse.emf.common.util.URI uri = org.eclipse.emf.ecore.util.EcoreUtil.getURI(«diagramVarName»);
-String editorName = uri.lastSegment() + '#' + «diagramVarName».eResource().getContents().indexOf(«diagramVarName»);
-org.eclipse.ui.IEditorInput «editorInputVarName» = new org.eclipse.emf.common.ui.URIEditorInput(uri, editorName);
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/navigatorGroup.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/navigatorGroup.gif
deleted file mode 100644
index fca9c53e629..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/navigator/navigatorGroup.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/Activator.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/Activator.xpt
deleted file mode 100644
index 87cf842c520..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/Activator.xpt
+++ /dev/null
@@ -1,263 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Activator FOR gmfgen::GenPlugin-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «editorGen.editor.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «activatorClassName» extends org.eclipse.ui.plugin.AbstractUIPlugin {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static final String ID = "«iD»"; //$NON-NLS-1$
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.tooling.runtime.LogHelper myLogHelper;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static final org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint DIAGRAM_PREFERENCES_HINT =
-			new org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint(ID);
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static «activatorClassName» instance;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.emf.edit.provider.ComposedAdapterFactory adapterFactory;	
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «editorGen.diagram.getDocumentProviderQualifiedClassName()» documentProvider;
-
-«IF editorGen.diagram.links->exists(not sansDomain)-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «editorGen.diagram.getLinkCreationConstraintsQualifiedClassName()» linkConstraints;
-
-«ENDIF-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «editorGen.diagram.getElementInitializersPackageName()».«editorGen.diagram.getElementInitializersClassName()» initializers;
-
-«IF not editorGen.expressionProviders.oclIsUndefined() -»
-«FOREACH editorGen.expressionProviders.providers[gmfgen::GenExpressionInterpreter] AS p-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «p.getQualifiedClassName()» «p.language»Factory;
-«ENDFOREACH-»
-«ENDIF-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «activatorClassName»() {
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void start(org.osgi.framework.BundleContext context) throws Exception {
-		super.start(context);
-		instance = this;
-		myLogHelper = new org.eclipse.gmf.tooling.runtime.LogHelper(this);
-		org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
-		adapterFactory = createAdapterFactory();
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void stop(org.osgi.framework.BundleContext context) throws Exception {
-		adapterFactory.dispose();
-		adapterFactory = null;
-«IF editorGen.diagram.links->exists(not sansDomain)-»
-		linkConstraints = null;
-«ENDIF-»
-		initializers = null;
-«IF not editorGen.expressionProviders.oclIsUndefined() -»
-«FOREACH editorGen.expressionProviders.providers[gmfgen::GenExpressionInterpreter] AS p-»
-		«p.language»Factory = null;
-«ENDFOREACH-»
-«ENDIF-»
-		instance = null;
-		super.stop(context);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static «activatorClassName» getInstance() {
-		return instance;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.emf.edit.provider.ComposedAdapterFactory createAdapterFactory() {
-		«EXPAND CodeStyle::newGenericInstance('factories', 'java.util.ArrayList', 'org.eclipse.emf.common.notify.AdapterFactory') FOR editorGen.diagram»();
-		fillItemProviderFactories(factories);
-		return new org.eclipse.emf.edit.provider.ComposedAdapterFactory(factories);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void fillItemProviderFactories(«EXPAND CodeStyle::G('java.util.List', 'org.eclipse.emf.common.notify.AdapterFactory') FOR editorGen.diagram» factories) {
-«EXPAND MetaModel::PopulateItemProviderFactories('factories') FOR editorGen-»
-		factories.add(new org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory());
-		factories.add(new org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory());
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.common.notify.AdapterFactory getItemProvidersAdapterFactory() {
-		return adapterFactory;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.jface.resource.ImageDescriptor getItemImageDescriptor(Object item) {
-		org.eclipse.emf.edit.provider.IItemLabelProvider labelProvider =
-				(org.eclipse.emf.edit.provider.IItemLabelProvider) adapterFactory.adapt(
-						item, org.eclipse.emf.edit.provider.IItemLabelProvider.class);
-		if (labelProvider != null) {
-			return org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry.getInstance().getImageDescriptor(
-					labelProvider.getImage(item));
-		}
-		return null;
-	}
-
-	/**
-	 * Returns an image descriptor for the image file at the given
-	 * plug-in relative path.
-	 *
-	 * @generated
-	 * @param path the path
-	 * @return the image descriptor
-	 */
-	public static org.eclipse.jface.resource.ImageDescriptor getBundledImageDescriptor(String path) {
-		return org.eclipse.ui.plugin.AbstractUIPlugin.imageDescriptorFromPlugin(ID, path);
-	}
-
-	/**
-	 * Respects images residing in any plug-in. If path is relative,
-	 * then this bundle is looked up for the image, otherwise, for absolute 
-	 * path, first segment is taken as id of plug-in with image
-	 *
-	 * @generated
-	 * @param path the path to image, either absolute (with plug-in id as first segment), or relative for bundled images
-	 * @return the image descriptor
-	 */
-	public static org.eclipse.jface.resource.ImageDescriptor findImageDescriptor(String path) {
-		final org.eclipse.core.runtime.IPath p = new org.eclipse.core.runtime.Path(path);
-		if (p.isAbsolute() && p.segmentCount() > 1) {
-			return org.eclipse.ui.plugin.AbstractUIPlugin.imageDescriptorFromPlugin(
-					p.segment(0), p.removeFirstSegments(1).makeAbsolute().toString());
-		} else {
-			return getBundledImageDescriptor(p.makeAbsolute().toString());
-		} 
-	}
-
-	/**
-	 * Returns an image for the image file at the given plug-in relative path.
-	 * Client do not need to dispose this image. Images will be disposed automatically.
-	 *
-	 * @generated
-	 * @param path the path
-	 * @return image instance
-	 */
-	public org.eclipse.swt.graphics.Image getBundledImage(String path) {
-		org.eclipse.swt.graphics.Image image = getImageRegistry().get(path);
-		if (image == null) {
-			getImageRegistry().put(path, getBundledImageDescriptor(path));
-			image = getImageRegistry().get(path);
-		}
-		return image;
-	}
-
-	/**
-	 * Returns string from plug-in's resource bundle
-	 *
-	 * @generated
-	 */
-	public static String getString(String key) {
-		return org.eclipse.core.runtime.Platform.getResourceString(
-				getInstance().getBundle(), "%" + key); //$NON-NLS-1$
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editorGen.diagram.getDocumentProviderQualifiedClassName()» getDocumentProvider() {
-		if (documentProvider == null) {
-			documentProvider = new «editorGen.diagram.getDocumentProviderQualifiedClassName()»();
-		}
-		return documentProvider;
-	}
-
-«IF editorGen.diagram.links->exists(not sansDomain) -»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editorGen.diagram.getLinkCreationConstraintsQualifiedClassName()» getLinkConstraints() {
-		return linkConstraints;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setLinkConstraints(«editorGen.diagram.getLinkCreationConstraintsQualifiedClassName()» lc) {
-		this.linkConstraints = lc;
-	}
-
-«ENDIF-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editorGen.diagram.getElementInitializersPackageName()».«editorGen.diagram.getElementInitializersClassName()» getElementInitializers() {
-		return initializers;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setElementInitializers(«editorGen.diagram.getElementInitializersPackageName()».«editorGen.diagram.getElementInitializersClassName()» i) {
-		this.initializers = i;
-	}
-
-«IF not editorGen.expressionProviders.oclIsUndefined() -»
-«FOREACH editorGen.expressionProviders.providers[gmfgen::GenExpressionInterpreter] AS p-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «p.getQualifiedClassName()» get«p.className»() {
-		return «p.language»Factory;
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void set«p.className»(«p.getQualifiedClassName()» f) {
-		this.«p.language»Factory = f;
-	}
-
-«ENDFOREACH-»
-«ENDIF-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void logError(String error) {
-		getLogHelper().logError(error, null);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void logError(String error, Throwable throwable) {
-		getLogHelper().logError(error, throwable);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void logInfo(String message) {
-		getLogHelper().logInfo(message, null);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void logInfo(String message, Throwable throwable) {
-		getLogHelper().logInfo(message, throwable);
-	}
-	
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.tooling.runtime.LogHelper getLogHelper() {
-		return myLogHelper;
-	}
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-// Perhaps, xpt:editor::Editor or some xpt::CommonCode would be better place for
-// this accessor.
-// XXX besides, consider using preference store directly, without a hint (see comment in Editor.xpt#getPreferencesHint)
-«DEFINE preferenceHintAccess FOR gmfgen::GenEditorGenerator»«plugin.getActivatorQualifiedClassName()».DIAGRAM_PREFERENCES_HINT«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenPlugin»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/build.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/build.xpt
deleted file mode 100644
index 596955cdd52..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/build.xpt
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE build FOR gmfgen::GenPlugin-»
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               messages.properties,\
-               .options
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/manifest.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/manifest.xpt
deleted file mode 100644
index ba3dda9950e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/manifest.xpt
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::GenEditorGenerator»
-
-«DEFINE manifest FOR gmfgen::GenPlugin-»
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: «iD»; singleton:=true
-Bundle-Version: «version»
-Bundle-ClassPath: .
-Bundle-Activator: «getActivatorQualifiedClassName()»
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: «editorGen.diagram.editPartsPackageName», 
- «editorGen.editor.packageName»,
- «editorGen.diagram.providersPackageName»
-Require-Bundle: org.eclipse.core.runtime,
-«IF editorGen.application = null-»
- org.eclipse.core.resources,
-«ENDIF-»
-«IF editorGen.diagram.generateShortcutIcon() or (editorGen.navigator <> null and editorGen.navigator.generateDomainModelNavigator)-»
- org.eclipse.core.expressions,
-«ENDIF-»
- org.eclipse.jface,
-«IF editorGen.application = null-»
- org.eclipse.ui.ide,
-«ENDIF-»
- org.eclipse.ui.views,
-«IF editorGen.navigator <> null-»
- org.eclipse.ui.navigator,
- org.eclipse.ui.navigator.resources,
-«ENDIF-»
- org.eclipse.emf.ecore,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.emf.edit.ui,
- org.eclipse.gmf.runtime.emf.core,
- org.eclipse.gmf.runtime.emf.commands.core,
- org.eclipse.gmf.runtime.emf.ui.properties,
- org.eclipse.gmf.runtime.diagram.ui,
-«IF printingEnabled-»
- org.eclipse.gmf.runtime.diagram.ui.printing,
- org.eclipse.gmf.runtime.diagram.ui.printing.render,
-«ENDIF-»
-«IF editorGen.propertySheet <> null-»
- org.eclipse.gmf.runtime.diagram.ui.properties,
-«ENDIF-»
- org.eclipse.gmf.runtime.diagram.ui.providers,
-«IF editorGen.application = null-»
- org.eclipse.gmf.runtime.diagram.ui.providers.ide,
-«ENDIF-»
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui.resources.editor,
-«IF editorGen.application = null-»
- org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
-«ENDIF-»
-«FOREACH getAllRequiredPlugins()->including('org.eclipse.gmf.tooling.runtime')->asSequence() AS id-»
- «id»;visibility:=reexport,
-«ENDFOREACH-»
- org.eclipse.gef;visibility:=reexport
-Bundle-ActivationPolicy: lazy
-«EXPAND executionEnvironment-»
-«ENDDEFINE»
-
-«DEFINE executionEnvironment FOR gmfgen::GenPlugin-»
-Bundle-RequiredExecutionEnvironment: «IF editorGen.jdkComplianceLevel() > 5»JavaSE-1.6«ELSE»J2SE-1.«editorGen.jdkComplianceLevel()»«ENDIF»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/options.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/options.xpt
deleted file mode 100644
index a73cc31be22..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/options.xpt
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE options FOR gmfgen::GenPlugin-»
-# Tracing options for the «iD» plug-in
-
-# Common issues
-«iD»/debug=false
-
-# Visual IDs
-«iD»/debug/visualID=false
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/plugin.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/plugin.xpt
deleted file mode 100644
index 15a90df8d27..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/plugin.xpt
+++ /dev/null
@@ -1,163 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::GenEditorGenerator»
-
-«DEFINE plugin FOR gmfgen::GenPlugin-»
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-«EXPAND xpt::Common::xcopyright FOR editorGen-»
-<plugin>
-«EXPAND fileTypes-»
-«EXPAND extension_parser-»
-«EXPAND xpt::editor::extensions::extensions FOR editorGen-»
-«EXPAND menu-»
-«EXPAND validation FOR editorGen.diagram-»
-«EXPAND metrics FOR editorGen.metrics-»
-«EXPAND xpt::diagram::preferences::extensions::extensions FOR editorGen.diagram-»
-«EXPAND xpt::propsheet::extensions::extensions FOR editorGen.propertySheet-»
-«EXPAND xpt::providers::extensions::extensions FOR editorGen.diagram-»
-«EXPAND xpt::navigator::extensions::extensions FOR editorGen.navigator-»
-«EXPAND xpt::application::extensions::extensions FOR editorGen.application-»
-«EXPAND xpt::ConstraintProviders::extensions FOR editorGen-»
-«EXPAND xpt::diagram::updater::extensions::extensions FOR editorGen.diagramUpdater-»
-«EXPAND impl::actions::extensions::Main FOR editorGen-»
-«EXPAND additions-»
-</plugin>
-«ENDDEFINE»
-
-«DEFINE fileTypes FOR gmfgen::GenPlugin»
-   <extension point="org.eclipse.team.core.fileTypes" id="repo-ftype">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <fileTypes type="text" extension="«editorGen.diagramFileExtension»"/>
-   </extension>
-«ENDDEFINE»
-
-«DEFINE extension_parser FOR gmfgen::GenPlugin»
-   <extension point="org.eclipse.emf.ecore.extension_parser" id="resource-factory">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <parser
-         type="«editorGen.diagramFileExtension»"
-         class="org.eclipse.gmf.runtime.emf.core.resources.GMFResourceFactory">
-      </parser>
-   </extension>
-«ENDDEFINE»
-
-«DEFINE menu FOR gmfgen::GenPlugin»
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.action.globalActionHandlerProviders" id="global-actions">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <GlobalActionHandlerProvider
-         class="org.eclipse.gmf.runtime.diagram.ui.providers.DiagramGlobalActionHandlerProvider"
-         id="«editorGen.modelID»Presentation">
-         <Priority name="Lowest"/>
-         <ViewId id="«editorGen.editor.iD»">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="delete"/>
-            </ElementType>
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart">
-               <GlobalActionId actionId="save"/>
-            </ElementType>
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="save">
-               </GlobalActionId>
-            </ElementType>        
-         </ViewId>
-      </GlobalActionHandlerProvider>
-«IF printingEnabled-»
-      <GlobalActionHandlerProvider
-         class="org.eclipse.gmf.runtime.diagram.ui.printing.render.providers.DiagramWithPrintGlobalActionHandlerProvider"
-         id="«editorGen.modelID»PresentationPrint">
-         <Priority name="Lowest"/>
-         <ViewId id="«editorGen.editor.iD»">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="print"/>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-«ENDIF-»
-«IF null = editorGen.application-»
-      <GlobalActionHandlerProvider
-         class="org.eclipse.gmf.runtime.diagram.ui.providers.ide.providers.DiagramIDEGlobalActionHandlerProvider"
-         id="«editorGen.modelID»PresentationIDE">
-         <Priority name="Lowest"/>
-         <ViewId id="«editorGen.editor.iD»">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="bookmark"/>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-«ENDIF-»
-      <GlobalActionHandlerProvider
-            class="org.eclipse.gmf.runtime.diagram.ui.render.providers.DiagramUIRenderGlobalActionHandlerProvider"
-            id="«editorGen.modelID»Render">
-         <Priority name="Lowest"/>
-         <ViewId id="«editorGen.editor.iD»">
-            <ElementType class="org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart">
-               <GlobalActionId actionId="cut"/>
-               <GlobalActionId actionId="copy"/>
-               <GlobalActionId actionId="paste"/>
-            </ElementType>
-         </ViewId>
-      </GlobalActionHandlerProvider>
-   </extension>
-
-«ENDDEFINE»
-
-«DEFINE metrics FOR gmfgen::GenMetricContainer-»
-«IF metrics->size() > 0»
-   <extension id="metrics-view" point="org.eclipse.ui.views">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-   	  <view class="«editorGen.diagram.getMetricProviderQualifiedClassName()»$ResultView"
-			id="«editorGen.diagram.getMetricViewID()»"
-			name="«editorGen.modelID» Diagram Metrics"/>
-   </extension>
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE validation FOR gmfgen::GenDiagram-»
-«IF validationEnabled or hasAudits(editorGen)-»
-«IF null = editorGen.application-»
-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.markerNavigationProviders" id="markers-navigation">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <MarkerNavigationProvider class="«getMarkerNavigationProviderQualifiedClassName()»">
-         <MarkerType name="«editorGen.plugin.iD + '.' + getValidationDiagnosticMarkerType()»"/>
-         <Priority name="«markerNavigationProviderPriority»"/>
-      </MarkerNavigationProvider>
-   </extension>
-
-   <extension id="«getValidationDiagnosticMarkerType()»" name="«editorGen.plugin.name» problems" point="org.eclipse.core.resources.markers">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <super type="org.eclipse.core.resources.problemmarker"/>
-      <super type="org.eclipse.gmf.runtime.common.ui.services.marker"/>
-      <persistent value="true"/>
-   </extension>   
-«ENDIF-»
-«IF validationDecorators-»
-
-   <extension id="validationDecoratorProvider" name="ValidationDecorations" point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <decoratorProvider class="«getValidationDecoratorProviderQualifiedClassName()»">
-         <Priority name="«validationDecoratorProviderPriority»"/>
-         <object class="org.eclipse.gmf.runtime.diagram.ui.editparts.IPrimaryEditPart(org.eclipse.gmf.runtime.diagram.ui)" id="PRIMARY_VIEW"/>
-         <context decoratorTargets="PRIMARY_VIEW"/>
-      </decoratorProvider>
-   </extension>
-«ENDIF-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenPlugin»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/properties.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/properties.xpt
deleted file mode 100644
index 64afc8bcce3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/plugin/properties.xpt
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE properties FOR gmfgen::GenPlugin-»
-pluginName=«name»
-providerName=«provider»
-
-editorName=«editorGen.modelID» Diagram Editing
-context.description=«editorGen.modelID» Diagram Editing
-context.name=In «editorGen.modelID» Diagram Editor
-newWizardName=«editorGen.modelID» Diagram
-newWizardDesc=Creates «editorGen.modelID» diagram.
-
-«IF editorGen.diagram.generateInitDiagramAction()-»
-initDiagramActionLabel=Initialize «editorGen.diagramFileExtension» diagram file
-«ENDIF-»
-
-«IF null <> editorGen.application-»
-perspectiveName=«editorGen.modelID» Perspective
-applicationActionSetLabel=<«editorGen.modelID» Actions
-newDiagramActionLabel=«editorGen.modelID» Diagram
-aboutActionLabel=«editorGen.modelID» Diagram About...
-openURIActionLabel=Open URI...
-openURIActionDescription=Open file by URI
-openActionLabel=Open...
-openActionDescription=Open file
-«ENDIF-»
-
-navigatorContentName=*.«editorGen.diagramFileExtension» diagram contents
-«IF null <> editorGen.navigator and editorGen.navigator.generateDomainModelNavigator-»
-domainNavigatorContentName=*.«editorGen.domainFileExtension» model contents
-«ENDIF-»
-update.diagram.name=Update «editorGen.modelID» diagram
-update.diagram.description=Perform «editorGen.modelID» diagram update
-
-«EXPAND xpt::propsheet::extensions::i18n FOR editorGen.propertySheet-»
-«EXPAND xpt::diagram::preferences::extensions::i18n FOR editorGen.diagram-»
-«EXPAND xpt::providers::extensions::i18n FOR editorGen.diagram-»
-«EXPAND impl::actions::extensions::i18n FOR editorGen-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
deleted file mode 100644
index 0edbeadc6f9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/LabelProvider.xpt
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Class FOR gmfgen::GenPropertySheet»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «labelProviderClassName» extends «EXPAND extendsList» implements «EXPAND implementsList» {
-
-«EXPAND getTextMethod»
-«EXPAND getImageMethod»
-«EXPAND unwrapMethods»
-
-«EXPAND additions»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenPropertySheet»org.eclipse.jface.viewers.BaseLabelProvider«ENDDEFINE»
-
-«DEFINE implementsList FOR gmfgen::GenPropertySheet»org.eclipse.jface.viewers.ILabelProvider«ENDDEFINE»
-
-«DEFINE getTextMethod FOR gmfgen::GenPropertySheet»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public String getText(Object element) {
-		element = unwrap(element);
-«IF editorGen.navigator <> null-»
-		if (element instanceof «editorGen.navigator.getNavigatorGroupQualifiedClassName()») {
-			return ((«editorGen.navigator.getNavigatorGroupQualifiedClassName()») element).getGroupName();
-		}
-«ENDIF-»
-		org.eclipse.gmf.runtime.emf.type.core.IElementType etype = getElementType(getView(element));
-		return etype == null ? "" : etype.getDisplayName();
-	}
-«ENDDEFINE»
-
-«DEFINE getImageMethod FOR gmfgen::GenPropertySheet»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.swt.graphics.Image getImage(Object element) {
-		org.eclipse.gmf.runtime.emf.type.core.IElementType etype = getElementType(getView(unwrap(element)));
-		return etype == null ? null : «editorGen.diagram.getElementTypesQualifiedClassName()».getImage(etype);
-	}
-«ENDDEFINE»
-
-«DEFINE unwrapMethods FOR gmfgen::GenPropertySheet»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private Object unwrap(Object element) {
-		if (element instanceof org.eclipse.jface.viewers.IStructuredSelection) {
-			return ((org.eclipse.jface.viewers.IStructuredSelection) element).getFirstElement();
-		}
-		return element;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.notation.View getView(Object element) {
-		if (element instanceof org.eclipse.gmf.runtime.notation.View) {
-			return (org.eclipse.gmf.runtime.notation.View) element;
-		}
-		if (element instanceof org.eclipse.core.runtime.IAdaptable) {
-			return (org.eclipse.gmf.runtime.notation.View)
-					((org.eclipse.core.runtime.IAdaptable) element).getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-		}
-		return null;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.emf.type.core.IElementType getElementType(org.eclipse.gmf.runtime.notation.View view) {
-		// For intermediate views climb up the containment hierarchy to find the one associated with an element type.
-		while (view != null) {
-			int vid = «editorGen.diagram.getVisualIDRegistryQualifiedClassName()».getVisualID(view);
-			org.eclipse.gmf.runtime.emf.type.core.IElementType etype =
-					«editorGen.diagram.getElementTypesQualifiedClassName()».getElementType(vid);
-			if (etype != null) {
-				return etype;
-			}
-			view = view.eContainer() instanceof org.eclipse.gmf.runtime.notation.View ?
-					(org.eclipse.gmf.runtime.notation.View) view.eContainer() : null;
-		}
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenPropertySheet»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
deleted file mode 100644
index 476512c0211..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/PropertySection.xpt
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - [407242] - common code extracted to gmft.runtime 
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE Class FOR gmfgen::GenCustomPropertyTab»
-«EXPAND xpt::Common::copyright FOR sheet.editorGen-»
-package «sheet.packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «className» extends «EXPAND extendsList» «EXPAND implementsClause»{
-
-«EXPAND getPropertySourceMethod»
-«IF sheet.readOnly»
-«EXPAND createReadonlyControlsMethod»
-«ENDIF»
-«EXPAND getPropertySourceProviderMethod»
-«EXPAND transfromSelectionMethod»
-«EXPAND setInputMethod»
-«EXPAND getAdapterFactoryMethod»
-
-«EXPAND additions»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenCustomPropertyTab»org.eclipse.gmf.tooling.runtime.sheet.DefaultPropertySection«ENDDEFINE»
-«DEFINE implementsClause FOR gmfgen::GenCustomPropertyTab»implements org.eclipse.ui.views.properties.IPropertySourceProvider«ENDDEFINE»
-
-«DEFINE createReadonlyControlsMethod FOR gmfgen::GenCustomPropertyTab»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void createControls(org.eclipse.swt.widgets.Composite parent, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage aTabbedPropertySheetPage) {
-		super.createControls(parent, aTabbedPropertySheetPage);
-		forcePageReadOnly();
-	}
-«ENDDEFINE»
-
-«DEFINE transfromSelectionMethod FOR gmfgen::GenCustomPropertyTab-»
-«IF 'domain' = iD /*perhaps, override setInput should obey same condition?*/-»
-	«EXPAND xpt::Common::generatedMemberComment('Modify/unwrap selection.')»
-	«EXPAND CodeStyle::override FOR self.sheet.editorGen.diagram-»
-	protected Object transformSelection(Object selected) {
-		«EXPAND transfromSelectionMethodBodyDefault-»
-		return selected;
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE transfromSelectionMethodBodyDefault FOR gmfgen::GenCustomPropertyTab-»
-		selected = /*super.*/transformSelectionToDomain(selected);
-«ENDDEFINE»
-
-«REM»DEFINE's below are still here for ASPECT's compatibility only, all the code for them is moved to superclass«ENDREM»
-«DEFINE getPropertySourceMethod FOR gmfgen::GenCustomPropertyTab»«ENDDEFINE»
-«DEFINE getPropertySourceProviderMethod FOR gmfgen::GenCustomPropertyTab»«ENDDEFINE»
-«DEFINE setInputMethod FOR gmfgen::GenCustomPropertyTab»«ENDDEFINE»
-«DEFINE getAdapterFactoryMethod FOR gmfgen::GenCustomPropertyTab»«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenCustomPropertyTab»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/extensions.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/extensions.xpt
deleted file mode 100644
index 53775e9b631..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/propsheet/extensions.xpt
+++ /dev/null
@@ -1,146 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE extensions FOR gmfgen::GenPropertySheet-»
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyContributor" id="prop-contrib">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <propertyContributor
-            contributorId="«editorGen.plugin.iD»"«IF needsCaption»
-            labelProvider="«getLabelProviderQualifiedClassName()»"«ENDIF»>
-         <propertyCategory category="domain"/>
-         <propertyCategory category="visual"/>
-         <propertyCategory category="extra"/>
-      </propertyContributor>
-   </extension>
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertyTabs" id="proptabs">
-      «EXPAND xpt::Common::xmlGeneratedTag»   
-      <propertyTabs contributorId="«editorGen.plugin.iD»">
-«EXPAND tab FOREACH tabs-»
-      </propertyTabs>
-   </extension>
-
-   <extension point="org.eclipse.ui.views.properties.tabbed.propertySections" id="propsections">
-      «EXPAND xpt::Common::xmlGeneratedTag»   
-      <propertySections contributorId="«editorGen.plugin.iD»">
-«EXPAND section FOREACH tabs-»
-      </propertySections>
-   </extension>
-«ENDDEFINE»
-
-«DEFINE tab FOR gmfgen::GenPropertyTab-»
-«ERROR 'Unknown property tab: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE tab FOR gmfgen::GenStandardPropertyTab-»
-«IF iD = 'appearance'-»
-         <propertyTab
-             category="visual"
-             id="property.tab.AppearancePropertySection"
-             label="%tab.appearance"/>
-«ELSEIF iD = 'diagram'-»
-          <propertyTab
-             category="visual"
-             id="property.tab.DiagramPropertySection"
-             label="%tab.diagram"/>
-«ELSEIF iD = 'advanced'-»
-          <propertyTab
-             category="extra"
-             id="property.tab.AdvancedPropertySection"
-             label="%tab.advanced"/>           
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE tab FOR gmfgen::GenCustomPropertyTab-»
-          <propertyTab
-«IF iD = 'domain'-»
-             category="domain"
-«ELSE-»
-             category="extra"
-«ENDIF-»
-             id="property.tab.«iD»"
-             label="%tab.«iD»"/>
-«ENDDEFINE»
-
-«DEFINE section FOR gmfgen::GenPropertyTab-»
-«ERROR 'Unknown property tab: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE section FOR gmfgen::GenStandardPropertyTab-»
-«IF iD = 'appearance'-»
-         <propertySection id="property.section.ConnectorAppearancePropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ConnectionEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ConnectionAppearancePropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection>
-         <propertySection id="property.section.ShapeColorAndFontPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.ShapeEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.ShapeColorsAndFontsPropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection> 
-         <propertySection id="property.section.DiagramColorsAndFontsPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.appearance.DiagramColorsAndFontsPropertySection" 
-            tab="property.tab.AppearancePropertySection">
-         </propertySection>     
-«ELSEIF iD = 'diagram'-»
-         <propertySection id="property.section.RulerGridPropertySection" 
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.DiagramEditPartPropertySectionFilter" 
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.grid.RulerGridPropertySection" 
-            tab="property.tab.DiagramPropertySection">
-         </propertySection>     
-«ELSEIF iD = 'advanced'-»
-         <propertySection id="property.section.AdvancedPropertySection"
-            class="org.eclipse.gmf.runtime.diagram.ui.properties.sections.AdvancedPropertySection"
-            filter="org.eclipse.gmf.runtime.diagram.ui.properties.filters.EditPartPropertySectionFilter"
-            tab="property.tab.AdvancedPropertySection">
-         </propertySection>            
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE section FOR gmfgen::GenCustomPropertyTab-»
-         <propertySection
-            id="property.section.«iD»" 
-            tab="property.tab.«iD»"
-«EXPAND filter FOR filter-»
-            class="«getQualifiedClassName()»">
-«EXPAND input FOR filter-»
-         </propertySection>
-«ENDDEFINE»
-
-«DEFINE filter FOR gmfgen::GenPropertyTabFilter»«ENDDEFINE»
-
-«DEFINE filter FOR gmfgen::CustomTabFilter-»
-            filter="«getQualifiedClassName()»"
-«ENDDEFINE»
-
-«DEFINE input FOR gmfgen::GenPropertyTabFilter»«ENDDEFINE»
-
-«DEFINE input FOR gmfgen::TypeTabFilter-»
-«FOREACH getAllTypes()->asSequence() AS type-»
-            <input type="«type»"/>
-«ENDFOREACH-»
-«ENDDEFINE»
-
-«DEFINE i18n FOR gmfgen::GenPropertySheet-»
-
-# Property Sheet
-«FOREACH tabs->asSequence() AS tab-»
-tab.«tab.iD»=«tab.label»
-«ENDFOREACH-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/EditPartModelingAssistantProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/EditPartModelingAssistantProvider.xpt
deleted file mode 100644
index 98793b0079d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/EditPartModelingAssistantProvider.xpt
+++ /dev/null
@@ -1,221 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2013, 2020 Montages A.G., CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Montages) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::editparts::Utils»
-
-«DEFINE className FOR gmfgen::GenContainerBase»«getDiagram().modelingAssistantProviderClassName»Of«editPartClassName»«ENDDEFINE»
-
-«DEFINE packageName FOR gmfgen::GenContainerBase»«getDiagram().providersPackageName».assistants«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenContainerBase»«EXPAND packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE EditPartModelingAssistantProvider FOR gmfgen::GenContainerBase-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «EXPAND packageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «EXPAND className» «EXPAND extendsList» {
-
-	«EXPAND getTypesForPopupBar-»
-	
-	«EXPAND linkAssistantMethods-»
-
-	«EXPAND additions-»	
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenContainerBase»extends «EXPAND xpt::providers::ModelingAssistantProvider::qualifiedClassName FOR getDiagram()»«ENDDEFINE»
-
-«DEFINE getTypesForPopupBar FOR gmfgen::GenContainerBase-»
-	«LET self AS container-»
-	«IF container.getAssistantNodes()->size() > 0-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> getTypesForPopupBar(org.eclipse.core.runtime.IAdaptable host) {
-		java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> types = new java.util.ArrayList<org.eclipse.gmf.runtime.emf.type.core.IElementType>(«container.getAssistantNodes()->size()»);
-			«FOREACH container.getAssistantNodes()->asSequence() AS node-»
-		types.add(«EXPAND xpt::providers::ElementTypes::accessElementType FOR node»);
-			«ENDFOREACH-»
-		return types;	
-	}
-	«ENDIF-»
-	«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE linkAssistantMethods FOR gmfgen::GenContainerBase»«ENDDEFINE»
-
-«DEFINE linkAssistantMethods FOR gmfgen::GenNode-»
-«IF getAssistantOutgoingLinks(self)->size() > 0-»
-	«EXPAND getRelTypesOnSource-»
-	
-	«EXPAND doGetRelTypesOnSource-»
-	
-	«EXPAND getRelTypesOnSourceAndTarget-»	
-
-	«EXPAND doGetRelTypesOnSourceAndTarget-»	
-
-	«EXPAND getTypesForTarget-»	
-
-	«EXPAND doGetTypesForTarget-»
-«ENDIF-»	
-
-«IF getAssistantIncomingLinks(self)->size() > 0-»
-	«EXPAND getRelTypesOnTarget-»	
-
-	«EXPAND doGetRelTypesOnTarget-»	
-
-	«EXPAND getTypesForSource-»
-
-	«EXPAND doGetTypesForSource-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getRelTypesOnSource FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> getRelTypesOnSource(org.eclipse.core.runtime.IAdaptable source) {
-		org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart sourceEditPart =
-				(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) source.getAdapter(
-						org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart.class);
-		return doGetRelTypesOnSource((«getEditPartQualifiedClassName()») sourceEditPart);
-	}
-«ENDDEFINE»
-
-«DEFINE getRelTypesOnTarget FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> getRelTypesOnTarget(org.eclipse.core.runtime.IAdaptable target) {
-		org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart targetEditPart =
-				(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) target.getAdapter(
-						org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart.class);
-		return doGetRelTypesOnTarget((«getEditPartQualifiedClassName()») targetEditPart);
-	}
-«ENDDEFINE»
-
-«DEFINE getRelTypesOnSourceAndTarget FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> getRelTypesOnSourceAndTarget(
-			org.eclipse.core.runtime.IAdaptable source, org.eclipse.core.runtime.IAdaptable target) {
-		org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart sourceEditPart =
-				(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) source.getAdapter(
-						org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart.class);
-		org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart targetEditPart =
-				(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) target.getAdapter(
-						org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart.class);
-		return doGetRelTypesOnSourceAndTarget((«getEditPartQualifiedClassName()») sourceEditPart, targetEditPart);
-	}
-«ENDDEFINE»
-
-«DEFINE getTypesForSource FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> getTypesForSource(org.eclipse.core.runtime.IAdaptable target,
-			org.eclipse.gmf.runtime.emf.type.core.IElementType relationshipType) {
-		org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart targetEditPart =
-				(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) target.getAdapter(
-						org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart.class);
-		return doGetTypesForSource((«getEditPartQualifiedClassName()») targetEditPart, relationshipType);
-	}
-«ENDDEFINE»
-
-«DEFINE getTypesForTarget FOR gmfgen::GenNode-»
-	«IF getAssistantOutgoingLinks(self)->size() > 0-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	«EXPAND CodeStyle::override»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> getTypesForTarget(org.eclipse.core.runtime.IAdaptable source,
-			org.eclipse.gmf.runtime.emf.type.core.IElementType relationshipType) {
-		org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart sourceEditPart =
-				(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) source.getAdapter(
-						org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart.class);
-		return doGetTypesForTarget((«getEditPartQualifiedClassName()») sourceEditPart, relationshipType);
-	}
-	«ENDIF-»
-«ENDDEFINE»
-
-// pre: getAssistantOutgoingLinks(this).size() > 0
-«DEFINE doGetRelTypesOnSource FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> doGetRelTypesOnSource(«getEditPartQualifiedClassName()» source) {
-		java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> types = new java.util.ArrayList<org.eclipse.gmf.runtime.emf.type.core.IElementType>(«getAssistantOutgoingLinks(self)->size()»);
-		«FOREACH getAssistantOutgoingLinks(self) AS link-»
-		types.add(«EXPAND xpt::providers::ElementTypes::accessElementType FOR link»);
-		«ENDFOREACH-»
-		return types;
-	}
-«ENDDEFINE»
-
-// pre: getAssistantIncomingLinks(this).size() > 0
-«DEFINE doGetRelTypesOnTarget FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> doGetRelTypesOnTarget(«getEditPartQualifiedClassName()» target) {
-		java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> types = new java.util.ArrayList<org.eclipse.gmf.runtime.emf.type.core.IElementType>(«getAssistantIncomingLinks(self)->size()»);
-		«FOREACH getAssistantIncomingLinks(self) AS link-»
-		types.add(«EXPAND xpt::providers::ElementTypes::accessElementType FOR link»);
-		«ENDFOREACH-»
-		return types;
-	}
-«ENDDEFINE»
-
-// pre: getAssistantOutgoingLinks(this).size() > 0
-«DEFINE doGetRelTypesOnSourceAndTarget FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> doGetRelTypesOnSourceAndTarget(«getEditPartQualifiedClassName()» source, org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart targetEditPart) {
-		java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> types = new java.util.LinkedList<org.eclipse.gmf.runtime.emf.type.core.IElementType>();
-		«FOREACH getAssistantOutgoingLinks(self) AS link-»
-			«FOREACH selectGenNodes(link.targets) AS target-»
-		if (targetEditPart instanceof «target.getEditPartQualifiedClassName()») {
-			types.add(«EXPAND xpt::providers::ElementTypes::accessElementType FOR link»);
-		}
-			«ENDFOREACH-»
-		«ENDFOREACH-»
-		return types;
-	}
-«ENDDEFINE»
-
-// pre: getAssistantIncomingLinks(this).size() > 0
-«DEFINE doGetTypesForSource FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> doGetTypesForSource(«getEditPartQualifiedClassName()» target, org.eclipse.gmf.runtime.emf.type.core.IElementType relationshipType) {
-		java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> types = new java.util.ArrayList<org.eclipse.gmf.runtime.emf.type.core.IElementType>();
-		«FOREACH getAssistantIncomingLinks(self) AS link SEPARATOR ' else '-»
-		if (relationshipType == «EXPAND xpt::providers::ElementTypes::accessElementType FOR link») {
-			«FOREACH selectGenNodes(link.sources) AS source-»
-			types.add(«EXPAND xpt::providers::ElementTypes::accessElementType FOR source»);
-			«ENDFOREACH-»
-		}
-		«ENDFOREACH-»
-		return types;
-	}
-«ENDDEFINE»
-
-// pre: getAssistantOutgoingLinks(this).size() > 0
-«DEFINE doGetTypesForTarget FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> doGetTypesForTarget(«getEditPartQualifiedClassName()» source, org.eclipse.gmf.runtime.emf.type.core.IElementType relationshipType) {
-		java.util.List<org.eclipse.gmf.runtime.emf.type.core.IElementType> types = new java.util.ArrayList<org.eclipse.gmf.runtime.emf.type.core.IElementType>();
-		«FOREACH getAssistantOutgoingLinks(self) AS link SEPARATOR ' else '-»
-		if (relationshipType == «EXPAND xpt::providers::ElementTypes::accessElementType FOR link») {
-			«FOREACH selectGenNodes(link.targets) AS target-»
-			types.add(«EXPAND xpt::providers::ElementTypes::accessElementType FOR target»);
-			«ENDFOREACH-»
-		}
-		«ENDFOREACH-»
-		return types;
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenContainerBase»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt
deleted file mode 100644
index f0c7c378498..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/EditPartProvider.xpt
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- * 	  Michael Golubev (Montages) - API extracted to GMF-T runtime 
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE EditPartProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «editPartProviderClassName» «EXPAND extendsList» {
-
-	«EXPAND _constructor»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenDiagram»extends org.eclipse.gmf.tooling.runtime.providers.DefaultEditPartProvider«ENDDEFINE»
-«DEFINE implementsList FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «editPartProviderClassName»() {
-		super(new «getEditPartFactoryQualifiedClassName()»(), «-»
-			«EXPAND xpt::editor::VisualIDRegistry::runtimeTypedInstanceCall FOR self», «-»
-			«getEditPartQualifiedClassName()».MODEL_ID			
-		);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementInitializers.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementInitializers.qvto
deleted file mode 100644
index 2d06bda56f7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementInitializers.qvto
+++ /dev/null
@@ -1,77 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import xpt.GenModelUtils;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-modeltype genmodel uses "http://www.eclipse.org/emf/2002/GenModel";
-
-library ElementInitializers;
-
-helper genmodel::GenClassifier::expressionResultNeedsCast() : Boolean { return false }
-helper genmodel::GenClass::expressionResultNeedsCast() : Boolean { return false }
-helper genmodel::GenDataType::expressionResultNeedsCast() : Boolean { return self.isNumberObject() or self.isPrimitiveNumberType() }
-helper genmodel::GenEnum::expressionResultNeedsCast() : Boolean { return true }
-
---
--- Present approach may result in duplicated methods in few odd scenarios
--- when same feature gets initialized using java language inside single ElementInitializer hierarchy, 
--- e.g. for a given diagram element, with feature1 and feature2 of a same/similar kind:
--- feature1
---   Instance1
---     featureX
---       InstanceX1
---         featureY = 'aaa' (Java)
--- feature2
---   Instance2
---     featureX
---       InstanceX2
---         featureY = 'bbb' (Java)
--- there would be two featureY_featureY_DiagramElement() methods
---
-helper javaMethodName(de : gmfgen::GenCommonBase, valueSpec : gmfgen::GenFeatureValueSpec) : String {
-	return valueSpec.feature.ecoreFeature.name + '_' + (if valueSpec.featureSeqInitializer.creatingInitializer <> null then valueSpec.featureSeqInitializer.creatingInitializer.feature.ecoreFeature.name + '_' else '' endif) + de.getUniqueIdentifier()
-}
-
-helper recurseCollectValueSpec(si : gmfgen::GenFeatureSeqInitializer) : Sequence(gmfgen::GenFeatureValueSpec) {
-	return si.initializers[gmfgen::GenFeatureValueSpec]->union(si.initializers[gmfgen::GenReferenceNewElementSpec].newElementInitializers->collect(it | recurseCollectValueSpec(it))->asOrderedSet())->asSequence()
-}
-
-helper getSuffixes(newSuffix : Integer) : Sequence(Integer) {
-	return Sequence { newSuffix }
-}
-
-helper getSuffixes(suffixes : Sequence(Integer), newSuffix : Integer) : Sequence(Integer) {
-	return suffixes->including(newSuffix)
-}
-
-helper getVariableName(prefix : String, suffixes : Sequence(Integer)) : String {
-	return prefix + getSuffix(suffixes)
-}
-
--- privates
-helper genmodel::GenClassifier::isNumberObject() : Boolean { return false }
-helper genmodel::GenClass::isNumberObject() : Boolean { return false }
-helper genmodel::GenDataType::isNumberObject() : Boolean { return Sequence { 'java.math.BigDecimal', 'java.math.BigInteger', 'java.lang.Byte', 'java.lang.Double', 'java.lang.Float', 'java.lang.Integer', 'java.lang.Long', 'java.lang.Short' }->includes(self.ecoreDataType.instanceClassName) }
-helper genmodel::GenEnum::isNumberObject() : Boolean { return false }
-
-helper genmodel::GenClassifier::isPrimitiveNumberType() : Boolean {	return false }
-helper genmodel::GenClass::isPrimitiveNumberType() : Boolean { return false }
-helper genmodel::GenDataType::isPrimitiveNumberType() : Boolean { return Sequence { 'byte', 'double', 'float', 'int', 'long', 'short' }->includes(self.ecoreDataType.instanceClassName) }
-helper genmodel::GenEnum::isPrimitiveNumberType() : Boolean { return false }
-
-helper getSuffix(suffixes : Sequence(Integer)) : String {
-	return '_' + suffixes->first().repr() + (if suffixes->size() > 1 then getSuffix(suffixes->subSequence(2, suffixes->size())) else '' endif)
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt
deleted file mode 100644
index 3e8f47c85ee..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementInitializers.xpt
+++ /dev/null
@@ -1,200 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - refactored javaInitilizers not to use methods from GMFGen model
- *                               [221347] Got rid of generated interfaces 
- *                               (IObjectInitializer, IFeatureInitializer) and implementation thereof
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION xpt::providers::ElementInitializers»
-«EXTENSION xpt::GenModelUtils»
-«EXTENSION gmf::GenModelUtils»
-
-// XXX should generate this class only when there is initialization logic defined in the model 
-
-«DEFINE ElementInitializers FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «getElementInitializersPackageName()»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «getElementInitializersClassName()» {
-
-	protected «getElementInitializersClassName()»() {
-		// use #getInstance to access cached instance
-	} 
-
-	«EXPAND Initializers»
-	«EXPAND JavaSupport»
-	«EXPAND additions-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static «getElementInitializersClassName()» getInstance() {
-		«getElementInitializersClassName()» cached = «EXPAND plugin::Activator::instanceAccess FOR editorGen».getElementInitializers();
-		if (cached == null) {
-			«EXPAND plugin::Activator::instanceAccess FOR editorGen».setElementInitializers(cached = new «getElementInitializersClassName()»());
-		}
-		return cached;
-	}
-}
-«ENDDEFINE»
-
-«DEFINE Initializers FOR gmfgen::GenDiagram-»
-	«EXPAND initMethod FOREACH getAllNodes()-»
-	«EXPAND initMethod FOREACH links-»
-«ENDDEFINE»
-
-«DEFINE JavaSupport FOR gmfgen::GenDiagram-»
-«IF editorGen.expressionProviders <> null and editorGen.expressionProviders.providers[gmfgen::GenJavaExpressionProvider]->notEmpty()-»
-	«EXPAND javaMethod FOREACH getAllNodes()-»
-	«EXPAND javaMethod FOREACH links-»
-«ENDIF-»
-«ENDDEFINE»
-
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-
-«REM»
-	Definitions of initializer objects.
-«ENDREM»
-
-«DEFINE initMethod FOR gmfgen::GenNode»«EXPAND initMethod(self) FOR modelFacet»«ENDDEFINE»
-«DEFINE initMethod FOR gmfgen::GenLink»«EXPAND initMethod(self) FOR modelFacet»«ENDDEFINE»
-
-«DEFINE initMethod(diagramElement : gmfgen::GenCommonBase) FOR gmfgen::ModelFacet»«ENDDEFINE»
-
-«DEFINE initMethod(diagramElement : gmfgen::GenCommonBase) FOR gmfgen::TypeModelFacet-»
-«EXPAND initMethod(diagramElement) FOR modelElementInitializer-»
-«ENDDEFINE»
-
-«DEFINE initMethod(diagramElement : gmfgen::GenCommonBase) FOR gmfgen::GenElementInitializer»«ERROR 'No idea how to init using ' + self.repr()»«ENDDEFINE»
-
-«DEFINE initMethod(diagramElement : gmfgen::GenCommonBase) FOR gmfgen::GenFeatureSeqInitializer-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void init_«diagramElement.getUniqueIdentifier()»(«EXPAND MetaModel::QualifiedClassName FOR elementClass» instance) {
-		try {
-			«FOREACH initializers AS i»«EXPAND performInit(diagramElement, 'instance', elementClass, getSuffixes((initializers->indexOf(i) - 1))) FOR i»«ENDFOREACH-»
-		} catch(RuntimeException e) {
-			«diagramElement.getDiagram().editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Element initialization failed", e); //$NON-NLS-1$						
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE performInit(diagramElement : gmfgen::GenCommonBase, instanceVar : String, instanceClass : genmodel::GenClass, counters : Sequence(Integer)) FOR gmfgen::GenFeatureInitializer»«ENDDEFINE»
-
-«REM»
-		FIXME: need cleaner appoach to provider's language switch (not to mix if == literal and polymorphism)
-«ENDREM»
-«DEFINE performInit(diagramElement : gmfgen::GenCommonBase, instanceVar : String, instanceClass : genmodel::GenClass, counters : Sequence(Integer)) FOR gmfgen::GenFeatureValueSpec-»
-«IF value.provider.getLanguage() = gmfgen::GenLanguage::_literal-»
-	«EXPAND MetaModel::modifyFeature(instanceVar, instanceClass, value.body) FOR feature»
-«ELSE-»
-«LET getVariableName('value', counters) AS expressionVarName-»
-	Object «expressionVarName» = «EXPAND evaluateExpr(diagramElement, self, instanceVar) FOR value.provider»;
-«IF isListType(feature)-»
-	if («expressionVarName» instanceof java.util.Collection) {
-		«EXPAND MetaModel::getFeatureValue(instanceVar, instanceClass, true) FOR feature».clear();
-«IF getTypeGenClassifier(feature).expressionResultNeedsCast()-»
-		for (java.util.Iterator it = ((java.util.Collection) «expressionVarName»).iterator(); it.hasNext(); ) {
-			Object next = «diagramElement.getDiagram().editorGen.expressionProviders.getAbstractExpressionQualifiedClassName()».performCast(it.next(), «EXPAND MetaModel::MetaClass FOR getTypeGenClassifier(feature)»);
-			«EXPAND MetaModel::getFeatureValue(instanceVar, instanceClass, true) FOR feature».add((«EXPAND MetaModel::QualifiedClassName /*XXX sorta hack, better would be MM::setFeatureValue that supports lists*/FOR getTypeGenClassifier(feature)») next);
-		}
-«ELSE-»
-		«EXPAND MetaModel::getFeatureValue(instanceVar, instanceClass, true) FOR feature».addAll(((java.util.Collection) «expressionVarName»));
-«ENDIF-»
-	} else {
-«IF getTypeGenClassifier(feature).expressionResultNeedsCast()-»
-		«expressionVarName» = «diagramElement.getDiagram().editorGen.expressionProviders.getAbstractExpressionQualifiedClassName()».performCast(«expressionVarName», «EXPAND MetaModel::MetaClass FOR getTypeGenClassifier(feature)»);
-«ENDIF-»
-		«EXPAND MetaModel::getFeatureValue(instanceVar, instanceClass, true) FOR feature».add((«EXPAND MetaModel::QualifiedClassName /*XXX sorta hack, better would be MM::setFeatureValue that supports lists*/FOR getTypeGenClassifier(feature)») «expressionVarName»);
-	}
-«ELSE-»
-«IF getTypeGenClassifier(feature).expressionResultNeedsCast()»
-	«expressionVarName» = «diagramElement.getDiagram().editorGen.expressionProviders.getAbstractExpressionQualifiedClassName()».performCast(«expressionVarName», «EXPAND MetaModel::MetaClass FOR getTypeGenClassifier(feature)»);
-«ENDIF-»
-	«EXPAND MetaModel::setFeatureValue(instanceVar, instanceClass, expressionVarName, true) FOR feature»;
-«ENDIF /*isListType*/-»
-«ENDLET-»
-«ENDIF /*is literal expression*/-»
-«ENDDEFINE»
-
-«DEFINE performInit(diagramElement : gmfgen::GenCommonBase, instanceVar : String, instanceClass : genmodel::GenClass, counters : Sequence(Integer)) FOR gmfgen::GenReferenceNewElementSpec-»
-«FOREACH newElementInitializers AS newElemInit-»
-«LET getSuffixes(counters, (newElementInitializers->indexOf(newElemInit) - 1)) AS initializerCounters-»
-«LET getVariableName('newInstance', initializerCounters) AS newInstanceVar-»
-«EXPAND MetaModel::NewInstance(newInstanceVar) FOR newElemInit.elementClass-»
-«EXPAND MetaModel::modifyFeature(instanceVar, instanceClass, newInstanceVar) FOR feature»
-«FOREACH newElemInit.initializers AS i»«EXPAND performInit(diagramElement, newInstanceVar, newElemInit.elementClass, getSuffixes(initializerCounters, (newElemInit.initializers->indexOf(i) - 1))) FOR i»«ENDFOREACH»
-«ENDLET-»
-«ENDLET-»
-«ENDFOREACH-»
-«ENDDEFINE»
-
-/////////////////////////////////
-
-«DEFINE evaluateExpr(diagramElement : gmfgen::GenCommonBase, valueExpr : gmfgen::GenFeatureValueSpec, instanceVar : String) FOR gmfgen::GenExpressionProviderBase»«ENDDEFINE»
-
-«DEFINE evaluateExpr(gmfgen::GenCommonBase diagramElement, gmfgen::GenFeatureValueSpec valueExpr, String instanceVar) FOR gmfgen::GenExpressionInterpreter-»
-«EXPAND xpt::expressions::getExpression::getExpression(valueExpr.value, valueExpr.featureSeqInitializer.elementClass)».evaluate(«instanceVar»)«-»
-«ENDDEFINE»
-
-«REM»
-	XXX revisit: if emf java merge doesn't support genereated NOT methods with modified
-	return type, there's no much sense to keep Object value = invokeJavaMethodWithSpecificReturnType,
-	as client won't benefit from such code (he can't modify return type and thus would get duplicated methods on regeneration)
-	However, if merge does ignore method return type when merging, allowing Object as return type may help. 
-«ENDREM»
-«DEFINE evaluateExpr(diagramElement : gmfgen::GenCommonBase, valueExpr : gmfgen::GenFeatureValueSpec, instanceVar : String) FOR gmfgen::GenJavaExpressionProvider-»
-«javaMethodName(diagramElement, valueExpr)»(«instanceVar»)«-»
-«ENDDEFINE»
-
-/////////////////////////////////
-
-«DEFINE javaMethod FOR gmfgen::GenNode»«EXPAND javaMethod(self) FOR modelFacet»«ENDDEFINE»
-«DEFINE javaMethod FOR gmfgen::GenLink»«EXPAND javaMethod(self) FOR modelFacet»«ENDDEFINE»
-«DEFINE javaMethod(diagramElement : gmfgen::GenCommonBase) FOR gmfgen::ModelFacet»«ENDDEFINE»
-«DEFINE javaMethod(diagramElement : gmfgen::GenCommonBase) FOR gmfgen::TypeModelFacet-»
-«EXPAND javaMethod(diagramElement) FOR modelElementInitializer-»
-«ENDDEFINE»
-
-«DEFINE javaMethod(diagramElement : gmfgen::GenCommonBase) FOR gmfgen::GenElementInitializer»«ERROR 'No idea how to handle ' + self.repr()»«ENDDEFINE»
-«DEFINE javaMethod(diagramElement : gmfgen::GenCommonBase) FOR gmfgen::GenFeatureSeqInitializer-»
-«FOREACH recurseCollectValueSpec(self) AS vs»«EXPAND javaMethod(diagramElement, vs) FOR vs.value.provider»«ENDFOREACH-»
-«ENDDEFINE»
-
-«DEFINE javaMethod(diagramElement : gmfgen::GenCommonBase, vs : gmfgen::GenFeatureValueSpec) FOR gmfgen::GenExpressionProviderBase-»«ENDDEFINE»
-«DEFINE javaMethod(diagramElement : gmfgen::GenCommonBase, vs : gmfgen::GenFeatureValueSpec) FOR gmfgen::GenJavaExpressionProvider-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private «EXPAND MetaModel::featureTargetType FOR vs.feature» «javaMethodName(diagramElement, vs)»(«EXPAND MetaModel::QualifiedClassName FOR vs.featureSeqInitializer.elementClass» self) {
-«IF injectExpressionBody and (vs.value.body <> null and vs.value.body.size() <> 0)-»
-		«vs.value.body»
-«ELSEIF throwException or (injectExpressionBody and (vs.value.body = null or vs.value.body.size() = 0))-»
-		// TODO: implement this method to return value  
-		// for «EXPAND MetaModel::MetaFeature FOR vs.feature»
-		// Ensure that you remove @generated or mark it @generated NOT
-		throw new java.lang.UnsupportedOperationException("No user java implementation provided in '«javaMethodName(diagramElement, vs)»' operation");«EXPAND xpt::Common::nonNLS»
-«ELSE-»
-		return null;
-«ENDIF-»	
-	}
-«ENDDEFINE»
-
-// GenLink or GenNode
-«DEFINE initMethodCall(gmfgen::TypeModelFacet modelFacet, String newElementVar) FOR gmfgen::GenCommonBase-»
-«IF modelFacet.modelElementInitializer <> null -»
-«getDiagram().getElementInitializersPackageName()».«getDiagram().getElementInitializersClassName()».getInstance().init_«getUniqueIdentifier()»(«newElementVar»);
-«ENDIF-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementTypes.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementTypes.xpt
deleted file mode 100644
index f446dc325fa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ElementTypes.xpt
+++ /dev/null
@@ -1,225 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-«EXTENSION xpt::diagram::Utils»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«providersPackageName».«elementTypesClassName»«ENDDEFINE»
-
-«DEFINE ElementTypes FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «elementTypesClassName» {
-
-	«EXPAND _constructor-»
-	
-	«EXPAND attributes-»
-	
-	«EXPAND elementTypeField FOREACH getAllTypedElements()-»
-	
-	«EXPAND getNamedElementImageDescriptor-»
-
-	«EXPAND getNamedElementImage-»
-
-	«EXPAND getAdaptableImageDescriptor-»
-
-	«EXPAND getAdaptableImage-»
-
-	«EXPAND getElement-»
-
-	«EXPAND getElementType-»
-
-	«EXPAND isKnownElementType-»
-	
-	«EXPAND getElementTypeByVisualID-»
-	
-	«EXPAND typedInstance-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private «elementTypesClassName»() {
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private static «EXPAND CodeStyle::G2('java.util.Map', 'org.eclipse.gmf.runtime.emf.type.core.IElementType', 'org.eclipse.emf.ecore.ENamedElement')» elements;
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private static org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypeImages elementTypeImages = new org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypeImages(«-»
-	«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getItemProvidersAdapterFactory());
-
-	«EXPAND xpt::Common::generatedMemberComment»
-private static «EXPAND CodeStyle::G('java.util.Set', 'org.eclipse.gmf.runtime.emf.type.core.IElementType')» KNOWN_ELEMENT_TYPES;
-«ENDDEFINE»
-
-
-«REM»
-	Since 3.1, GMFT delegates ImageRegistry-related code to non-generated DiagramElementTypeImages, so methods below are not generated anymore.  
-	If you still need one, you always can get it from 'elementTypeImages.getXXX()' call. 
-	The only exception is 'DEFINE loadProvidedImageDescriptor FOR gmfgen::GenDiagram', which is not compatible with the delegation and removed completely.
-
-«DEFINE getImageRegistry FOR gmfgen::GenDiagram»«ENDDEFINE»
-«DEFINE getImageRegistryKey FOR gmfgen::GenDiagram»«ENDDEFINE»
-«DEFINE getProvidedImageDescriptor FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«ENDREM»
-«DEFINE getNamedElementImageDescriptor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static org.eclipse.jface.resource.ImageDescriptor getImageDescriptor(org.eclipse.emf.ecore.ENamedElement element) {
-	return elementTypeImages.getImageDescriptor(element);
-}
-«ENDDEFINE»
-
-«DEFINE getNamedElementImage FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static org.eclipse.swt.graphics.Image getImage(org.eclipse.emf.ecore.ENamedElement element) {
-	return elementTypeImages.getImage(element);
-}
-«ENDDEFINE»
-
-«DEFINE getAdaptableImageDescriptor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static org.eclipse.jface.resource.ImageDescriptor getImageDescriptor(org.eclipse.core.runtime.IAdaptable hint) {
-	return getImageDescriptor(getElement(hint));
-}
-«ENDDEFINE»
-
-«DEFINE getAdaptableImage FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static org.eclipse.swt.graphics.Image getImage(org.eclipse.core.runtime.IAdaptable hint) {
-	return getImage(getElement(hint));
-}
-«ENDDEFINE»
-
-«DEFINE getElement FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment('Returns \'type\' of the ecore object associated with the hint.\n')»
-public static org.eclipse.emf.ecore.ENamedElement getElement(org.eclipse.core.runtime.IAdaptable hint) {
-	Object type = hint.getAdapter(org.eclipse.gmf.runtime.emf.type.core.IElementType.class);
-	if (elements == null) {
-		elements = new «EXPAND CodeStyle::G2('java.util.IdentityHashMap', 'org.eclipse.gmf.runtime.emf.type.core.IElementType', 'org.eclipse.emf.ecore.ENamedElement')»();
-		«EXPAND bindUniqueIdentifierToNamedElement(getUniqueIdentifier()) FOR domainDiagramElement-»
-		«FOREACH getAllNodes() AS node-»
-			«EXPAND bindUniqueIdentifierToNamedElement(node.getUniqueIdentifier()) FOR node.modelFacet-»
-		«ENDFOREACH-»
-		«FOREACH links->asSequence() AS link-»
-			«EXPAND bindUniqueIdentifierToNamedElement(link.getUniqueIdentifier()) FOR link.modelFacet-»
-		«ENDFOREACH-»
-	}
-	return (org.eclipse.emf.ecore.ENamedElement) elements.get(type);
-}
-«ENDDEFINE»
-
-«DEFINE bindUniqueIdentifierToNamedElement(id : String) FOR genmodel::GenClass»
-	elements.put(«id», «EXPAND MetaModel::MetaClass»);
-«ENDDEFINE»
-
-«DEFINE bindUniqueIdentifierToNamedElement(id : String) FOR gmfgen::ModelFacet»
-	«ERROR 'Unsupported model facet: ' + self.repr()-»
-«ENDDEFINE»
-
-«DEFINE bindUniqueIdentifierToNamedElement(id : String) FOR gmfgen::TypeModelFacet»
-	«EXPAND bindUniqueIdentifierToNamedElement(id) FOR metaClass-»
-«ENDDEFINE»
-
-«DEFINE bindUniqueIdentifierToNamedElement(id : String) FOR gmfgen::FeatureLinkModelFacet»
-	elements.put(«id», «EXPAND MetaModel::MetaFeature FOR metaFeature»);
-«ENDDEFINE»
-
-«DEFINE elementTypeField FOR gmfgen::GenCommonBase-»
-	«IF null <> elementType-»
-		«EXPAND xpt::Common::generatedMemberComment»
-public static final org.eclipse.gmf.runtime.emf.type.core.IElementType «getUniqueIdentifier()» = getElementType("«elementType.uniqueIdentifier»"); «EXPAND xpt::Common::nonNLS»
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE accessElementType FOR gmfgen::GenCommonBase»«getDiagram().getElementTypesQualifiedClassName()».«getUniqueIdentifier()»«ENDDEFINE»
-
-«DEFINE getElementType FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-private static org.eclipse.gmf.runtime.emf.type.core.IElementType getElementType(String id) {
-	return org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry.getInstance().getType(id);
-}
-«ENDDEFINE»
-
-«DEFINE isKnownElementType FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static boolean isKnownElementType(org.eclipse.gmf.runtime.emf.type.core.IElementType elementType) {
-	if (KNOWN_ELEMENT_TYPES == null) {
-		KNOWN_ELEMENT_TYPES = new «EXPAND CodeStyle::G('java.util.HashSet', 'org.eclipse.gmf.runtime.emf.type.core.IElementType')»();
-		«EXPAND addKnownElementType FOREACH getAllTypedElements()-»
-	}
-	return KNOWN_ELEMENT_TYPES.contains(elementType);
-}
-«ENDDEFINE»
-
-«DEFINE addKnownElementType FOR gmfgen::GenCommonBase-»
-	«IF null <> elementType-»
-KNOWN_ELEMENT_TYPES.add(«getUniqueIdentifier()»);
-	«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE getElementTypeByVisualID FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static org.eclipse.gmf.runtime.emf.type.core.IElementType getElementType(int visualID) {
-		switch (visualID) {
-			«EXPAND caseElementType FOREACH getAllTypedElements()->select(el | el.elementType <> null)-»
-		}
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE caseElementType FOR gmfgen::GenCommonBase-»
-	«EXPAND xpt::Common::caseVisualID-»
-		return «getUniqueIdentifier()»;
-«ENDDEFINE»
-
-«DEFINE typedInstanceName FOR gmfgen::GenDiagram»TYPED_INSTANCE«ENDDEFINE»
-«DEFINE typedInstanceCall FOR gmfgen::GenDiagram»«EXPAND qualifiedClassName».«EXPAND typedInstanceName»«ENDDEFINE»
-
-«DEFINE typedInstance FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedClassComment»
-	public static final org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypes TYPED_INSTANCE 
-		= new org.eclipse.gmf.tooling.runtime.providers.DiagramElementTypes(elementTypeImages) {
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::override»
-		public boolean isKnownElementType(org.eclipse.gmf.runtime.emf.type.core.IElementType elementType) {
-			return «EXPAND qualifiedClassName».isKnownElementType(elementType);
-		}
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::override»
-		public org.eclipse.gmf.runtime.emf.type.core.IElementType getElementTypeForVisualId(int visualID) {
-			return «EXPAND qualifiedClassName».getElementType(visualID);
-		}
-		
-		«EXPAND xpt::Common::generatedMemberComment»
-		«EXPAND CodeStyle::override»
-		public org.eclipse.emf.ecore.ENamedElement getDefiningNamedElement(org.eclipse.core.runtime.IAdaptable elementTypeAdapter) {
-			return «EXPAND qualifiedClassName».getElement(elementTypeAdapter);
-		}
-	}; 
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/IconProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/IconProvider.xpt
deleted file mode 100644
index 9f4134a9b2e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/IconProvider.xpt
+++ /dev/null
@@ -1,42 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Michael Golubev (Montages) - [407332] common API for XXXElementTypes extracted to GMFT-runtime
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE IconProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «iconProviderClassName» extends «EXPAND extendsList» implements «EXPAND implementsList» {
-
-	«EXPAND _constructor-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenDiagram»org.eclipse.gmf.tooling.runtime.providers.DefaultElementTypeIconProvider«ENDDEFINE»
-«DEFINE implementsList FOR gmfgen::GenDiagram»org.eclipse.gmf.runtime.common.ui.services.icon.IIconProvider«ENDDEFINE»
-
-«DEFINE _constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public «iconProviderClassName»() {
-		super(«EXPAND xpt::providers::ElementTypes::typedInstanceCall»);
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt
deleted file mode 100644
index 8c906fc1c26..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MarkerNavigationProvider.xpt
+++ /dev/null
@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE MarkerNavigationProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «markerNavigationProviderClassName»
-		extends org.eclipse.gmf.runtime.emf.ui.providers.marker.AbstractModelMarkerNavigationProvider {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static final String MARKER_TYPE =
-		«editorGen.plugin.getActivatorQualifiedClassName()».ID + ".«getValidationDiagnosticMarkerType()»"; «EXPAND xpt::Common::nonNLS»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected void doGotoMarker(org.eclipse.core.resources.IMarker marker) {
-		String elementId = marker.getAttribute(org.eclipse.gmf.runtime.common.core.resources.IMarker.ELEMENT_ID, null);
-		if (elementId == null || !(getEditor() instanceof org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor)) {
-			return;
-		}
-		org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor editor =
-				(org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor) getEditor();
-		java.util.Map editPartRegistry = editor.getDiagramGraphicalViewer().getEditPartRegistry();
-		org.eclipse.emf.ecore.EObject targetView = editor.getDiagram().eResource().getEObject(elementId);
-		if (targetView == null) {
-			return;
-		}
-		org.eclipse.gef.EditPart targetEditPart = (org.eclipse.gef.EditPart) editPartRegistry.get(targetView);
-		if (targetEditPart != null) {
-			«getDiagramEditorUtilQualifiedClassName()».selectElementsInDiagram(
-					editor, java.util.Arrays.asList(new org.eclipse.gef.EditPart[] { targetEditPart }));
-		}
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void deleteMarkers(org.eclipse.core.resources.IResource resource) {
-		try {
-			resource.deleteMarkers(MARKER_TYPE, true, org.eclipse.core.resources.IResource.DEPTH_ZERO);
-		} catch (org.eclipse.core.runtime.CoreException e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-					"Failed to delete validation markers", e); «EXPAND xpt::Common::nonNLS»
-		}
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static org.eclipse.core.resources.IMarker addMarker(org.eclipse.core.resources.IFile file,
-			String elementId, String location, String message, int statusSeverity) {
-		org.eclipse.core.resources.IMarker marker = null;
-		try {
-			marker = file.createMarker(MARKER_TYPE);
-			marker.setAttribute(org.eclipse.core.resources.IMarker.MESSAGE, message);
-			marker.setAttribute(org.eclipse.core.resources.IMarker.LOCATION, location);
-			marker.setAttribute(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID, elementId);
-			int markerSeverity = org.eclipse.core.resources.IMarker.SEVERITY_INFO;
-			if (statusSeverity == org.eclipse.core.runtime.IStatus.WARNING) {
-				markerSeverity = org.eclipse.core.resources.IMarker.SEVERITY_WARNING;    						
-			} else if (statusSeverity == org.eclipse.core.runtime.IStatus.ERROR ||
-					statusSeverity == org.eclipse.core.runtime.IStatus.CANCEL) {
-				markerSeverity = org.eclipse.core.resources.IMarker.SEVERITY_ERROR;
-			}
-			marker.setAttribute(org.eclipse.core.resources.IMarker.SEVERITY, markerSeverity);
-		} catch (org.eclipse.core.runtime.CoreException e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-					"Failed to create validation marker", e); «EXPAND xpt::Common::nonNLS»
-		}
-		return marker;		
-	}	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MetricProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MetricProvider.xpt
deleted file mode 100644
index 09a0792b4cd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MetricProvider.xpt
+++ /dev/null
@@ -1,417 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - refactoring (https://bugs.eclipse.org/230014)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«IMPORT 'http://www.eclipse.org/emf/2002/GenModel'»
-
-«EXTENSION xpt::providers::Metrics»
-«EXTENSION gmf::CodeGenerationUtils»
-
-«DEFINE MetricProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «metricProviderClassName» {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static class MetricsAction extends org.eclipse.jface.action.Action {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.ui.IWorkbenchPage page;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public MetricsAction(org.eclipse.ui.IWorkbenchPage page) {
-			setText("Metrics");
-			this.page = page;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void run() {
-			org.eclipse.ui.IWorkbenchPart workbenchPart = page.getActivePart();
-			org.eclipse.ui.IViewPart metricsView = null;
-			try {
-				metricsView = page.findView(«EXPAND resultViewID»);
-				if (metricsView == null) {
-					metricsView = page.showView(«EXPAND resultViewID»);
-				} else {
-					if (metricsView != null && workbenchPart instanceof org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart) {
-						final org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart part = (org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart) workbenchPart;
-						((ResultView) metricsView).setInput(part);
-					}
-					page.activate(metricsView);
-				}
-			} catch (org.eclipse.ui.PartInitException e) {
-				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Diagram metric view failure", e);«EXPAND xpt::Common::nonNLS»
-			}
-		}
-	}
-
-«EXPAND calculateMetricsMethods-»
-
-«EXPAND formatNotationElementNameMethod-»
-«EXPAND formatSemanticElementNameMethod-»
-
-«EXPAND metricsClasses»
-
-«EXPAND keysAndToolTipsMethods FOR editorGen.metrics»
-
-«EXPAND metricCalcMethod FOREACH editorGen.metrics.metrics->select(m | m.rule <> null and (m.target <> null and m.target.getContext() <> null))»
-
-«EXPAND MetricsResultView::Class»
-
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE resultViewQualifiedClassName FOR gmfgen::GenDiagram»«providersPackageName».«metricProviderClassName».«EXPAND MetricsResultView::className»«ENDDEFINE» 
-«DEFINE resultViewID FOR gmfgen::GenDiagram»«EXPAND resultViewQualifiedClassName».VIEW_ID«ENDDEFINE» 
-
-
-//////////////////////////////////////////////////////////////////////////
-
-«DEFINE calculateMetricsMethods FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	static java.util.List calculateMetrics(org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart diagramPart) {
-		final org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramEditPart = diagramPart.getDiagramEditPart();
-		try {
-			return (java.util.List) diagramPart.getDiagramEditPart().getEditingDomain().runExclusive(
-				new org.eclipse.emf.transaction.RunnableWithResult.Impl() {
-
-					public void run() {
-						org.eclipse.gmf.runtime.notation.Diagram diagram = diagramEditPart.getDiagramView();
-						«EXPAND CodeStyle::newGenericInstance('metrics', 'java.util.ArrayList', 'ElementMetrics')»(50);
-«IF getNotationMetrics(editorGen.metrics)->notEmpty()-»
-						calculateNotationElementMetrics(diagram, metrics);
-«ENDIF-»
-«IF getDiagramMetrics(editorGen.metrics)->notEmpty()-»
-						calculateDiagramElementMetrics(diagram, metrics);
-«ENDIF-»
-«IF getDomainMetrics(editorGen.metrics)->notEmpty()-»
-						calculateSemanticElementMetrics(diagramEditPart, metrics);
-«ENDIF-»
-						setResult(metrics);
-					}
-				});
-		} catch (InterruptedException e) {
-			return java.util.Collections.EMPTY_LIST;
-		}
-	}
-
-«IF getNotationMetrics(editorGen.metrics)->notEmpty()»«EXPAND calcNotationMetricsMethod FOR editorGen»«ENDIF»
-«IF getDiagramMetrics(editorGen.metrics)->notEmpty()»«EXPAND calcDiagramMetricsMethod FOR editorGen»«ENDIF»
-«IF getDomainMetrics(editorGen.metrics)->notEmpty()»«EXPAND calcDomainMetricsMethod FOR editorGen»«ENDIF»
-«ENDDEFINE»
-
-
-«DEFINE metricsClasses FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static class ElementMetrics {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		final Metric[] metrics;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		final String targetElementQName;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		final org.eclipse.swt.graphics.Image elementImage;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		String diagramElementID; «REM»FIXME add specific constructor for View elements, set diagramElementID from there«ENDREM»
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		ElementMetrics(org.eclipse.emf.ecore.EObject target, String name, Metric[] metrics) {
-			«EXPAND xpt::Common::_assert('metrics.length > 0')-»
-			«EXPAND xpt::Common::_assert('name != null')-»
-			this.metrics = metrics;	
-			this.targetElementQName = name;
-			org.eclipse.emf.ecore.EClass imageTarget = target.eClass();
-			if (target instanceof org.eclipse.gmf.runtime.notation.View) {
-				org.eclipse.gmf.runtime.notation.View viewTarget = (org.eclipse.gmf.runtime.notation.View) target;
-				if ("".equals(viewTarget.getType()) && viewTarget.getElement() != null) {«EXPAND xpt::Common::nonNLS»
-					imageTarget = viewTarget.getElement().eClass();
-				}
-			}
-			this.elementImage = «EXPAND getImageAccessor('imageTarget')»;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		Metric getMetricByKey(String key) {
-			for (int i = 0; i < metrics.length; i++) {
-				if (metrics[i].key.equals(key)) {
-					return metrics[i]; 
-				}
-			}
-			return null;
-		}
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static class Metric implements Comparable {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		final String key;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		final Double value;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		final Double lowLimit;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		final Double highLimit;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		final String displayValue;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		Metric(String key, Double value) {
-			this(key, value, null, null);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		Metric(String key, Double value, Double low, Double high) {
-			«EXPAND xpt::Common::_assert('key != null')-»
-			this.key = key;
-			this.value = value;
-			this.lowLimit = low;
-			this.highLimit = high;
-			this.displayValue = (value != null) ? java.text.NumberFormat.getInstance().format(value) : "null"; //$NON-NLS-1$
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public int compareTo(Object other) {
-			Metric otherMetric = (Metric) other;
-			if (value != null && otherMetric.value != null) {
-				return (value.longValue() < otherMetric.value.longValue()) ? -1
-						: (value.longValue() == otherMetric.value.longValue() ? 0 : 1);
-			}
-			return (value == null && otherMetric.value == null) ? 0
-					: (value == null) ? -1 : 1;
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE getImageAccessor(imageClassVar : String) FOR gmfgen::GenDiagram»«getElementTypesQualifiedClassName()».getImage(«imageClassVar»)«ENDDEFINE»
-
-«DEFINE calcNotationMetricsMethod FOR gmfgen::GenEditorGenerator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	static void calculateNotationElementMetrics(org.eclipse.gmf.runtime.notation.Diagram diagram, «EXPAND CodeStyle::G('java.util.List', 'ElementMetrics') FOR diagram» metricsList) {
-		ElementMetrics row = null;
-«LET getNotationMetrics(metrics)->select(m | m.target.oclAsType(gmfgen::GenNotationElementTarget).element.ecoreClass.name = 'Diagram') AS diagramMetrics-»
-«IF diagramMetrics->notEmpty()-»
-		row = new ElementMetrics(diagram, formatViewName(diagram), new Metric[] {
-«EXPAND metricResult('diagram', false) FOREACH diagramMetrics SEPARATOR ',\n'»
-		});
-		row.diagramElementID = diagram.eResource().getURIFragment(diagram);
-		metricsList.add(row);
-«ENDIF-»
-«ENDLET-»
-«LET getNotationMetrics(metrics)->collect(m | m.target.oclAsType(gmfgen::GenNotationElementTarget).element)->asOrderedSet() AS notationTargets»
-		for (java.util.Iterator it = diagram.eAllContents(); it.hasNext(); ) {
-			Object next = it.next();
-«FOREACH notationTargets[genmodel::GenClass] AS nt-»
-			if («EXPAND MetaModel::IsInstance('next') FOR nt») {
-				«EXPAND MetaModel::DeclareAndAssign('_' + nt.ecoreClass.name.toLower(), 'next', true) FOR nt»
-				row = new ElementMetrics(«'_' + nt.ecoreClass.name.toLower()», formatViewName(«'_' + nt.ecoreClass.name.toLower()»), new Metric[] {«-»
-				«FOREACH getNotationMetrics(metrics)->select(m | m.target.oclAsType(gmfgen::GenNotationElementTarget).element = nt) AS m SEPARATOR ','»
-					«EXPAND metricResult('_' + nt.ecoreClass.name.toLower(), false) FOR m-»
-				«ENDFOREACH»
-				});
-				row.diagramElementID = «'_' + nt.ecoreClass.name.toLower()».eResource().getURIFragment(«'_' + nt.ecoreClass.name.toLower()»);
-				metricsList.add(row);
-			}
-«ENDFOREACH-»
-		}
-«ENDLET-»
-	}
-«ENDDEFINE»
-
-«DEFINE calcDiagramMetricsMethod FOR gmfgen::GenEditorGenerator-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	static void calculateDiagramElementMetrics(org.eclipse.gmf.runtime.notation.Diagram diagram, «EXPAND CodeStyle::G('java.util.List', 'ElementMetrics') FOR diagram» metricsList) {
-		org.eclipse.emf.ecore.EObject next = diagram;
-		java.util.Iterator/*<EObject>*/ it = diagram.eAllContents();
-		do {
-			if (next instanceof org.eclipse.gmf.runtime.notation.View) {
-				org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) next;
-				final int vid = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR diagram»(view);
-				java.util.ArrayList/*<Metric>*/ res = new java.util.ArrayList/*<Metric>*/(5);
-				switch (vid) {
-«FOREACH (getDiagramMetrics(metrics)->collect(m | m.target.oclAsType(gmfgen::GenDiagramElementTarget).element)->flatten()->asOrderedSet())[gmfgen::GenCommonBase]->asSequence() AS cb-»
-					case «EXPAND xpt::editor::VisualIDRegistry::visualID FOR cb» : {«-»
-«FOREACH getDiagramMetrics(metrics)->select(m | m.target.oclAsType(gmfgen::GenDiagramElementTarget).element->includes(cb)) AS m»
-						res.add(«EXPAND metricResult('view', true) FOR m»);
-«ENDFOREACH-»
-						break;
-					}
-«ENDFOREACH-»
-				}
-				if (!res.isEmpty()) {
-					ElementMetrics row = new ElementMetrics(view, formatViewName(view), (Metric[]) res.toArray(new Metric[res.size()]));
-					row.diagramElementID = view.eResource().getURIFragment(view);
-					metricsList.add(row);
-				}
-			}
-			next = it.hasNext() ? (org.eclipse.emf.ecore.EObject) it.next() : null;
-		} while (next != null);
-	}
-«ENDDEFINE»
-
-/*
- * FIXME:
- * 		for now, keep approach from old implementation, i.e. iterate content
- *		of element associated with diagram. Smarter approach would be
- *		iteration over diagram elements, then accessing their respective
- *		semantic elements (if set), and collecting metrics for them.  
- */
-«DEFINE calcDomainMetricsMethod FOR gmfgen::GenEditorGenerator»
-	«EXPAND xpt::Common::generatedMemberComment('NOTE: metrics are being collected for domain elements contained in the semantic element associated with diagram view, actual diagram content (elements present there) is not taken into account.')»
-	static void calculateSemanticElementMetrics(org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart diagramEditPart, «EXPAND CodeStyle::G('java.util.List', 'ElementMetrics') FOR diagram» metricsList) {
-		org.eclipse.gmf.runtime.notation.Diagram diagram = diagramEditPart.getDiagramView();
-		org.eclipse.emf.ecore.EObject next = diagram.getElement();
-		java.util.Iterator/*<EObject>*/ it = next != null ? next.eAllContents() : java.util.Collections.EMPTY_LIST.iterator();
-		«EXPAND CodeStyle::newGenericInstance2('target2row', 'java.util.HashMap', 'org.eclipse.emf.ecore.EObject', 'ElementMetrics') FOR diagram»();
-		while (next != null) {
-			«EXPAND CodeStyle::newGenericInstance('res', 'java.util.ArrayList','Metric') FOR diagram»(5);
-«FOREACH metrics.metrics.target[gmfgen::GenDomainElementTarget].element[genmodel::GenClass] AS e-»
-			if («EXPAND MetaModel::MetaClass FOR e».isInstance(next)) {
-«FOREACH metrics.metrics->select(m | m.target.getContext() = e) AS m-»
-				res.add(«EXPAND metricResult('next', true) FOR m»);
-«ENDFOREACH-»
-			}
-«ENDFOREACH-»
-			if (!res.isEmpty()) {
-				ElementMetrics row = new ElementMetrics(next, formatElementName(next), (Metric[]) res.toArray(new Metric[res.size()]));
-				metricsList.add(row);
-				target2row.put(next, row);
-			}
-			next = it.hasNext() ? (org.eclipse.emf.ecore.EObject) it.next() : null;
-		}
-		if (!target2row.isEmpty()) { // list was modified, need to process only semantic metrics
-			// bind semantic elements to notation
-			«diagram.getDiagramEditorUtilQualifiedClassName()».LazyElement2ViewMap element2ViewMap = new «diagram.getDiagramEditorUtilQualifiedClassName()».LazyElement2ViewMap(diagram, target2row.keySet());
-			for (java.util.Iterator it2 = target2row.entrySet().iterator(); it2.hasNext();) {
-				java.util.Map.Entry entry = (java.util.Map.Entry) it2.next();
-				org.eclipse.emf.ecore.EObject semanticElement = (org.eclipse.emf.ecore.EObject) entry.getKey();
-				org.eclipse.gmf.runtime.notation.View targetView = «diagram.getDiagramEditorUtilQualifiedClassName()».findView(diagramEditPart, semanticElement, element2ViewMap);
-				ElementMetrics elementMetrics = (ElementMetrics) entry.getValue();
-				elementMetrics.diagramElementID = targetView.eResource().getURIFragment(targetView);
-			}
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE formatNotationElementNameMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static String formatViewName(org.eclipse.gmf.runtime.notation.View viewTarget) {
-		StringBuffer notationQNameBuf = new StringBuffer();
-		notationQNameBuf.append(formatElementName(viewTarget));
-		if (viewTarget.getElement() != null) {
-			notationQNameBuf.append("->").append(formatElementName(viewTarget.getElement()));	«EXPAND xpt::Common::nonNLS»
-		}
-		int visualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(viewTarget);
-		notationQNameBuf.append('[').append(visualID < 0 ? Integer.toString(System.identityHashCode(viewTarget)) : Integer.toString(visualID)).append(']');
-		return notationQNameBuf.toString();
-	}
-«ENDDEFINE»
-
-«DEFINE formatSemanticElementNameMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static String formatElementName(org.eclipse.emf.ecore.EObject object) {
-		return org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil.getQualifiedName(object, true);
-	}
-«ENDDEFINE»
-
-«DEFINE metricCalcMethod FOR gmfgen::GenMetricRule»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static«REM»FIXME: (1) refactor to get rid of statics (2) 'public' only those referenced from audits«ENDREM» Double «calcMethodName(self)»(«EXPAND calcMethodArgs(self) FOR target») {
-		«EXPAND calcMethodBody(self) FOR rule.provider-»
-	}
-«ENDDEFINE»
-
-«DEFINE calcMethodArgs(metric : gmfgen::GenMetricRule) FOR gmfgen::GenMeasurable»«ERROR 'Unrecognized metric target: ' + self.repr()»«ENDDEFINE»
-
-«DEFINE calcMethodArgs(metric : gmfgen::GenMetricRule) FOR gmfgen::GenDomainElementTarget»«EXPAND MetaModel::QualifiedClassName FOR element» target«ENDDEFINE»
-
-«REM»
-	We do check all elements to be of specific kind to provide most narrow type cast
-	However, GenDiagramElementTargetImpl#getContext uses first element's notation class only
-«ENDREM»
-«DEFINE calcMethodArgs(metric : gmfgen::GenMetricRule) FOR gmfgen::GenDiagramElementTarget-»
-«IF (element)[gmfgen::GenNode]->size() = element->size()»org.eclipse.gmf.runtime.notation.Node«-»
-«ELSEIF (element)[gmfgen::GenLink]->size() = element->size()»org.eclipse.gmf.runtime.notation.Edge«-»
-«ELSEIF (element)[gmfgen::GenDiagram]->size() = element->size()»org.eclipse.gmf.runtime.notation.Diagram«-»
-«ELSE»org.eclipse.gmf.runtime.notation.View«ENDIF» target«ENDDEFINE»
-
-«REM»Note, use of QualifiedClassName here assumes it always works the same for the notation model, regardless of 'dynamic model' use (i.e. always gives qName of oeg.runtime.notation.* Java class)«ENDREM»
-«DEFINE calcMethodArgs(metric : gmfgen::GenMetricRule) FOR gmfgen::GenNotationElementTarget»«EXPAND MetaModel::QualifiedClassName FOR element» target«ENDDEFINE»
-
-«DEFINE calcMethodBody(metric : gmfgen::GenMetricRule) FOR gmfgen::GenExpressionProviderBase»«ERROR 'No idea how to calculate metric\'s value for ' + self.repr()»«ENDDEFINE»
-
-«DEFINE calcMethodBody(metric : gmfgen::GenMetricRule) FOR gmfgen::GenExpressionInterpreter-»
-	Object val = «EXPAND xpt::expressions::getExpression::getExpression(metric.rule, metric.target.getContext())».evaluate(target);
-	if (val instanceof Number) {
-		return val.getClass() == Double.class ? (Double) val : new Double(((Number) val).doubleValue());
-	}
-	return null;
-«ENDDEFINE»
-
-«DEFINE calcMethodBody(metric : gmfgen::GenMetricRule) FOR gmfgen::GenJavaExpressionProvider-»
-«IF injectExpressionBody and (metric.rule.body <> null and metric.rule.body.size() <> 0)-»
-	«metric.rule.body»
-«ELSEIF throwException or (injectExpressionBody and (metric.rule.body = null or metric.rule.body.size() = 0))-»
-	// TODO: implement this method
-	// Ensure that you remove @generated or mark it @generated NOT
-	throw new java.lang.UnsupportedOperationException("No user java implementation provided");«EXPAND xpt::Common::nonNLS»
-«ELSE-»
-	return new Double(Double.NaN);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE invokeCalcMethod(accessor : String, isSpecific : Boolean) FOR gmfgen::GenMetricRule»
-«container.editorGen.diagram.getMetricProviderQualifiedClassName()».«calcMethodName(self)»(«IF not isSpecific /*CastEObject would be better, however need GenClassifier*/»(«EXPAND MetaModel::QualifiedClassName FOR target.getContext()») «ENDIF»«accessor»)«ENDDEFINE»
-
-
-/*
- * Next two methods should return arrays of identical length, hence are placed into a single template
- */
-«DEFINE keysAndToolTipsMethods FOR gmfgen::GenMetricContainer»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static String[] getMetricKeys() {
-		return new String[] {
-			«FOREACH metrics->asSequence() AS m SEPARATOR ',\n'»«toStringLiteral(m.key)»«ENDFOREACH»
-		};
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static String[] getMetricToolTips() {
-		return new String[] {
-			«FOREACH metrics->asSequence() AS m SEPARATOR ',\n'-»
-«toStringLiteral((if m.name = null then m.key else m.name endif))»«IF m.description <> null» + '\n' + «toStringLiteral(m.description)» + '\n'«ENDIF»«IF null <> m.lowLimit» + «toStringLiteral('low: ' + m.lowLimit.repr())»«ENDIF»«IF null <> m.highLimit» + «toStringLiteral('high: ' + m.highLimit.repr())»«ENDIF-»
-			«ENDFOREACH»
-		};
-	} 
-«ENDDEFINE»
-
-«DEFINE metricResult(targetAccessor : String, isJustEObject : Boolean) FOR gmfgen::GenMetricRule-»
-new Metric(«toStringLiteral(key)», «calcMethodName(self)»(«IF isJustEObject and not (Sequence { target.getContext() })[genmodel::GenClass]->isEmpty()»«EXPAND MetaModel::CastEObject(targetAccessor) FOR target.getContext().oclAsType(genmodel::GenClass)»«ELSE»«targetAccessor»«ENDIF»), «IF null = lowLimit»null«ELSE»new Double(«lowLimit»)«ENDIF», «IF null = highLimit»null«ELSE»new Double(«highLimit»)«ENDIF»)
-«ENDDEFINE»
-
-
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/Metrics.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/Metrics.qvto
deleted file mode 100644
index 39282de8600..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/Metrics.qvto
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import gmf.CodeGenerationUtils;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library Metrics;
-
--- MODIFIERS: cached
-helper getNotationMetrics(c : gmfgen::GenMetricContainer) : Sequence(gmfgen::GenMetricRule) {
-	return c.metrics->asSequence()->select(target.oclIsKindOf(gmfgen::GenNotationElementTarget))
-}
-
--- MODIFIERS: cached
-helper getDiagramMetrics(c : gmfgen::GenMetricContainer) : Sequence(gmfgen::GenMetricRule) {
-	return c.metrics->asSequence()->select(target.oclIsKindOf(gmfgen::GenDiagramElementTarget))
-}
-
--- MODIFIERS: cached
-helper getDomainMetrics(c : gmfgen::GenMetricContainer) : Sequence(gmfgen::GenMetricRule) {
-	return c.metrics->asSequence()->select(target.oclIsKindOf(gmfgen::GenDomainElementTarget))
-}
-
-helper calcMethodName(m : gmfgen::GenMetricRule) : String {
-	return 'calc' + validJavaIdentifier(m.key).firstToUpper()
-}
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt
deleted file mode 100644
index 9661d5f6c2b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/MetricsResultView.xpt
+++ /dev/null
@@ -1,279 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - refactoring (https://bugs.eclipse.org/230014)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE className FOR gmfgen::GenDiagram»ResultView«ENDDEFINE»
-
-«DEFINE Class FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static class «EXPAND className» «EXPAND supertypes» «EXPAND implements»{
-		«EXPAND xpt::Common::generatedMemberComment»
-		public static final String VIEW_ID = "«getMetricViewID()»";«EXPAND xpt::Common::nonNLS»
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private static int MAX_VISIBLE_KEY_CHAR_COUNT = 8;
-
-		«EXPAND viewerField-»
-
-		«EXPAND inputField-»
-
-		«EXPAND setInputMethod-»
-
-		«EXPAND adjustLayoutMethod-»
-
-		«EXPAND createPartControlMethod-»
-
-		«EXPAND handleOpenMethod-»
-
-		«EXPAND calcMetricMaxValueStrLenMapMethod-»
-
-		«EXPAND setFocusMethod-»
-
-		«EXPAND labelProviderClass-»
-
-		«EXPAND additions-»
-	}
-«ENDDEFINE»
-
-«DEFINE supertypes FOR gmfgen::GenDiagram»extends org.eclipse.ui.part.ViewPart«ENDDEFINE»
-«DEFINE implements FOR gmfgen::GenDiagram»implements org.eclipse.jface.viewers.IOpenListener«ENDDEFINE»
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE viewerField FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.jface.viewers.TableViewer viewer;
-«ENDDEFINE»
-
-«DEFINE inputField FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.emf.ecore.resource.Resource diagramResource;
-«ENDDEFINE»
-
-
-«DEFINE setInputMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	void setInput(org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart diagramPart) {
-		diagramResource = diagramPart.getDiagram().eResource();
-		setTitleToolTip(diagramResource.getURI().path());
-		java.util.List metrics = calculateMetrics(diagramPart);
-		adjustLayout(metrics);
-		viewer.setInput(metrics); 
-	}
-«ENDDEFINE»
-
-«DEFINE adjustLayoutMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private void adjustLayout(java.util.List metricResultList) {
-		java.util.Map maxValStrMap = calcMetricMaxValueStrLenMap(metricResultList);
-		org.eclipse.swt.widgets.Table table = viewer.getTable();
-		org.eclipse.jface.viewers.TableLayout layout = new org.eclipse.jface.viewers.TableLayout();
-		org.eclipse.swt.graphics.GC gc = new org.eclipse.swt.graphics.GC(table);
-
-		gc.setFont(org.eclipse.jface.resource.JFaceResources.getDialogFont());
-		int padding = gc.stringExtent("X").x * 2;«EXPAND xpt::Common::nonNLS»
-		for (int i = 0; i < getMetricKeys().length; i++) {
-			final String nextKey = getMetricKeys()[i];
-			String valueStr = (String) maxValStrMap.get(nextKey);
-			int minWidth = valueStr != null ? gc.stringExtent(valueStr).x + padding : 20;
-			layout.addColumnData(new org.eclipse.jface.viewers.ColumnPixelData(minWidth, true));
-		}
-		gc.dispose();
-
-		layout.addColumnData(new org.eclipse.jface.viewers.ColumnWeightData(1, 50, true));
-		viewer.getTable().setLayout(layout);
-		viewer.getTable().layout(true, true);
-	}
-«ENDDEFINE»
-
-«DEFINE createPartControlMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void createPartControl(org.eclipse.swt.widgets.Composite parent) {
-		this.viewer = new org.eclipse.jface.viewers.TableViewer(parent, org.eclipse.swt.SWT.FULL_SELECTION);
-		final org.eclipse.swt.widgets.Table table = viewer.getTable();
-		table.setHeaderVisible(true);
-		table.setLinesVisible(true);
-
-		for (int i = 0; i < getMetricKeys().length; i++) {
-			org.eclipse.swt.widgets.TableColumn column = new org.eclipse.swt.widgets.TableColumn(table, org.eclipse.swt.SWT.NONE);
-			column.setAlignment(org.eclipse.swt.SWT.RIGHT);
-			column.setMoveable(true);
-			column.setText(getMetricKeys()[i]);
-			column.setToolTipText(getMetricToolTips()[i]);
-		}
-
-		org.eclipse.swt.widgets.TableColumn objectColumn = new org.eclipse.swt.widgets.TableColumn(table, org.eclipse.swt.SWT.NONE);
-		objectColumn.setText("Element");
-		objectColumn.setToolTipText("Measurement element");
-
-		viewer.setLabelProvider(new Labels());
-		viewer.setContentProvider(new org.eclipse.jface.viewers.ArrayContentProvider());
-		viewer.addOpenListener(this);
-
-		org.eclipse.swt.events.SelectionListener headerSelListener = new org.eclipse.swt.events.SelectionListener() {
-			public void widgetSelected(org.eclipse.swt.events.SelectionEvent e) {
-				table.setSortColumn((org.eclipse.swt.widgets.TableColumn) e.getSource());  
-				table.setSortDirection((table.getSortDirection() != org.eclipse.swt.SWT.DOWN) ? org.eclipse.swt.SWT.DOWN : org.eclipse.swt.SWT.UP);
-				viewer.refresh();
-			}
-			public void widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent e) {
-			}
-		};
-		org.eclipse.swt.widgets.TableColumn[] columns = viewer.getTable().getColumns();
-		for (int i = 0; i < columns.length; i++) {
-			columns[i].addSelectionListener(headerSelListener);
-		}
-
-		viewer.setSorter(new org.eclipse.jface.viewers.ViewerSorter() {
-			public int compare(org.eclipse.jface.viewers.Viewer viewer, Object e1, Object e2) {
-				org.eclipse.swt.widgets.TableColumn c = table.getSortColumn();
-				int result = 0;
-				if (c != null) {
-					Metric mc1 = ((ElementMetrics) e1).getMetricByKey(c.getText());
-					Metric mc2 = ((ElementMetrics) e2).getMetricByKey(c.getText());
-					result = (mc1 != null && mc2 != null) ?
-						mc1.compareTo(mc2) : (mc1 == null ? -1 : 1);
-				} else {
-					result = ((ElementMetrics) e1).targetElementQName.compareTo(((ElementMetrics) e2).targetElementQName);
-				}
-				return table.getSortDirection() == org.eclipse.swt.SWT.DOWN ? result : -result;
-			}
-		});
-		«EXPAND createPartControlMethod_refreshInput FOR editorGen.editor-»
-		}
-«ENDDEFINE»
-
-«DEFINE createPartControlMethod_refreshInput FOR gmfgen::GenEditorView-»
-        org.eclipse.ui.IEditorPart editor = getSite().getPage().getActiveEditor();
-        if (editor != null && editor.getClass().equals(«editorGen.editor.getQualifiedClassName()».class)) {
-			setInput((«editorGen.editor.getQualifiedClassName()») editor);
-        }
-«ENDDEFINE»
-
-«DEFINE handleOpenMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void open(org.eclipse.jface.viewers.OpenEvent event) {
-		try {
-			org.eclipse.ui.IEditorPart editorPart = getSite().getPage().openEditor(
-				new org.eclipse.ui.part.FileEditorInput(org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(diagramResource)),
-				«editorGen.editor.getQualifiedClassName()».ID);
-			if (editorPart == null) {
-				return;
-			}
-			org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart diagramPart =
-				(org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart) editorPart.getAdapter(
-					org.eclipse.gmf.runtime.diagram.ui.parts.IDiagramWorkbenchPart.class);
-			ElementMetrics selection = (ElementMetrics) ((org.eclipse.jface.viewers.IStructuredSelection) event.getSelection()).getFirstElement();
-			String viewID = selection.diagramElementID;
-			if (viewID != null) {
-				org.eclipse.gmf.runtime.notation.View targetView = (org.eclipse.gmf.runtime.notation.View) diagramPart.getDiagram().eResource().getEObject(viewID);
-				if (targetView != null) {
-					org.eclipse.gef.EditPart targetEditPart = (org.eclipse.gef.EditPart) diagramPart.getDiagramGraphicalViewer().getEditPartRegistry().get(targetView);
-					if (targetEditPart != null) {
-						«getDiagramEditorUtilQualifiedClassName()».selectElementsInDiagram(diagramPart, java.util.Collections.singletonList(targetEditPart));
-					}
-				}
-			}
-		} catch (org.eclipse.ui.PartInitException e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Can't open diagram editor", e); //$NON-NLS-1$
-		}
-	}
-«ENDDEFINE»
-
-«DEFINE calcMetricMaxValueStrLenMapMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static java.util.Map calcMetricMaxValueStrLenMap(java.util.List allMetrics) {
-		java.util.Map metric2MaxStrLen = new java.util.HashMap();
-		for (int i = 0; i < getMetricKeys().length; i++) {
-			String nextKey = getMetricKeys()[i]; 
-			int trimPos = Math.min(nextKey.length(), MAX_VISIBLE_KEY_CHAR_COUNT);
-			metric2MaxStrLen.put(nextKey, nextKey.substring(0, trimPos));
-		}
-		for (java.util.Iterator it = allMetrics.iterator(); it.hasNext();) {
-			ElementMetrics elementMetrics = (ElementMetrics) it.next();
-			for (int i = 0; i < elementMetrics.metrics.length; i++) {
-				Metric metric = elementMetrics.metrics[i];
-				String valueStr = (String) metric2MaxStrLen.get(metric.key);
-				if (valueStr == null || metric.displayValue.length() > valueStr.length()) {
-					metric2MaxStrLen.put(metric.key, metric.displayValue);	
-				}
-			}
-		}
-		return metric2MaxStrLen;
-	}
-«ENDDEFINE»
-
-«DEFINE setFocusMethod FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void setFocus() {
-	}
-«ENDDEFINE»
-
-«DEFINE labelProviderClass FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private class Labels extends org.eclipse.jface.viewers.LabelProvider implements org.eclipse.jface.viewers.ITableLabelProvider, org.eclipse.jface.viewers.ITableColorProvider {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private boolean isElementColumn(int columnIndex) {
-			return columnIndex >= getMetricKeys().length;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.swt.graphics.Image getColumnImage(Object element, int columnIndex) {
-			return isElementColumn(columnIndex) ? ((ElementMetrics) element).elementImage : null;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public String getColumnText(Object element, int columnIndex) {
-			ElementMetrics elementMetrics = (ElementMetrics) element;
-			if (columnIndex == getMetricKeys().length) {
-				return elementMetrics.targetElementQName;
-			}
-			final String key = getMetricKeys()[columnIndex];
-			Metric metric = elementMetrics.getMetricByKey(key);
-			return (metric != null) ? metric.displayValue : "-"; //$NON-NLS-1$
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.swt.graphics.Color getBackground(Object element, int columnIndex) {
-			return null; 
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.swt.graphics.Color getForeground(Object element, int columnIndex) {
-			if (isElementColumn(columnIndex)) {
-				return null;
-			}
-			ElementMetrics columnElement = (ElementMetrics) element;
-			final String key = getMetricKeys()[columnIndex];
-			Metric metric = columnElement.getMetricByKey(key);
-			if (metric != null && metric.value != null) {
-				if (metric.highLimit != null && metric.highLimit.longValue() < metric.value.longValue()) {
-					return «EXPAND labelProvider_colorMore»;
-				} else if (metric.lowLimit != null && metric.lowLimit.longValue() > metric.value.longValue()) {
-					return «EXPAND labelProvider_colorLess»;
-				}
-			}
-			return null;
-		}
-	}		
-«ENDDEFINE»
-
-«DEFINE labelProvider_colorMore FOR gmfgen::GenDiagram»org.eclipse.draw2d.ColorConstants.red«ENDDEFINE»
-«DEFINE labelProvider_colorLess FOR gmfgen::GenDiagram»org.eclipse.draw2d.ColorConstants.blue«ENDDEFINE»
-
-
- 
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt
deleted file mode 100644
index 6c16cc299d1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ModelingAssistantProvider.xpt
+++ /dev/null
@@ -1,137 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Michael Golubev (Borland) - #244970 (GenChildLabelNode can't be link's source/target)
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::providers::i18n»
-
-«DEFINE className FOR gmfgen::GenDiagram»«modelingAssistantProviderClassName»«ENDDEFINE»
-
-«DEFINE packageName FOR gmfgen::GenDiagram»«providersPackageName»«ENDDEFINE»
-
-«DEFINE qualifiedClassName FOR gmfgen::GenDiagram»«EXPAND packageName».«EXPAND className»«ENDDEFINE»
-
-«DEFINE ModelingAssistantProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «modelingAssistantProviderClassName» «EXPAND extendsList» {
-
-	«EXPAND selectExistingElementForSource-»
-
-	«EXPAND selectExistingElementForTarget-»
-
-	«EXPAND selectExistingElement-»
-
-	«EXPAND isApplicableElement-»
-
-	«EXPAND selectElement-»
-	
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenDiagram»extends org.eclipse.gmf.runtime.emf.ui.services.modelingassistant.ModelingAssistantProvider«ENDDEFINE»
-
-«DEFINE selectExistingElementForSource FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EObject selectExistingElementForSource(
-			org.eclipse.core.runtime.IAdaptable target,
-			org.eclipse.gmf.runtime.emf.type.core.IElementType relationshipType) {
-		return selectExistingElement(target, getTypesForSource(target, relationshipType));
-	}
-«ENDDEFINE»
-
-«DEFINE selectExistingElementForTarget FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.emf.ecore.EObject selectExistingElementForTarget(
-			org.eclipse.core.runtime.IAdaptable source,
-			org.eclipse.gmf.runtime.emf.type.core.IElementType relationshipType) {
-		return selectExistingElement(source, getTypesForTarget(source, relationshipType));
-	}
-«ENDDEFINE»
-
-«DEFINE selectExistingElement FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.emf.ecore.EObject selectExistingElement(
-			org.eclipse.core.runtime.IAdaptable host, java.util.Collection types) {
-		if (types.isEmpty()) {
-			return null;
-		}
-		org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart editPart =
-				(org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart) host.getAdapter(
-						org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart.class);
-		if (editPart == null) {
-			return null;
-		}
-		org.eclipse.gmf.runtime.notation.Diagram diagram =
-				(org.eclipse.gmf.runtime.notation.Diagram) editPart.getRoot().getContents().getModel();
-		«EXPAND CodeStyle::newGenericInstance('elements', 'java.util.HashSet', 'org.eclipse.emf.ecore.EObject')»();
-		«EXPAND CodeStyle::iterate('element', 'org.eclipse.emf.ecore.EObject', 'it', 'diagram.getElement().eAllContents()')-»
-			if (isApplicableElement(element, types)) {
-				elements.add(element);
-			}
-		}
-		if (elements.isEmpty()) {
-			return null;
-		}
-		return selectElement((org.eclipse.emf.ecore.EObject[]) elements.toArray(
-				new org.eclipse.emf.ecore.EObject[elements.size()]));
-	}
-«ENDDEFINE»
-
-«DEFINE isApplicableElement FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean isApplicableElement(org.eclipse.emf.ecore.EObject element, java.util.Collection types) {
-		org.eclipse.gmf.runtime.emf.type.core.IElementType type =
-				org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry.getInstance().getElementType(element);
-		return types.contains(type);
-	}
-«ENDDEFINE»
-
-«DEFINE selectElement FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected org.eclipse.emf.ecore.EObject selectElement(org.eclipse.emf.ecore.EObject[] elements) {
-		org.eclipse.swt.widgets.Shell shell = org.eclipse.swt.widgets.Display.getCurrent().getActiveShell();
-		org.eclipse.jface.viewers.ILabelProvider labelProvider =
-			new org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider(
-				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getItemProvidersAdapterFactory());
-		org.eclipse.ui.dialogs.ElementListSelectionDialog dialog =
-				new org.eclipse.ui.dialogs.ElementListSelectionDialog(shell, labelProvider);
-		dialog.setMessage(«EXPAND xpt::Externalizer::accessorCall(messageKey(i18nKeyForModelingAssistantProvider(self))) FOR editorGen»);
-		dialog.setTitle(«EXPAND xpt::Externalizer::accessorCall(titleKey(i18nKeyForModelingAssistantProvider(self))) FOR editorGen»);
-		dialog.setMultipleSelection(false);
-		dialog.setElements(elements);
-		org.eclipse.emf.ecore.EObject selected = null;
-		if (dialog.open() == org.eclipse.jface.window.Window.OK) {
-			selected = (org.eclipse.emf.ecore.EObject) dialog.getFirstResult();
-		}
-		return selected;
-	}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»«ENDDEFINE»
-
-«DEFINE i18nValues FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Externalizer::messageEntry(titleKey(i18nKeyForModelingAssistantProvider(self)), 'Select domain model element')-»
-«EXPAND xpt::Externalizer::messageEntry(messageKey(i18nKeyForModelingAssistantProvider(self)), 'Available domain model elements:')-»
-«ENDDEFINE»
-
-«DEFINE i18nAccessors FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Externalizer::accessorField(titleKey(i18nKeyForModelingAssistantProvider(self)))-»
-	«EXPAND xpt::Externalizer::accessorField(messageKey(i18nKeyForModelingAssistantProvider(self)))-»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ParserUtils.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ParserUtils.qvto
deleted file mode 100644
index 840d0eb4b5e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ParserUtils.qvto
+++ /dev/null
@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-import xpt.StringOperations;
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library ParserUtils;
-
-helper parserFieldName(element : gmfgen::GenCommonBase) : String {
-	return element.getUniqueIdentifier().xpandToFirstLower() + 'Parser'
-}
-
-helper parserAccessorName(element : gmfgen::GenCommonBase) : String {
-	return 'get' + element.getUniqueIdentifier().firstToUpper() + 'Parser'
-}
-
-helper isPatternSpecified(pattern : String) : Boolean {
-	return (not pattern.oclIsUndefined()) and pattern.size() > 0
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt
deleted file mode 100644
index 797fc45c0c5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ShortcutsDecoratorProvider.xpt
+++ /dev/null
@@ -1,113 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE ShortcutsDecoratorProvider FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-	«EXPAND xpt::Common::generatedClassComment»
-public class «shortcutsDecoratorProviderClassName» extends org.eclipse.gmf.runtime.common.core.service.AbstractProvider implements org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider {
-
-	«EXPAND attributes-»
-	
-	«EXPAND provides-»
-	
-	«EXPAND createDecorators-»
-	
-	«EXPAND ShortcutsDecorator-»
-
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE attributes FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public static final String SHORTCUTS_DECORATOR_ID = "shortcuts"; «EXPAND xpt::Common::nonNLS»
-«ENDDEFINE»
-
-«DEFINE provides FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public boolean provides(org.eclipse.gmf.runtime.common.core.service.IOperation operation) {
-	if (!(operation instanceof org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation)) {
-		return false;
-	}
-	org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget decoratorTarget = ((org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation) operation).getDecoratorTarget();
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) decoratorTarget.getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-	return view != null && «EXPAND xpt::editor::VisualIDRegistry::modelID».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(view));
-}
-«ENDDEFINE»
-
-«DEFINE createDecorators FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void createDecorators(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget decoratorTarget) {
-	org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) decoratorTarget.getAdapter(org.eclipse.gmf.runtime.notation.View.class);
-	if (view != null) {
-		org.eclipse.emf.ecore.EAnnotation annotation = view.getEAnnotation("Shortcut"); «EXPAND xpt::Common::nonNLS»
-		if (annotation != null) {
-			decoratorTarget.installDecorator(SHORTCUTS_DECORATOR_ID, new ShortcutsDecorator(decoratorTarget));
-		}
-	}
-}
-«ENDDEFINE»
-
-«DEFINE ShortcutsDecorator FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedClassComment»
-protected class ShortcutsDecorator extends org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator {
-
-	«EXPAND SD_constructor-»
-	
-	«EXPAND SD_activate-»
-
-	«EXPAND SD_refresh-»
-
-	«EXPAND SD_additions-»
-}
-«ENDDEFINE»
-
-«DEFINE SD_constructor FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public ShortcutsDecorator(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget decoratorTarget) {
-	super(decoratorTarget);
-}
-«ENDDEFINE»
-
-«DEFINE SD_activate FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void activate() {
-	refresh();
-}
-«ENDDEFINE»
-
-«DEFINE SD_refresh FOR gmfgen::GenDiagram-»
-	«EXPAND xpt::Common::generatedMemberComment»
-public void refresh() {
-	removeDecoration();
-	org.eclipse.gef.EditPart editPart = (org.eclipse.gef.EditPart) getDecoratorTarget().getAdapter(org.eclipse.gef.EditPart.class);
-	org.eclipse.swt.graphics.Image image = «editorGen.plugin.getActivatorQualifiedClassName()».getInstance().getBundledImage("icons/shortcut.gif"); «EXPAND xpt::Common::nonNLS»
-	if (editPart instanceof org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart) {
-		setDecoration(getDecoratorTarget().addShapeDecoration(image, org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget.Direction.SOUTH_WEST, 0, false));
-	} else if (editPart instanceof org.eclipse.gmf.runtime.diagram.ui.editparts.ConnectionEditPart) {
-		setDecoration(getDecoratorTarget().addConnectionDecoration(image, 50, false));
-	}
-}
-«ENDDEFINE»
-
-«DEFINE SD_additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt
deleted file mode 100644
index dcf9ce499fe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ValidationDecoratorProvider.xpt
+++ /dev/null
@@ -1,394 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«DEFINE ValidationDecoratorProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «validationDecoratorProviderClassName»
-		extends org.eclipse.gmf.runtime.common.core.service.AbstractProvider
-		implements org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorProvider {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static final String KEY = "validationStatus"; «EXPAND xpt::Common::nonNLS»
-	«IF editorGen.application = null-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static final String MARKER_TYPE = «editorGen.plugin.getActivatorQualifiedClassName()».ID +
-			".«getValidationDiagnosticMarkerType()»"; «EXPAND xpt::Common::nonNLS»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static MarkerObserver fileObserver;
-	«ENDIF-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static java.util.Map/*<String, List<IDecorator>>*/ allDecorators = new java.util.HashMap();
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public void createDecorators(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget decoratorTarget) {
-		org.eclipse.gef.EditPart editPart = (org.eclipse.gef.EditPart) decoratorTarget.getAdapter(org.eclipse.gef.EditPart.class);
-		if (editPart instanceof org.eclipse.gmf.runtime.diagram.ui.editparts.GraphicalEditPart ||
-				editPart instanceof org.eclipse.gef.editparts.AbstractConnectionEditPart) {
-			Object model = editPart.getModel();
-			if ((model instanceof org.eclipse.gmf.runtime.notation.View)) {
-				org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) model;
-				if (!(view instanceof org.eclipse.gmf.runtime.notation.Edge) && !view.isSetElement()) {
-					return;
-				}
-			}
-			org.eclipse.gef.EditDomain ed = editPart.getViewer().getEditDomain();
-			if (!(ed instanceof org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain)) {
-				return;
-			}
-			if (((org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain) ed).getEditorPart() instanceof
-					«editorGen.editor.getQualifiedClassName()») {
-				decoratorTarget.installDecorator(KEY, new StatusDecorator(decoratorTarget));
-			}
-		}
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public boolean provides(org.eclipse.gmf.runtime.common.core.service.IOperation operation) {
-		if (!(operation instanceof org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation)) {
-			return false;
-		}
-		org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget decoratorTarget =
-				((org.eclipse.gmf.runtime.diagram.ui.services.decorator.CreateDecoratorsOperation) operation).getDecoratorTarget();
-		org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) decoratorTarget.getAdapter(
-				org.eclipse.gmf.runtime.notation.View.class);
-		return view != null && «EXPAND xpt::editor::VisualIDRegistry::modelID».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(view));
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static void refreshDecorators(org.eclipse.gmf.runtime.notation.View view) {
-		refreshDecorators(org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.getIdStr(view), view.getDiagram());
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static void refreshDecorators(String viewId, org.eclipse.gmf.runtime.notation.Diagram diagram) {
-		final java.util.List decorators = viewId != null ? (java.util.List) allDecorators.get(viewId) : null;
-		if (decorators == null || decorators.isEmpty() || diagram == null) {
-			return;
-		}
-		final org.eclipse.gmf.runtime.notation.Diagram fdiagram = diagram;
-		org.eclipse.ui.PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
-
-			public void run() {
-				try {
-					org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(fdiagram).runExclusive(new Runnable() {
-
-						public void run() {
-							for (java.util.Iterator it = decorators.iterator(); it.hasNext();) {
-								org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator decorator =
-										(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecorator) it.next();
-								decorator.refresh();
-							}
-						}
-					});
-				} catch (Exception e) {
-					«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-							"Decorator refresh failure", e); «EXPAND xpt::Common::nonNLS»
-				}
-			}
-		});
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static class StatusDecorator extends org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private String viewId;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public StatusDecorator(org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget decoratorTarget) {
-			super(decoratorTarget);
-			try {
-				final org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) getDecoratorTarget().getAdapter(
-						org.eclipse.gmf.runtime.notation.View.class);
-				org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(view).runExclusive(new Runnable() {
-
-					public void run() {
-						StatusDecorator.this.viewId = view != null ?
-								org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.getIdStr(view) : null;
-					}
-				});
-			} catch (Exception e) {
-				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-						"ViewID access failure", e); «EXPAND xpt::Common::nonNLS»			
-			}
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void refresh() {
-			removeDecoration();
-			org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) getDecoratorTarget().getAdapter(
-					org.eclipse.gmf.runtime.notation.View.class);
-			if (view == null || view.eResource() == null) {
-				return;
-			}
-			org.eclipse.gef.EditPart editPart = (org.eclipse.gef.EditPart) getDecoratorTarget().getAdapter(org.eclipse.gef.EditPart.class);
-			if (editPart == null || editPart.getViewer() == null) {
-				return;
-			}
-
-			// query for all the validation markers of the current resource
-			«IF editorGen.application = null-»
-			String elementId = org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.getIdStr(view);
-			if (elementId == null) {
-				return;
-			}
-			int severity = org.eclipse.core.resources.IMarker.SEVERITY_INFO;
-			org.eclipse.core.resources.IMarker foundMarker = null;
-			org.eclipse.core.resources.IResource resource = org.eclipse.emf.workspace.util.WorkspaceSynchronizer.getFile(view.eResource());
-			if (resource == null || !resource.exists()) {
-				return;
-			}
-			org.eclipse.core.resources.IMarker[] markers = null;
-			try {
-				markers = resource.findMarkers(MARKER_TYPE, true, org.eclipse.core.resources.IResource.DEPTH_INFINITE);
-			} catch (org.eclipse.core.runtime.CoreException e) {
-				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-						"Validation markers refresh failure", e); «EXPAND xpt::Common::nonNLS»
-			}
-			«ELSE-»
-			int severity = org.eclipse.core.runtime.IStatus.INFO;
-			«EXPAND xpt::editor::ValidationMarker::qualifiedClassName» foundMarker = null;
-			«EXPAND xpt::editor::ValidationMarker::qualifiedClassName»[] markers =
-					«EXPAND xpt::editor::ValidationMarker::qualifiedClassName».getMarkers(editPart.getViewer(), viewId);
-			«ENDIF-»
-			if (markers == null || markers.length == 0) {
-				return;
-			}
-			org.eclipse.draw2d.Label toolTip = null;
-			for (int i = 0; i < markers.length; i++) {
-				«IF editorGen.application = null-»
-				org.eclipse.core.resources.IMarker marker = markers[i];
-				String attribute = marker.getAttribute(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID, ""); «EXPAND xpt::Common::nonNLS»
-				if (attribute.equals(elementId)) {
-					int nextSeverity = marker.getAttribute(org.eclipse.core.resources.IMarker.SEVERITY,
-							org.eclipse.core.resources.IMarker.SEVERITY_INFO);					
-				«ELSE-»
-				«EXPAND xpt::editor::ValidationMarker::qualifiedClassName» marker = markers[i];
-				int nextSeverity = marker.getStatusSeverity();
-				«ENDIF-»
-					org.eclipse.swt.graphics.Image nextImage = getImage(nextSeverity);	 
-					if (foundMarker == null) {				
-						foundMarker = marker;
-						toolTip = new org.eclipse.draw2d.Label(
-							«IF editorGen.application = null-»
-								marker.getAttribute(org.eclipse.core.resources.IMarker.MESSAGE, ""), «EXPAND xpt::Common::nonNLS»
-							«ELSE-»
-								marker.getMessage(),
-							«ENDIF-»
-								nextImage);						
-					} else {
-						if (toolTip.getChildren().isEmpty()) {
-							org.eclipse.draw2d.Label comositeLabel = new org.eclipse.draw2d.Label();
-							org.eclipse.draw2d.FlowLayout fl = new org.eclipse.draw2d.FlowLayout(false);
-							fl.setMinorSpacing(0);
-							comositeLabel.setLayoutManager(fl);
-							comositeLabel.add(toolTip);
-							toolTip = comositeLabel;
-						}
-						toolTip.add(new org.eclipse.draw2d.Label(
-							«IF editorGen.application = null-»
-								marker.getAttribute(org.eclipse.core.resources.IMarker.MESSAGE, ""),  «EXPAND xpt::Common::nonNLS»
-							«ELSE-»
-								marker.getMessage(),
-							«ENDIF-»
-								nextImage));
-					}
-					severity = (nextSeverity > severity) ? nextSeverity : severity;					
-				«IF editorGen.application = null-»
-				}
-				«ENDIF-»
-			}
-			if (foundMarker == null) {
-				return;
-			}
-
-			// add decoration
-			if (editPart instanceof org.eclipse.gef.GraphicalEditPart) {
-				if (view instanceof org.eclipse.gmf.runtime.notation.Edge) {
-					setDecoration(getDecoratorTarget().addConnectionDecoration(getImage(severity), 50, true));										
-				} else {
-					int margin = -1;
-					if (editPart instanceof org.eclipse.gef.GraphicalEditPart) {
-						margin = org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeUtil.getMapMode(
-							((org.eclipse.gef.GraphicalEditPart) editPart).getFigure()).DPtoLP(margin);
-					}
-					setDecoration(getDecoratorTarget().addShapeDecoration(getImage(severity),
-							org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget.Direction.NORTH_EAST, margin, true));										
-				}
-				getDecoration().setToolTip(toolTip);
-			}
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.swt.graphics.Image getImage(int severity) {
-			String imageName = org.eclipse.ui.ISharedImages.IMG_OBJS_ERROR_TSK;
-			switch (severity) {
-			«IF editorGen.application = null-»
-			case org.eclipse.core.resources.IMarker.SEVERITY_ERROR:
-				imageName = org.eclipse.ui.ISharedImages.IMG_OBJS_ERROR_TSK;
-				break;
-			case org.eclipse.core.resources.IMarker.SEVERITY_WARNING:
-				imageName = org.eclipse.ui.ISharedImages.IMG_OBJS_WARN_TSK;
-				break;
-			«ELSE-»
-			case org.eclipse.core.runtime.IStatus.ERROR:
-				imageName = org.eclipse.ui.ISharedImages.IMG_OBJS_ERROR_TSK;
-				break;
-			case org.eclipse.core.runtime.IStatus.WARNING:
-				imageName = org.eclipse.ui.ISharedImages.IMG_OBJS_WARN_TSK;
-				break;
-			«ENDIF-»
-			default:
-				imageName = org.eclipse.ui.ISharedImages.IMG_OBJS_INFO_TSK;
-			}
-			return org.eclipse.ui.PlatformUI.getWorkbench().getSharedImages().getImage(imageName);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void activate() {
-			if (viewId == null) {
-				return;
-			}
-
-			// add self to global decorators registry
-			java.util.List list = (java.util.List) allDecorators.get(viewId);
-			if (list == null) {
-				list = new java.util.ArrayList(2);
-				list.add(this);
-				allDecorators.put(viewId, list);
-			} else if (!list.contains(this)) {
-				list.add(this);
-			}
-			«IF editorGen.application = null-»
-
-			// start listening to changes in resources
-			org.eclipse.gmf.runtime.notation.View view = (org.eclipse.gmf.runtime.notation.View) getDecoratorTarget().getAdapter(
-					org.eclipse.gmf.runtime.notation.View.class);
-			if (view == null) {
-				return;
-			}
-			org.eclipse.gmf.runtime.notation.Diagram diagramView = view.getDiagram();
-			if (diagramView == null) {
-				return;
-			}
-			if (fileObserver == null) {
-				org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager.getInstance().addFileObserver(
-						fileObserver = new MarkerObserver(diagramView));
-			}
-			«ENDIF-»
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void deactivate() {
-			if (viewId == null) {
-				return;
-			}
-
-			// remove self from global decorators registry
-			java.util.List list = (java.util.List) allDecorators.get(viewId);
-			if (list != null) {
-				list.remove(this);
-				if (list.isEmpty()) {
-					allDecorators.remove(viewId);
-				}
-			}
-			«IF editorGen.application = null-»
-
-			// stop listening to changes in resources if there are no more decorators
-			if (fileObserver != null && allDecorators.isEmpty()) {
-				org.eclipse.gmf.runtime.common.ui.resources.FileChangeManager.getInstance().removeFileObserver(fileObserver);
-				fileObserver = null;
-			}
-			«ENDIF-»
-			super.deactivate();
-		}
-	}
-	«IF editorGen.application = null-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	static class MarkerObserver implements org.eclipse.gmf.runtime.common.ui.resources.IFileObserver {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.gmf.runtime.notation.Diagram diagram;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private MarkerObserver(org.eclipse.gmf.runtime.notation.Diagram diagram) {
-			this.diagram = diagram;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void handleFileRenamed(org.eclipse.core.resources.IFile oldFile, org.eclipse.core.resources.IFile file) {
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void handleFileMoved(org.eclipse.core.resources.IFile oldFile, org.eclipse.core.resources.IFile file) {
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void handleFileDeleted(org.eclipse.core.resources.IFile file) {
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void handleFileChanged(org.eclipse.core.resources.IFile file) {
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void handleMarkerAdded(org.eclipse.core.resources.IMarker marker) {
-			if (marker.getAttribute(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID, null) != null) {
-				handleMarkerChanged(marker);
-			}
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void handleMarkerDeleted(org.eclipse.core.resources.IMarker marker, java.util.Map attributes) {
-			String viewId = (String) attributes.get(org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID);
-			refreshDecorators(viewId, diagram);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void handleMarkerChanged(org.eclipse.core.resources.IMarker marker) {
-			if (!MARKER_TYPE.equals(getType(marker))) {
-				return;
-			}
-			String viewId = marker.getAttribute(
-					org.eclipse.gmf.runtime.common.ui.resources.IMarker.ELEMENT_ID, ""); «EXPAND xpt::Common::nonNLS»
-			refreshDecorators(viewId, diagram);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private String getType(org.eclipse.core.resources.IMarker marker) {
-			try {
-				return marker.getType();
-			} catch (org.eclipse.core.runtime.CoreException e) {
-				«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError(
-						"Validation marker refresh failure", e); «EXPAND xpt::Common::nonNLS»
-				return ""; «EXPAND xpt::Common::nonNLS»
-			}
-		}
-	}
-	«ENDIF-»
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt
deleted file mode 100644
index c1e0070184c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ValidationProvider.xpt
+++ /dev/null
@@ -1,311 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - introduced GenAuditContext entity
- *                                 straightforward and simple #validate() implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::GenAuditRoot»
-
-«DEFINE ValidationProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «validationProviderClassName» {
-
-	«EXPAND constraintsActive-»
-
-	«EXPAND shouldConstraintsBePrivate-»
-
-	«EXPAND runWithActiveConstraints-»
-
-	«EXPAND isInDefaultEditorContext-»
-
-«EXPAND selectors FOR editorGen.audits-»
-
-«EXPAND strategy_support»
-
-«EXPAND constraintAdapters(self) FOR editorGen.audits-»
-
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE constraintsActive FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-private static boolean constraintsActive = false;	
-«ENDDEFINE»
-
-«DEFINE shouldConstraintsBePrivate FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-public static boolean shouldConstraintsBePrivate() {
-	return false;
-}
-«ENDDEFINE»
-
-«DEFINE runWithActiveConstraints FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-public static void runWithConstraints(org.eclipse.emf.transaction.TransactionalEditingDomain editingDomain, Runnable operation) {
-	final Runnable op = operation;
-	Runnable task = new Runnable() {
-		public void run() {
-			try {
-				constraintsActive = true;
-				op.run();
-			} finally {
-				constraintsActive = false;
-			}
-		}
-	};
-	if(editingDomain != null) {
-		try {
-			editingDomain.runExclusive(task);
-		} catch (Exception e) {
-			«editorGen.plugin.getActivatorQualifiedClassName()».getInstance().logError("Validation failed", e); «EXPAND xpt::Common::nonNLS»
-		}
-	} else {
-		task.run();
-	}
-}
-«ENDDEFINE»
-
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
-
-«DEFINE selectors FOR gmfgen::GenAuditRoot-»
-«FOREACH clientContexts->asSequence() AS ctx»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static class «ctx.className» implements org.eclipse.emf.validation.model.IClientSelector {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public boolean selects(Object object) {
-«IF (ctx.ruleTargets)[gmfgen::GenDiagramElementTarget]->size() > 0 -»
-			if (isInDefaultEditorContext(object) && object instanceof org.eclipse.gmf.runtime.notation.View) {
-				final int id = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»((org.eclipse.gmf.runtime.notation.View) object);
-				boolean result = false;
-«FOREACH getTargetDiagramElements(ctx) AS e-»
-				result = result || id == «EXPAND xpt::editor::VisualIDRegistry::visualID FOR e»;
-«ENDFOREACH-»
-				return result;
-			}
-			return false;
-«ELSE-»
-			return isInDefaultEditorContext(object);
-«ENDIF-»
-		}
-	}
-«ENDFOREACH-»
-«ENDDEFINE»
-
-«DEFINE isInDefaultEditorContext FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::generatedMemberComment»
-static boolean isInDefaultEditorContext(Object object) {
-	if(shouldConstraintsBePrivate() && !constraintsActive) {
-		return false;
-	}
-	if (object instanceof org.eclipse.gmf.runtime.notation.View) {
-		return constraintsActive && «EXPAND xpt::editor::VisualIDRegistry::modelID».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»((org.eclipse.gmf.runtime.notation.View) object));
-	}
-	return true;
-}
-«ENDDEFINE»
-
-
-«DEFINE strategy_support FOR gmfgen::GenDiagram-»
-«IF hasDiagramElementTargetRule(editorGen.audits)-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static org.eclipse.emf.validation.service.ITraversalStrategy getNotationTraversalStrategy(
-			org.eclipse.emf.validation.service.IBatchValidator validator) {
-		return new CtxSwitchStrategy(validator);
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	private static class CtxSwitchStrategy implements org.eclipse.emf.validation.service.ITraversalStrategy {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.emf.validation.service.ITraversalStrategy defaultStrategy;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private int currentSemanticCtxId = -1;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private boolean ctxChanged = true;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.emf.ecore.EObject currentTarget;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private org.eclipse.emf.ecore.EObject preFetchedNextTarget;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private final int[] contextSwitchingIdentifiers;
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		CtxSwitchStrategy(org.eclipse.emf.validation.service.IBatchValidator validator) {
-			this.defaultStrategy = validator.getDefaultTraversalStrategy();
-			this.contextSwitchingIdentifiers = new int[] {
-				«EXPAND xpt::editor::VisualIDRegistry::visualID FOREACH getAllTargetDiagramElements(editorGen.audits) SEPARATOR ','»
-			};
-			java.util.Arrays.sort(this.contextSwitchingIdentifiers);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void elementValidated(org.eclipse.emf.ecore.EObject element,
-				org.eclipse.core.runtime.IStatus status) {
-			defaultStrategy.elementValidated(element, status);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public boolean hasNext() {
-			return defaultStrategy.hasNext();
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public boolean isClientContextChanged() {
-			if (preFetchedNextTarget == null) {
-				preFetchedNextTarget = next();
-				prepareNextClientContext(preFetchedNextTarget);
-			}
-			return ctxChanged;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.emf.ecore.EObject next() {
-			org.eclipse.emf.ecore.EObject nextTarget = preFetchedNextTarget;
-			if (nextTarget == null) {
-				nextTarget = defaultStrategy.next();
-			}
-			this.preFetchedNextTarget = null;
-			return this.currentTarget = nextTarget;
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public void startTraversal(java.util.Collection traversalRoots,	org.eclipse.core.runtime.IProgressMonitor monitor) {
-			defaultStrategy.startTraversal(traversalRoots, monitor);
-		}
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		private void prepareNextClientContext(org.eclipse.emf.ecore.EObject nextTarget) { 
-			if (nextTarget != null && currentTarget != null) {
-				if (nextTarget instanceof org.eclipse.gmf.runtime.notation.View) {
-					final int id = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall FOR editorGen.diagram»((org.eclipse.gmf.runtime.notation.View) nextTarget);
-					int nextSemanticId = (id != -1 && java.util.Arrays.binarySearch(contextSwitchingIdentifiers, id) >= 0) ? id : -1;
-					if ((currentSemanticCtxId != -1 && currentSemanticCtxId != nextSemanticId)
-							|| (nextSemanticId != -1 && nextSemanticId != currentSemanticCtxId)) {
-						this.ctxChanged = true;
-					}«/*[artem] not sure why not ctxChanged = <expr>, is it intentional not to reset ctxChanged if condition did not match? I doubt. FIXME?*/»
-					currentSemanticCtxId = nextSemanticId;
-				} else {
-					// context of domain model
-					this.ctxChanged = currentSemanticCtxId != -1;
-					currentSemanticCtxId = -1;
-				}
-			} else {
-				this.ctxChanged = false;
-			}
-		}
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-
-«DEFINE constraintAdapters(diagram : gmfgen::GenDiagram) FOR gmfgen::GenAuditRoot-»
-«IF diagram.editorGen.expressionProviders <> null-»
-«EXPAND constraintAdapter(diagram.editorGen.expressionProviders) FOREACH rules->select(a | a.requiresConstraintAdapter)-»
-«IF not rules->select(a | a.requiresConstraintAdapter)->isEmpty()»
-«EXPAND constraintAdapters_formatMethod»
-«ENDIF»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE constraintAdapter(container : gmfgen::GenExpressionProviderContainer) FOR gmfgen::GenAuditRule-»
-«IF target <> null and target.getContext() <> null-»
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public static class «getConstraintAdapterLocalClassName()» extends org.eclipse.emf.validation.AbstractModelConstraint {
-
-		«EXPAND xpt::Common::generatedMemberComment»
-		public org.eclipse.core.runtime.IStatus validate(org.eclipse.emf.validation.IValidationContext ctx) {
-			«EXPAND constraintAdapter_initContext(self) FOR target-»
-			«EXPAND constraintAdapter_validateMethod(self) FOR rule.provider-»
-		}
-	}
-«ENDIF-»
-«ENDDEFINE»
-
-
-«DEFINE constraintAdapters_formatMethod FOR gmfgen::GenAuditRoot-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	static String formatElement(org.eclipse.emf.ecore.EObject object) {
-		return org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil.getQualifiedName(object, true);
-	}
-«ENDDEFINE»
- 
-/*
- * Expects 'context' variable to be initialized
- */
-«DEFINE constraintAdapter_validateMethod(audit : gmfgen::GenAuditRule) FOR gmfgen::GenExpressionProviderBase»«ERROR 'No idea how to evaluate an audit rule for ' + self.repr()»«ENDDEFINE»
-
-«DEFINE constraintAdapter_validateMethod(audit : gmfgen::GenAuditRule) FOR gmfgen::GenExpressionInterpreter-»
-			Object result = «EXPAND xpt::expressions::getExpression::getExpression(audit.rule, audit.target.getContext())».evaluate(context);
-			if (result instanceof Boolean && ((Boolean) result).booleanValue()) {
-				return org.eclipse.core.runtime.Status.OK_STATUS;«REM»XXX why not ctx.createSuccessStatus()???«ENDREM»
-			}
-			return ctx.createFailureStatus(new Object[] { formatElement(ctx.getTarget()) });
-«ENDDEFINE»
-
-«DEFINE constraintAdapter_validateMethod(audit : gmfgen::GenAuditRule) FOR gmfgen::GenJavaExpressionProvider-»
-«IF injectExpressionBody and (audit.rule.body <> null and audit.rule.body.size() <> 0)-»
-			«audit.rule.body»
-«ELSEIF throwException or (injectExpressionBody and (audit.rule.body = null or audit.rule.body.size() = 0))-»
-			// TODO: put validation code here
-			// Ensure that you remove @generated tag or use @generated NOT
-			//
-			// To construct approprate return value, use ctx.createSuccessStatus()
-			// or ctx.createFailureStatus(...)
-			throw new java.lang.UnsupportedOperationException("No user java implementation provided for #validate(IValidationContext) operation");«EXPAND xpt::Common::nonNLS»
-«ELSE-»
-			return ctx.createFailureStatus(new Object[] { "No user java implementation provided for #validate(IValidationContext) operation" });«EXPAND xpt::Common::nonNLS»
-«ENDIF-»
-«ENDDEFINE»
-
-/*
- *	Contract: declare variable with the name 'context' of appropriate type
- */
-«DEFINE constraintAdapter_initContext(audit : gmfgen::GenAuditRule) FOR gmfgen::GenAuditable-»
-«EXPAND MetaModel::DeclareAndAssign('context', 'ctx.getTarget()', false) FOR getContext()»
-«ENDDEFINE»
-
-«DEFINE constraintAdapter_initContext(audit : gmfgen::GenAuditRule) FOR gmfgen::GenDomainAttributeTarget-»
-	final Object«REM»Actual context type is genDomainAttributeTarget.getContext()«ENDREM» context = ctx.getTarget().eGet(«EXPAND MetaModel::MetaFeature FOR attribute»);
-«REM»
-	For now, leave reflective access that gives Object-compatible result.
-	
-	FIXME: introduce MetaModel::DeclareAndAssignAttributeValueAsObject, that would 
-		check if attibute type is primitive and wrap accordingly, but access attribute directly!
-«ENDREM-»
-	if (context == null) {
-«IF nullAsError-»
-		return ctx.createFailureStatus(new Object[] { formatElement(ctx.getTarget()) });
-«ELSE-»
-		return org.eclipse.core.runtime.Status.OK_STATUS;
-«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE constraintAdapter_initContext(audit : gmfgen::GenAuditRule) FOR gmfgen::GenAuditedMetricTarget-»
-final Number context = «IF metric = null /*though metamodel constraint should not allow this*/»null /*FIXME: metric target was not correctly specified in the model*/«ELSE»«EXPAND MetricProvider::invokeCalcMethod('ctx.getTarget()', false) FOR metric»«ENDIF»;
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ViewProvider.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ViewProvider.xpt
deleted file mode 100644
index f3cbc550384..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/ViewProvider.xpt
+++ /dev/null
@@ -1,441 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - [257119] Create views directly, not through ViewFactories
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-
-«EXTENSION xpt::diagram::Utils»
-«EXTENSION xpt::diagram::ViewmapAttributesUtils»
-«EXTENSION xpt::diagram::editpolicies::LinkUtils»
-
-«DEFINE ViewProvider FOR gmfgen::GenDiagram-»
-«EXPAND xpt::Common::copyright FOR getDiagram().editorGen-»
-package «providersPackageName»;
-
-«EXPAND xpt::Common::generatedClassComment»
-public class «notationViewProviderClassName»«EXPAND extendsList»«EXPAND implementsList» {
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public final boolean provides(org.eclipse.gmf.runtime.common.core.service.IOperation operation) {
-		if (operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation) {
-			return provides((org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation) operation);
-		}
-		«EXPAND xpt::Common::_assert('operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewOperation')-»
-		if (operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation) {
-			return provides((org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation) operation);
-		} else if (operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation) {
-			return provides((org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation) operation);
-		} else if (operation instanceof org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation) {
-			return provides((org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation) operation);
-		}
-		return false;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateViewForKindOperation op) {
-/*
-		if (op.getViewKind() == Node.class)
-			return getNodeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
-		if (op.getViewKind() == Edge.class)
-			return getEdgeViewClass(op.getSemanticAdapter(), op.getContainerView(), op.getSemanticHint()) != null;
-*/
-		return true;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»«REM»When diagram domain element is null only diagram kind is checked«ENDREM»
-	protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateDiagramViewOperation op) {
-		return «EXPAND xpt::editor::VisualIDRegistry::modelID».equals(op.getSemanticHint())«IF domainDiagramElement <> null» && «EXPAND xpt::editor::VisualIDRegistry::getDiagramVisualIDMethodCall»(getSemanticElement(op.getSemanticAdapter())) != -1«ENDIF»;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateNodeViewOperation op) {
-		if (op.getContainerView() == null) {
-			return false;
-		}
-		org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());
-		int visualID;
-		if (op.getSemanticHint() == null) {
-			// Semantic hint is not specified. Can be a result of call from CanonicalEditPolicy.
-			// In this situation there should be NO elementType, visualID will be determined
-			// by VisualIDRegistry.getNodeVisualID() for domainElement.
-			if (elementType != null || domainElement == null) {«REM»XXX Perhaps, better to fix CanonicalEP instead of this hack?«ENDREM»
-				return false;
-			}
-			visualID = «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(op.getContainerView(), domainElement);
-		} else {
-			visualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(op.getSemanticHint());
-			if (elementType != null) {«REM»
-				Semantic hint is specified together with element type.
-				Both parameters should describe exactly the same diagram element.
-				In addition we check that visualID returned by VisualIDRegistry.getNodeVisualID() for
-				domainElement (if specified) is the same as in element type.«ENDREM»
-				if (!«getElementTypesQualifiedClassName()».isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-					return false; // foreign element type
-				}
-				String elementTypeHint = ((org.eclipse.gmf.runtime.emf.type.core.IHintedType) elementType).getSemanticHint();
-				if (!op.getSemanticHint().equals(elementTypeHint)) {
-					return false; // if semantic hint is specified it should be the same as in element type
-				}
-				if (domainElement != null && visualID != «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(op.getContainerView(), domainElement)) {
-					return false; // visual id for node EClass should match visual id from element type
-				}
-			} else {«REM»
-				Element type is not specified. Domain element should be present (except pure design elements).
-				 This method is called with EObjectAdapter as parameter from:
-				   - ViewService.createNode(View container, EObject eObject, String type, PreferencesHint preferencesHint) 
-				   - generated ViewFactory.decorateView() for parent element«ENDREM»
-«IF getAllTypedElements()->select(e | e.elementType <> null)->size() > 0-»
-				if (!«EXPAND xpt::editor::VisualIDRegistry::modelID».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(op.getContainerView()))) {
-					return false; // foreign diagram
-				}
-				switch (visualID) {
-	«IF getAllNodes().elementType[gmfgen::NotationType]->size() > 0-»
-				«EXPAND caseVisualID FOREACH getAllNodes().elementType[gmfgen::NotationType]-»
-					break; // pure design element
-	«ENDIF-»
-	«IF getAllNodes().elementType[gmfgen::MetamodelType]->size() > 0 or getAllNodes().elementType[gmfgen::SpecializationType]->size() > 0-»
-				«EXPAND caseVisualID FOREACH getAllNodes().elementType[gmfgen::MetamodelType]-»
-				«EXPAND caseVisualID FOREACH getAllNodes().elementType[gmfgen::SpecializationType]-»
-					if (domainElement == null || visualID != «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(op.getContainerView(), domainElement)) {
-						return false; // visual id in semantic hint should match visual id for domain element
-					}
-					break;«REM»FIXME: Perhaps, can return true or false right away, without any further check?«ENDREM»
-	«ENDIF-»
-				default:
-					return false;
-				}
-«ELSE-»
-				return false;
-«ENDIF-»
-			}
-		}
-		return «FOREACH getAllNodes() AS n SEPARATOR '||'»«EXPAND xpt::editor::VisualIDRegistry::visualID FOR n» == visualID«ENDFOREACH»;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»«REM»XXX: unlike createNode, we don't check op.containerView() for null here. On purpose?«ENDREM»
-	protected boolean provides(org.eclipse.gmf.runtime.diagram.core.services.view.CreateEdgeViewOperation op) {
-		org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = getSemanticElementType(op.getSemanticAdapter());
-		if (!«getElementTypesQualifiedClassName()».isKnownElementType(elementType) || (!(elementType instanceof org.eclipse.gmf.runtime.emf.type.core.IHintedType))) {
-			return false; // foreign element type
-		}
-		String elementTypeHint = ((org.eclipse.gmf.runtime.emf.type.core.IHintedType) elementType).getSemanticHint();
-		if (elementTypeHint == null || (op.getSemanticHint() != null && !elementTypeHint.equals(op.getSemanticHint()))) {
-			return false; // our hint is visual id and must be specified, and it should be the same as in element type
-		}
-		int visualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(elementTypeHint);
-		org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(op.getSemanticAdapter());
-		if (domainElement != null && visualID != «EXPAND xpt::editor::VisualIDRegistry::getLinkWithClassVisualIDMethodCall»(domainElement)) {
-			return false; // visual id for link EClass should match visual id from element type
-		}
-		return true; «REM»Does it make sense to check visualID here, like we did for nodes?«ENDREM»
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.notation.Diagram createDiagram(org.eclipse.core.runtime.IAdaptable semanticAdapter, String diagramKind, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) {
-		org.eclipse.gmf.runtime.notation.Diagram diagram = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDiagram();«REM»FIXME instantiate diagramRunTimeClass instead«ENDREM»
-		diagram.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDiagramStyle());
-		«EXPAND xpt::diagram::views::Utils::addCustomStyles('diagram.getStyles()')-»
-		diagram.setType(«EXPAND xpt::editor::VisualIDRegistry::modelID»);
-		diagram.setElement(«IF domainDiagramElement <> null»getSemanticElement(semanticAdapter)«ELSE»null«ENDIF»);
-«IF units <> null-»
-		diagram.setMeasurementUnit(org.eclipse.gmf.runtime.notation.MeasurementUnit.«units.toUpper()»_LITERAL);
-«ENDIF-»
-«IF styles->notEmpty()-»
-		// initializeFromPreferences
-		org.eclipse.jface.preferences.IPreferenceStore store = (org.eclipse.jface.preferences.IPreferenceStore) preferencesHint.getPreferenceStore();
-		«EXPAND initializeStyles('diagram', 'store', false, false, false)-»
-«ENDIF-»
-		return diagram;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.notation.Node createNode(org.eclipse.core.runtime.IAdaptable semanticAdapter, org.eclipse.gmf.runtime.notation.View containerView, String semanticHint, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) {
-		final org.eclipse.emf.ecore.EObject domainElement = getSemanticElement(semanticAdapter);
-		final int visualID;
-		if (semanticHint == null) {
-			visualID = «EXPAND xpt::editor::VisualIDRegistry::getNodeVisualIDMethodCall»(containerView, domainElement);
-		} else {
-			visualID = «EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(semanticHint);
-		}
-		switch(visualID) {
-		«FOREACH getAllNodes() AS n-»
-		«EXPAND xpt::Common::caseVisualID FOR n» return create«n.getUniqueIdentifier()»(domainElement, containerView, index, persisted, preferencesHint);
-		«ENDFOREACH-»
-		}
-		// can't happen, provided #provides(CreateNodeViewOperation) is correct
-		return null;
-	}
-
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.notation.Edge createEdge(org.eclipse.core.runtime.IAdaptable semanticAdapter, org.eclipse.gmf.runtime.notation.View containerView, String semanticHint, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) {
-		org.eclipse.gmf.runtime.emf.type.core.IElementType elementType = getSemanticElementType(semanticAdapter);
-		String elementTypeHint = ((org.eclipse.gmf.runtime.emf.type.core.IHintedType) elementType).getSemanticHint();
-		switch («EXPAND xpt::editor::VisualIDRegistry::getVisualIDMethodCall»(elementTypeHint)) {
-		«FOREACH links AS link-»
-		«EXPAND xpt::Common::caseVisualID FOR link» return create«link.getUniqueIdentifier()»(«IF link.isTypeLink()» getSemanticElement(semanticAdapter), «ENDIF»containerView, index, persisted, preferencesHint);
-		«ENDFOREACH-»
-		}
-		// can never happen, provided #provides(CreateEdgeViewOperation) is correct
-		return null;
-	}
-
-«EXPAND createNodeMethod FOREACH getAllNodes()»
-«EXPAND createEdgeMethod FOREACH links»
-
-«IF topLevelNodes->notEmpty()»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private void stampShortcut(org.eclipse.gmf.runtime.notation.View containerView, org.eclipse.gmf.runtime.notation.Node target) {
-		if (!«EXPAND xpt::editor::VisualIDRegistry::modelID».equals(«EXPAND xpt::editor::VisualIDRegistry::getModelIDMethodCall»(containerView))) {
-			«EXPAND xpt::Common::addShortcutAnnotation('target')-»
-		}
-	}
-«ENDIF-»
-
-«IF links.labels->notEmpty() or topLevelNodes.labels->notEmpty() or childNodes.labels->notEmpty()»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.notation.Node createLabel(org.eclipse.gmf.runtime.notation.View owner, String hint) {
-		org.eclipse.gmf.runtime.notation.DecorationNode rv = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDecorationNode();
-		rv.setType(hint);
-		org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(owner, rv, org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.APPEND, true);
-		return rv;
-	}
-«ENDIF-»
-
-«IF getAllNodes().compartments->notEmpty()»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.gmf.runtime.notation.Node createCompartment(org.eclipse.gmf.runtime.notation.View owner, String hint, boolean canCollapse, boolean hasTitle, boolean canSort, boolean canFilter) {
-		//SemanticListCompartment rv = NotationFactory.eINSTANCE.createSemanticListCompartment();
-		//rv.setShowTitle(showTitle);
-		//rv.setCollapsed(isCollapsed);
-		org.eclipse.gmf.runtime.notation.Node rv;
-		if (canCollapse) {
-			rv = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createBasicCompartment();
-		} else {
-			rv = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDecorationNode();
-		}
-		if (hasTitle) {
-			org.eclipse.gmf.runtime.notation.TitleStyle ts = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createTitleStyle();
-			ts.setShowTitle(true);
-			rv.getStyles().add(ts);
-		}
-		if (canSort) {
-			rv.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createSortingStyle());
-		}
-		if (canFilter) {
-			rv.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createFilteringStyle());
-		}
-		rv.setType(hint);
-		org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(owner, rv, org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.APPEND, true);
-		return rv;
-	}
-«ENDIF-»
-	«EXPAND getSemanticElementMethod»
-	«EXPAND getSemanticElementTypeMethod-»
-	«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE createNodeMethod FOR gmfgen::GenNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.notation.Node create«getUniqueIdentifier()»(org.eclipse.emf.ecore.EObject domainElement, org.eclipse.gmf.runtime.notation.View containerView, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) {
-«IF viewmap.canUseShapeStyle()-»
-		org.eclipse.gmf.runtime.notation.Shape node = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createShape();
-«ELSE-»
-		org.eclipse.gmf.runtime.notation.Node node = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createNode();
-		node.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createDescriptionStyle());«REM»FIXME Contionally add this style, whether toolsmith needs Notes or not«ENDREM»
-		«EXPAND xpt::diagram::views::Utils::addFontLineFillStylesConditionally('node.getStyles()') FOR viewmap-»
-«ENDIF-»
-		«EXPAND xpt::diagram::views::Utils::addLinkedDiagramStyle('node.getStyles()')-»
-		«EXPAND xpt::diagram::views::Utils::addCustomStyles('node.getStyles()')-»
-		node.setLayoutConstraint(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createBounds());
-		node.setType(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»);
-		org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-«IF self.oclIsTypeOf(gmfgen::GenTopLevelNode)-»
-		stampShortcut(containerView, node);
-«ENDIF-»
-		// initializeFromPreferences «REM»XXX Perhaps, do init only once, for complete figure?«ENDREM»
-		final org.eclipse.jface.preference.IPreferenceStore prefStore = (org.eclipse.jface.preference.IPreferenceStore) preferencesHint.getPreferenceStore();
-		«EXPAND initializeStyles('node', 'prefStore', not viewmap.isFixedForeground(), not viewmap.isFixedBackground(), not viewmap.isFixedFont())-»
-		«EXPAND initLabel('node', 'prefStore') FOREACH labels-»
-		«EXPAND initCompartment('node', 'prefStore') FOREACH compartments-»
-		return node;
-	}
-«ENDDEFINE»
-
-// Location as layoutConstraint, no children
-«DEFINE createNodeMethod FOR gmfgen::GenChildLabelNode-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.notation.Node create«getUniqueIdentifier()»(org.eclipse.emf.ecore.EObject domainElement, org.eclipse.gmf.runtime.notation.View containerView, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) {
-		org.eclipse.gmf.runtime.notation.Node node = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createNode();
-		node.setLayoutConstraint(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createLocation());«REM»[artem] XXX not sure, why LabelNode needs location«ENDREM»
-		«EXPAND xpt::diagram::views::Utils::addLinkedDiagramStyle('node.getStyles()')-»
-		«EXPAND xpt::diagram::views::Utils::addCustomStyles('node.getStyles()')-»
-		node.setType(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»);
-		org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(containerView, node, index, persisted);
-		node.setElement(domainElement);
-«IF styles->notEmpty()-»
-		final org.eclipse.jface.preference.IPreferenceStore prefStore = (org.eclipse.jface.preference.IPreferenceStore) preferencesHint.getPreferenceStore();
-		«EXPAND initializeStyles('node', 'prefStore', false, false, false)-»
-«ENDIF-»
-		return node;
-	}
-«ENDDEFINE»
-
-// looks for Font/Line/Fill styles in customStyles and initializes, if any (may be forced with boolean params)
-// params has*Style are to force respective style initialization (when callee knows certain style was added)  
-«DEFINE initializeStyles(String viewVar, String prefStoreVar, Boolean hasLineStyle, Boolean hasFillStyle, Boolean hasFontStyle) FOR gmfgen::GenCommonBase-»
-«IF hasLineStyle or self.hasLineStyleInCustom()-»
-	«REM»FIXME ColorAttributes is deprecated, should remove and clean the second branch of the disjunction«ENDREM»
-	«IF viewmap.isFixedForeground() or viewmap.attributes[gmfgen::ColorAttributes]->notEmpty()-»
-		«EXPAND xpt::diagram::views::Utils::foregroundColour(viewVar) FOR viewmap-»
-	«ELSE-»
-		«EXPAND initForegroundFromPrefs(viewVar, prefStoreVar)-»
-	«ENDIF-»
-«ENDIF-»
-«IF (hasFontStyle or self.hasFontStyleInCustom()) and not viewmap.isFixedFont()-»
-		«EXPAND initFontFromPrefs(viewVar, prefStoreVar)-»
-«ENDIF-»
-«IF hasFillStyle or self.hasFillStyleInCustom()-»
-	«IF viewmap.isFixedBackground() or viewmap.attributes[gmfgen::ColorAttributes]->notEmpty()-»
-		«EXPAND xpt::diagram::views::Utils::backgroundColour(viewVar) FOR viewmap-»
-	«ELSE-»
-		«EXPAND initBackgroundFromPrefs(viewVar, prefStoreVar)-»
-	«ENDIF-»
-«ENDIF-»
-«ENDDEFINE»
-
-// FIXME check if there's need for a variable name, see initCompartment for a hint
-«DEFINE initLabel(String nodeVar, String prefStoreVar) FOR gmfgen::GenLabel-»
-«LET 'label' + self.visualID.repr() AS labelVar-»
-		org.eclipse.gmf.runtime.notation.Node «labelVar» = createLabel(«nodeVar», «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»);
-		«EXPAND xpt::diagram::views::Utils::addTextStyle(labelVar + '.getStyles()') FOR modelFacet-»
-		«EXPAND xpt::diagram::views::Utils::addCustomStyles(labelVar + '.getStyles()')-»
-«IF self.oclIsKindOf(gmfgen::GenExternalNodeLabel) or self.oclIsKindOf(gmfgen::GenLinkLabel)-»
-		«labelVar».setLayoutConstraint(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createLocation());
-		«EXPAND xpt::diagram::views::Utils::offset(labelVar)-»
-«ENDIF-»
-		«EXPAND initializeStyles(labelVar, prefStoreVar, false, false, false)-»
-«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE initCompartment(String nodeVar, String prefStoreVar) FOR gmfgen::GenCompartment-»
-«LET 'compartment' + self.visualID.repr() AS compartmentVar-»
-		«IF styles->notEmpty() or isStoringChildPositions(getLayoutType())»org.eclipse.gmf.runtime.notation.Node «compartmentVar» = «ENDIF»createCompartment(«nodeVar», «EXPAND xpt::editor::VisualIDRegistry::typeMethodCall», «canCollapse», «needsTitle», «listLayout», «listLayout»);
-		«EXPAND xpt::diagram::views::Utils::addCustomStyles(compartmentVar + '.getStyles()')-»
-«IF isStoringChildPositions(getLayoutType())-»
-	«IF viewmap.canUseShapeStyle()-»
-		«compartmentVar».add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createShapeStyle());
-	«ELSE-»
-«REM»Intentionally not adding Description style, as it deemed to be useless for compartments (can't avoid for ShapeStyle - benefits of a single style overwheight drawbacks of Description presence)«ENDREM»
-		«EXPAND xpt::diagram::views::Utils::addFontLineFillStylesConditionally(compartmentVar + '.getStyles()') FOR viewmap-»
-	«ENDIF-»
-		«compartmentVar».setLayoutConstraint(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createBounds());
-		«EXPAND initializeStyles(compartmentVar, prefStoreVar, not viewmap.isFixedForeground(), not viewmap.isFixedBackground(), not viewmap.isFixedFont())-»
-«ELSE-»
-		«EXPAND initializeStyles(compartmentVar, prefStoreVar, false, false, false)-»
-«ENDIF-»
-«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE initForegroundFromPrefs(String viewVar, String prefStoreVar) FOR gmfgen::GenCommonBase-»
-	org.eclipse.swt.graphics.RGB lineRGB = org.eclipse.jface.preference.PreferenceConverter.getColor(«prefStoreVar», org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_COLOR);
-	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(«viewVar», org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getLineStyle_LineColor(), org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.RGBToInteger(lineRGB));
-«ENDDEFINE»
-
-«DEFINE initBackgroundFromPrefs(String viewVar, String prefStoreVar) FOR gmfgen::GenCommonBase-»
-	org.eclipse.swt.graphics.RGB fillRGB = org.eclipse.jface.preference.PreferenceConverter.getColor(«prefStoreVar», org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_FILL_COLOR);
-	org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(«viewVar», org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getFillStyle_FillColor(), org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.RGBToInteger(fillRGB));
-«ENDDEFINE»
-
-«DEFINE initFontFromPrefs(String viewVar, String prefStoreVar) FOR gmfgen::GenCommonBase-»
-	org.eclipse.gmf.runtime.notation.FontStyle «viewVar»FontStyle = (org.eclipse.gmf.runtime.notation.FontStyle) «viewVar».getStyle(org.eclipse.gmf.runtime.notation.NotationPackage.Literals.FONT_STYLE);
-	if («viewVar»FontStyle != null) {«REM»Given this template is invoked only when FontStyle is present, no need to check fontStyle for null, but at least this gives a scope for fontData var«ENDREM»
-		org.eclipse.swt.graphics.FontData fontData = org.eclipse.jface.preference.PreferenceConverter.getFontData(«prefStoreVar», org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_DEFAULT_FONT);
-		«viewVar»FontStyle.setFontName(fontData.getName());
-		«viewVar»FontStyle.setFontHeight(fontData.getHeight());
-		«viewVar»FontStyle.setBold((fontData.getStyle() & org.eclipse.swt.SWT.BOLD) != 0);
-		«viewVar»FontStyle.setItalic((fontData.getStyle() & org.eclipse.swt.SWT.ITALIC) != 0);
-		org.eclipse.swt.graphics.RGB fontRGB = org.eclipse.jface.preference.PreferenceConverter.getColor(«prefStoreVar», org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_FONT_COLOR);
-		«viewVar»FontStyle.setFontColor(org.eclipse.gmf.runtime.draw2d.ui.figures.FigureUtilities.RGBToInteger(fontRGB).intValue());
-	}
-«ENDDEFINE»
-
-
-«DEFINE createEdgeMethod FOR gmfgen::GenLink-»
-	«EXPAND xpt::Common::generatedMemberComment»
-	public org.eclipse.gmf.runtime.notation.Edge create«getUniqueIdentifier()»(«IF isTypeLink()»org.eclipse.emf.ecore.EObject domainElement, «ENDIF»org.eclipse.gmf.runtime.notation.View containerView, int index, boolean persisted, org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint preferencesHint) {
-	«IF viewmap.isFixedForeground()-»
-		org.eclipse.gmf.runtime.notation.Edge edge = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createEdge();
-		edge.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createRoutingStyle());
-	«ELSE-»
-		org.eclipse.gmf.runtime.notation.Connector edge = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createConnector();
-	«ENDIF-»
-	«IF not viewmap.isFixedFont()-»
-		edge.getStyles().add(org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createFontStyle());
-	«ENDIF-»
-		«EXPAND xpt::diagram::views::Utils::addCustomStyles('edge.getStyles()')-»
-		org.eclipse.gmf.runtime.notation.RelativeBendpoints bendpoints = org.eclipse.gmf.runtime.notation.NotationFactory.eINSTANCE.createRelativeBendpoints();
-		«EXPAND CodeStyle::newGenericInstance('points', 'java.util.ArrayList', 'org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint')»(2);
-		points.add(new org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint());
-		points.add(new org.eclipse.gmf.runtime.notation.datatype.RelativeBendpoint());
-		bendpoints.setPoints(points);
-		edge.setBendpoints(bendpoints);
-		org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.insertChildView(containerView, edge, index, persisted);
-		edge.setType(«EXPAND xpt::editor::VisualIDRegistry::typeMethodCall»);
-		edge.setElement(«IF isTypeLink()»domainElement«ELSE»null«ENDIF»);
-		// initializePreferences
-		final org.eclipse.jface.preference.IPreferenceStore prefStore = (org.eclipse.jface.preference.IPreferenceStore) preferencesHint.getPreferenceStore();
-		«EXPAND initializeStyles('edge', 'prefStore', not viewmap.isFixedForeground(), false, not viewmap.isFixedFont())-»
-		org.eclipse.gmf.runtime.notation.Routing routing = org.eclipse.gmf.runtime.notation.Routing.get(prefStore.getInt(org.eclipse.gmf.runtime.diagram.ui.preferences.IPreferenceConstants.PREF_LINE_STYLE));
-		if (routing != null) {
-			org.eclipse.gmf.runtime.diagram.core.util.ViewUtil.setStructuralFeatureValue(edge, org.eclipse.gmf.runtime.notation.NotationPackage.eINSTANCE.getRoutingStyle_Routing(), routing);
-		}
-«EXPAND initLabel('edge', 'prefStore') FOREACH labels-»
-		return edge;
-	}
-«ENDDEFINE»
-
-«DEFINE extendsList FOR gmfgen::GenDiagram» extends org.eclipse.gmf.runtime.common.core.service.AbstractProvider«ENDDEFINE»
-«DEFINE implementsList FOR gmfgen::GenDiagram» implements org.eclipse.gmf.runtime.diagram.core.providers.IViewProvider«ENDDEFINE»
-
-«DEFINE caseVisualID FOR gmfgen::ElementType»«EXPAND xpt::Common::caseVisualID FOR diagramElement»«ENDDEFINE»
-
-«DEFINE getSemanticElementMethod FOR gmfgen::GenDiagram»
-	«EXPAND xpt::Common::generatedMemberComment»
-	private org.eclipse.emf.ecore.EObject getSemanticElement(org.eclipse.core.runtime.IAdaptable semanticAdapter) {
-		if (semanticAdapter == null) {
-			return null;
-		}
-		org.eclipse.emf.ecore.EObject eObject = (org.eclipse.emf.ecore.EObject) semanticAdapter.getAdapter(org.eclipse.emf.ecore.EObject.class);
-		if (eObject != null) {
-			return org.eclipse.gmf.runtime.emf.core.util.EMFCoreUtil.resolve(org.eclipse.emf.transaction.util.TransactionUtil.getEditingDomain(eObject), eObject);
-		}
-		return null;
-	}
-«ENDDEFINE»
-
-«DEFINE getSemanticElementTypeMethod FOR gmfgen::GenDiagram»
-«EXPAND xpt::Common::generatedMemberComment»
-private org.eclipse.gmf.runtime.emf.type.core.IElementType getSemanticElementType(org.eclipse.core.runtime.IAdaptable semanticAdapter) {
-	if (semanticAdapter == null) {
-		return null;
-	}
-	return (org.eclipse.gmf.runtime.emf.type.core.IElementType) semanticAdapter.getAdapter(org.eclipse.gmf.runtime.emf.type.core.IElementType.class);
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR gmfgen::GenDiagram»«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/extensions.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/extensions.xpt
deleted file mode 100644
index e5b3d5ee761..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/extensions.xpt
+++ /dev/null
@@ -1,207 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GenModel'»
-«EXTENSION xpt::diagram::Utils»
-
-«DEFINE extensions FOR gmfgen::GenDiagram-»
-
-   <extension point="org.eclipse.gmf.runtime.diagram.core.viewProviders" id="view-provider">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <viewProvider class="«getNotationViewProviderQualifiedClassName()»">
-         <Priority name="«notationViewProviderPriority»"/>
-«IF shortcutsProvidedFor->notEmpty() /*allow provider activation when another diagram tries to create a node, perhaps ours*/-»
-         <object id="referencing-diagrams" class="org.eclipse.gmf.runtime.notation.Diagram">
-            <method name="getType()" value="«FOREACH shortcutsProvidedFor AS s SEPARATOR ','»«s»«ENDFOREACH»"/>
-         </object>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" containerViews="referencing-diagrams"/>
-«ENDIF-»
-         <context viewClass="org.eclipse.gmf.runtime.notation.Diagram" semanticHints="«editorGen.modelID»"/>
-         <context viewClass="org.eclipse.gmf.runtime.notation.Node" semanticHints="«FOREACH getAllNodes() /*XXX can further improve selection using containerViews attribute, however, when top-node is created, provider is activated and this xml is not consulted any longer*/ AS n SEPARATOR ','»«n.visualID»«ENDFOREACH»"/>
-«IF links->notEmpty() /*it is unlikely there would be a diagram without a node, but a diagram without links deemed possible */-»
-         <context viewClass="org.eclipse.gmf.runtime.notation.Edge" semanticHints="«FOREACH links AS l SEPARATOR ','»«l.visualID»«ENDFOREACH»"/>
-«ENDIF-»
-      </viewProvider>
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.diagram.ui.editpartProviders" id="ep-provider">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <editpartProvider class="«getEditPartProviderQualifiedClassName()»">
-         <Priority name="«editPartProviderPriority»"/>
-         <object class="org.eclipse.gmf.runtime.notation.Diagram" id="generated-diagram">
-            <method name="getType()" value="«editorGen.modelID»"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-nodes">
-            <method name="getType()" value="«FOREACH getAllNodes() AS n SEPARATOR ','»«n.visualID»«ENDFOREACH»"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Edge" id="generated-links">
-            <method name="getType()" value="«FOREACH links AS l SEPARATOR ','»«l.visualID»«ENDFOREACH»"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-labels">
-            <method name="getType()" value="«FOREACH getAllNodes().labels AS lb SEPARATOR ','»«lb.visualID»«ENDFOREACH»"/>
-         </object>
-         <object class="org.eclipse.gmf.runtime.notation.Node" id="generated-compartments">
-            <method name="getType()" value="«FOREACH compartments AS c SEPARATOR ','»«c.visualID»«ENDFOREACH»"/>
-         </object>
-         <context views="generated-diagram,generated-nodes,generated-links,generated-labels,generated-compartments"/>
-      </editpartProvider>
-   </extension>
-
-   «EXPAND modelingAssistantProvider»
-
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.iconProviders" id="icon-provider">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <IconProvider class="«getIconProviderQualifiedClassName()»">
-         <Priority name="«iconProviderPriority»"/>
-      </IconProvider>
-   </extension>
-«IF editorGen.labelParsers <> null and editorGen.labelParsers.extensibleViaService»
-   <extension point="org.eclipse.gmf.runtime.common.ui.services.parserProviders" id="parser-provider">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <ParserProvider class="«editorGen.labelParsers.getQualifiedClassName()»">
-         <Priority name="«editorGen.labelParsers.providerPriority»"/>
-      </ParserProvider>
-   </extension>
-«ENDIF-»
-«IF generateShortcutIcon()»
-   <extension point="org.eclipse.gmf.runtime.diagram.ui.decoratorProviders" id="decorator-provider">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <decoratorProvider class="«getShortcutsDecoratorProviderQualifiedClassName()»">
-         <Priority name="«shortcutsDecoratorProviderPriority»"/>
-         <object class="org.eclipse.gmf.runtime.notation.Node(org.eclipse.gmf.runtime.notation)" id="generated-top-nodes">
-            <method name="getType()" value="«FOREACH topLevelNodes->asSequence() /*generated code supports shortcuts only to top-level nodes*/ AS n SEPARATOR ','»«n.visualID»«ENDFOREACH»"/>
-         </object>
-         <context decoratorTargets="generated-top-nodes"/>
-      </decoratorProvider>
-   </extension>
-«ENDIF-»
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypes" id="element-types">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-«FOREACH getAllTypedElements() AS e-»
-«EXPAND elementTypeSafe FOR e.elementType-»
-«ENDFOREACH-»
-   </extension>
-
-   <extension point="org.eclipse.gmf.runtime.emf.type.core.elementTypeBindings" id="element-types-bindings">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <clientContext id="«editorGen.plugin.iD».TypeContext">
-         <enablement>
-            <test
-               property="org.eclipse.gmf.runtime.emf.core.editingDomain"
-               value="«editingDomainID»"/>
-         </enablement>
-      </clientContext> 
-      <binding context="«editorGen.plugin.iD».TypeContext">
-«FOREACH getAllTypedElements() AS e-»
-         <elementType ref="«e.elementType.uniqueIdentifier»"/>
-«ENDFOREACH-»
-         <advice ref="org.eclipse.gmf.runtime.diagram.core.advice.notationDepdendents"/>
-      </binding>
-   </extension>
-«ENDDEFINE»
-
-«DEFINE elementTypeSafe FOR gmfgen::ElementType-»
-«IF not definedExternally-»
-«EXPAND elementType-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE elementType FOR gmfgen::ElementType»
-«ERROR 'Unknown element type: ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE elementType FOR gmfgen::MetamodelType-»
-      <metamodel nsURI="«getMetaClass().genPackage.ecorePackage.nsURI»">
-         <metamodelType
-               id="«uniqueIdentifier»"
-«IF null <> displayName-»
-               name="%metatype.name.«diagramElement.getUniqueIdentifier()»"
-«ENDIF-»
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
-               eclass="«getMetaClass().ecoreClass.name»"
-               edithelper="«getEditHelperQualifiedClassName()»">
-            <param name="semanticHint" value="«diagramElement.visualID»"/>
-         </metamodelType>
-      </metamodel>
-«ENDDEFINE»
-
-«DEFINE elementType FOR gmfgen::SpecializationType-»
-«IF null = getMetamodelClass()-»
-«EXPAND specializationType-»
-«ELSE-»
-      <metamodel nsURI="«getMetamodelClass().genPackage.ecorePackage.nsURI»">
-«EXPAND specializationType-»
-      </metamodel>
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE specializationType FOR gmfgen::SpecializationType-»
-         <specializationType
-               id="«uniqueIdentifier»"
-«IF null <> displayName-»
-               name="%metatype.name.«diagramElement.getUniqueIdentifier()»"
-«ENDIF-»
-               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"«IF editHelperAdviceClassName <> null»
-               edithelperadvice="«getEditHelperAdviceQualifiedClassName()»"«ENDIF»>
-            <specializes id="«(if null = metamodelType then 'org.eclipse.gmf.runtime.emf.type.core.null' else metamodelType.uniqueIdentifier endif)»"/>
-            <param name="semanticHint" value="«diagramElement.visualID»"/>
-         </specializationType>
-«ENDDEFINE»
-
-«DEFINE elementType FOR gmfgen::NotationType-»
-      <specializationType
-            id="«uniqueIdentifier»"
-«IF null <> displayName-»
-            name="%metatype.name.«diagramElement.getUniqueIdentifier()»"
-«ENDIF-»
-            kind="org.eclipse.gmf.runtime.diagram.ui.util.INotationType">
-         <specializes id="org.eclipse.gmf.runtime.emf.type.core.null"/>
-         <param name="semanticHint" value="«diagramElement.visualID»"/>
-      </specializationType>
-«ENDDEFINE»
-
-«DEFINE modelingAssistantProvider FOR gmfgen::GenDiagram»
-   <extension point="org.eclipse.gmf.runtime.emf.ui.modelingAssistantProviders" id="modelassist-provider">
-      «EXPAND xpt::Common::xmlGeneratedTag»
-      <modelingAssistantProvider class="«EXPAND modelingAssistantProviderQualifiedClassName FOR self»">
-         <Priority name="«self.modelingAssistantProviderPriority»"/>
-         <object class="«getEditPartQualifiedClassName()»" id="«self.getUniqueIdentifier()»"/>
-         <context elements="«self.getUniqueIdentifier()»"/>
-      </modelingAssistantProvider>
-      «FOREACH self.getAllNodes() AS n-»
-      <modelingAssistantProvider class="«EXPAND modelingAssistantProviderQualifiedClassName FOR n»">
-         <Priority name="«n.getDiagram().modelingAssistantProviderPriority»"/>
-         <object class="«n.getEditPartQualifiedClassName()»" id="«n.getUniqueIdentifier()»"/>
-         <context elements="«n.getUniqueIdentifier()»"/>
-      </modelingAssistantProvider>
-      «ENDFOREACH»
-   </extension>
-«ENDDEFINE»
-
-«DEFINE modelingAssistantProviderQualifiedClassName FOR gmfgen::GenContainerBase»«REM»NO-OP, all specific subclasses should be handled«ENDREM»«ENDDEFINE»
-«DEFINE modelingAssistantProviderQualifiedClassName FOR gmfgen::GenDiagram»«EXPAND xpt::providers::EditPartModelingAssistantProvider::qualifiedClassName»«ENDDEFINE»
-«DEFINE modelingAssistantProviderQualifiedClassName FOR gmfgen::GenNode»«EXPAND xpt::providers::EditPartModelingAssistantProvider::qualifiedClassName»«ENDDEFINE»
-
-«DEFINE i18n FOR gmfgen::GenDiagram-»
-
-# Providers
-«EXPAND internal_i18n FOREACH getAllTypedElements().elementType»
-«ENDDEFINE»
-
-«DEFINE internal_i18n FOR gmfgen::ElementType-»
-«IF null <> displayName and not definedExternally»metatype.name.«diagramElement.getUniqueIdentifier()»=«displayName»«ENDIF»
-«ENDDEFINE»
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/i18n.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/i18n.qvto
deleted file mode 100644
index 701de630abc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.codegen/templates/xpt/providers/i18n.qvto
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Anna Karjakina (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-modeltype gmfgen uses "http://www.eclipse.org/papyrus/gmf/2020/GenModel";
-
-library i18n;
-
-helper i18nKeyForModelingAssistantProvider(diagram : gmfgen::GenDiagram) : String { return diagram.modelingAssistantProviderClassName }
-helper titleKey(dialogKey : String) : String { return dialogKey + 'Title' }
-helper messageKey(dialogKey : String) : String { return dialogKey + 'Message' }
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/META-INF/MANIFEST.MF
index 22c5922b9df..109c883ed30 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/META-INF/MANIFEST.MF
@@ -6,59 +6,36 @@ Bundle-SymbolicName: org.eclipse.papyrus.gmf.common
 Bundle-Version: 1.3.0.qualifier
 Export-Package: org.eclipse.papyrus.gmf.common,
  org.eclipse.papyrus.gmf.common.codegen,
- org.eclipse.papyrus.gmf.internal.codegen.dispatch;x-friends:="org.eclipse.papyrus.gmf.codegen,org.eclipse.papyrus.gmf.graphdef.codegen,org.eclipse.papyrus.gmf.codegen.lite",
+ org.eclipse.papyrus.gmf.internal.codegen.dispatch;x-friends:="org.eclipse.papyrus.gmf.codegen",
  org.eclipse.papyrus.gmf.internal.common;
   x-friends:="org.eclipse.papyrus.gmf.codegen.edit,
-   org.eclipse.papyrus.gmf.graphdef.edit,
-   org.eclipse.papyrus.gmf.map.edit,
-   org.eclipse.papyrus.gmf.tooldef.edit,
-   org.eclipse.papyrus.gmf.bridge.trace,
-   org.eclipse.papyrus.gmf.bridge.ui,
-   org.eclipse.papyrus.gmf.bridge,
-   org.eclipse.gmf.tests,
-   org.eclipse.papyrus.gmf.bridge.ui.dashboard,
    org.eclipse.papyrus.gmf.codegen.ui,
-   org.eclipse.papyrus.gmf.codegen.lite.ui,
-   org.eclipse.papyrus.gmf.codegen,
-   org.eclipse.papyrus.gmf.map,
-   org.eclipse.papyrus.gmf.graphdef,
-   org.eclipse.papyrus.gmf.tooldef",
+   org.eclipse.papyrus.gmf.codegen",
  org.eclipse.papyrus.gmf.internal.common.codegen;
   x-friends:="org.eclipse.papyrus.gmf.codegen,
-   org.eclipse.papyrus.gmf.graphdef.codegen,
-   org.eclipse.papyrus.gmf.bridge,
-   org.eclipse.papyrus.gmf.codegen.lite,
-   org.eclipse.gmf.tests,
    org.eclipse.papyrus.gmf.codegen.ui,
-   org.eclipse.papyrus.gmf.codegen.lite.ui,
-   org.eclipse.gmf.tests.lite,
-   org.eclipse.papyrus.gmf.graphdef.codegen.ui,
    org.eclipse.papyrus.gmf.codegen.xtend.ui,
-   org.eclipse.papyrus.gmf.codegen.xtend,
-   org.eclipse.gmf.tooling.codegen.launcher",
+   org.eclipse.papyrus.gmf.codegen.xtend",
  org.eclipse.papyrus.gmf.internal.common.migrate;
   x-friends:="org.eclipse.papyrus.gmf.codegen.ui,
-   org.eclipse.gmf.tests,
-   org.eclipse.papyrus.gmf.codegen,
-   org.eclipse.papyrus.gmf.map,
-   org.eclipse.papyrus.gmf.bridge.ui,
-   org.eclipse.papyrus.gmf.graphdef",
- org.eclipse.papyrus.gmf.internal.common.reconcile;x-friends:="org.eclipse.gmf.tests,org.eclipse.papyrus.gmf.codegen,org.eclipse.papyrus.gmf.bridge.ui",
+   org.eclipse.papyrus.gmf.codegen",
+ org.eclipse.papyrus.gmf.internal.common.reconcile;x-friends:="org.eclipse.papyrus.gmf.codegen",
  org.eclipse.papyrus.gmf.internal.common.ui
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.emf.common.ui;bundle-version="[2.3.0,3.0.0)",
  org.eclipse.emf.codegen;bundle-version="[2.3.0,3.0.0)",
  org.eclipse.emf.codegen.ecore;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.swt;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.xtext.xbase.lib;bundle-version="[2.24.0,3.0.0)"
+ org.eclipse.xtext.xbase.lib;bundle-version="[2.24.0,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.3.0,3.0.0)",
+ org.eclipse.emf.edit.ui;bundle-version="[2.3.0,3.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Activator: org.eclipse.papyrus.gmf.internal.common.Activator
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/Activator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/Activator.java
index e97a784dc1a..8ace7a5ba7f 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/Activator.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/Activator.java
@@ -11,6 +11,7 @@
  * Contributors: 
  *    Artem Tikhomirov (Borland) - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to gmfgraph and ModelViewMap
  *****************************************************************************/
 package org.eclipse.papyrus.gmf.internal.common;
 import org.eclipse.core.runtime.IStatus;
@@ -52,4 +53,14 @@ public class Activator extends Plugin {
 		}
 		log(new Status(IStatus.ERROR, getID(), 0, message, ex));
 	}
+	
+
+	public static IStatus createStatus(int statusCode, String message, Throwable ex) {
+		return new Status(statusCode, getID(), 0, message, ex);
+	}
+
+	public static IStatus createError(String message, Throwable ex) {
+		return createStatus(IStatus.ERROR, message, ex);
+	}
+
 }
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/codegen/XpandClassEmitter.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/codegen/XpandClassEmitter.java
deleted file mode 100644
index b0e7499bcac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/codegen/XpandClassEmitter.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2013, 2020, 2021 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Svyatoslav Kovalsky (Montages) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *    Etienne ALLOGO (ARTAL) - etienne.allogo@artal.fr - Bug 569174 - newline characters preference api consistency
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.common.codegen;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Map;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-
-
-public class XpandClassEmitter extends XpandTextEmitter implements JavaClassEmitter {
-
-	public XpandClassEmitter(ResourceManager manager, String templateFQN, String methodToInvoke) {
-		this(manager, templateFQN, methodToInvoke, null);
-	}
-
-	public XpandClassEmitter(ResourceManager manager, String templateFQN, String methodToInvoke, Map<String, Object> globals) {
-		super(manager, templateFQN, methodToInvoke, globals);
-	}
-
-	public String getQualifiedClassName(String lineSeparator, Object... input) throws UnexpectedBehaviourException {
-		return getQualifiedClassName("qualifiedClassName", lineSeparator, input);
-	}
-
-	public String getQualifiedClassName(String fqnMethodName, String lineSeparator, Object... input) throws UnexpectedBehaviourException {
-		return getText(fqnMethodName, lineSeparator, input);
-	}
-	
-	private String getText(String method,Object... input) throws UnexpectedBehaviourException {
-		try {
-			return this.generate(new NullProgressMonitor(),method, input).trim();
-		} catch (InvocationTargetException e) {
-			throw new UnexpectedBehaviourException("Invocation method exception "+ method + " on template " + getTemplateFQN(), e);
-		} catch (InterruptedException e) {
-			throw new UnexpectedBehaviourException("Execute method exception "+ method + " on template " + getTemplateFQN(), e);
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/codegen/XpandTextEmitter.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/codegen/XpandTextEmitter.java
deleted file mode 100644
index 5d9b65d8510..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/codegen/XpandTextEmitter.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020, 2021 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *    Etienne ALLOGO (ARTAL) - etienne.allogo@artal.fr - Bug 569174 - newline characters preference api consistency
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.common.codegen;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
-import org.eclipse.papyrus.gmf.common.codegen.ImportAssistant;
-import org.eclipse.papyrus.gmf.internal.xpand.BufferOutput;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-import org.eclipse.papyrus.gmf.internal.xpand.XpandFacade;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AmbiguousDefinitionException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Scope;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-
-/**
- * @author artem
- */
-public class XpandTextEmitter implements TextEmitter {
-	public final String PATH_SEPARATOR = "::";
-	
-	private final ResourceManager myResourceManager;
-	private final String myTemplateFQN;
-	private final String myMethod;
-	private final List<Variable> myGlobals;
-
-	public XpandTextEmitter(ResourceManager manager, String templateFQN, String method) {
-		this(manager, templateFQN, method, null);
-	}
-
-	public XpandTextEmitter(ResourceManager manager, String templateFQN, String method,Map<String, Object> globals) {
-		assert manager != null && templateFQN != null;
-		myResourceManager = manager;
-		myTemplateFQN = templateFQN;
-		myMethod = method;
-		if (globals != null && globals.size() > 0) {
-			myGlobals = new ArrayList<Variable>(globals.size());
-			for (Map.Entry<String, Object> e : globals.entrySet()) {
-				assert e.getValue() instanceof EObject;
-				myGlobals.add(new Variable(e.getKey(), ((EObject) e.getValue()).eClass(), e.getValue()));
-			}
-		} else {
-			myGlobals = Collections.<Variable>emptyList();
-		}
-	}
-
-	@Override
-	public String generate(IProgressMonitor monitor, Object[] arguments, String lineSeparator) throws InterruptedException, InvocationTargetException, UnexpectedBehaviourException {
-		return generate(monitor, myMethod, arguments);
-	}
-	
-	protected String generate(IProgressMonitor monitor, String method, Object[] arguments) throws InterruptedException, InvocationTargetException {
-		if (monitor != null && monitor.isCanceled()) {
-			throw new InterruptedException();
-		}
-		try {
-			StringBuilder result = new StringBuilder();
-			new XpandFacade(createContext(result)).evaluate(myTemplateFQN + PATH_SEPARATOR + method, extractTarget(arguments), extractArguments(arguments));
-			return result.toString();
-		} catch (EvaluationException ex) {
-			throw new InvocationTargetException(ex);
-		} catch (AmbiguousDefinitionException e) {
-			throw new InvocationTargetException(e);
-		}
-	}
-
-	public ResourceManager getResourceManager() {
-		return myResourceManager;
-	}
-	
-	protected Object extractTarget(Object[] arguments) {
-		assert arguments != null && arguments.length > 0;
-		return arguments[0];
-	}
-
-	protected String getTemplateFQN() {
-		return myTemplateFQN;
-	}
-	
-	protected Object[] extractArguments(Object[] arguments) {
-		assert arguments != null && arguments.length > 0;
-		ArrayList<Object> res = new ArrayList<Object>(arguments.length);
-		// strip first one off, assume it's target
-		for (int i = 1; i < arguments.length; i++) {
-			if (false == arguments[i] instanceof ImportAssistant) {
-				// strip assistant off
-				res.add(arguments[i]);
-			}
-		}
-		return res.toArray();
-	}
-
-	private Scope createContext(StringBuilder result) {
-		return new Scope(myResourceManager, myGlobals, new BufferOutput(result));
-	}
-	
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/Messages.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/Messages.java
index caca93ef3a1..aba0fb8ed29 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/Messages.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/Messages.java
@@ -47,6 +47,10 @@ public class Messages extends NLS {
 
 	public static String PredefinedModelExtensionPredefinedModels;
 
+	public static String ValidationHelper_e_marker_creation;
+
+	public static String ValidationHelper_task_validate;
+
 	static {
 		// initialize resource bundle
 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ValidationHelper.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/ValidationHelper.java
index 8c281b7b6ed..541ddac51d8 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.bridge.ui/src/org/eclipse/papyrus/gmf/internal/bridge/transform/ValidationHelper.java
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/ValidationHelper.java
@@ -10,8 +10,10 @@
  * 
  * Contributors:  dvorak - initial API and implementation
  *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
+ *    Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to gmfgraph and ModelViewMap
  *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.bridge.transform;
+
+package org.eclipse.papyrus.gmf.internal.common.ui;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -42,11 +44,12 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.IItemLabelProvider;
 import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.papyrus.gmf.internal.bridge.ui.Plugin;
+import org.eclipse.papyrus.gmf.internal.common.Activator;
 
 /**
  * Provides various functinality useful for model validation, for instances
  * progress monitoring, resource markers creation.
+ * from old org.eclipse.papyrus.gmf.internal.bridge.transform
  */
 public class ValidationHelper {
 
@@ -380,8 +383,8 @@ public class ValidationHelper {
 				markerHelper.createMarkers(diagnostic);
 			}
 		} catch (CoreException e) {
-			IStatus status = Plugin.createError(Messages.ValidationHelper_e_marker_creation, e);
-			Plugin.log(status);
+			IStatus status = Activator.createError(Messages.ValidationHelper_e_marker_creation, e);
+			Activator.log(status);
 		}
 		DiagnosticMarkerMap markerMap = new DiagnosticMarkerMap(markerHelper.getDiagnostic2MarkerMap());
 		
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/messages.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/messages.properties
index 90b99df5319..d2c95aba64e 100644
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/messages.properties
+++ b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.common/src/org/eclipse/papyrus/gmf/internal/common/ui/messages.properties
@@ -21,3 +21,5 @@ ModelSelectionPageModelNA=Model is not accessible.
 ModelSelectionPageErrorLoadingModel=Error loading model: {0}
 PredefinedModelExtensionPredefinedModels=Use one of the predefined models:
 CreateNewModelExtensionCreateNewModel=Create new model
+ValidationHelper_task_validate=Validating ...
+ValidationHelper_e_marker_creation=Marker creation failure
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.project
deleted file mode 100644
index 9b82884f7c7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.graphdef.codegen.ui</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 805f613c2e1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.graphdef.codegen.ui;singleton:=true
-Bundle-Version: 1.3.0.qualifier
-Bundle-Localization: plugin
-Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.pde.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jface;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.pde.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.papyrus.gmf.graphdef.codegen;bundle-version="[2.9.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.papyrus.gmf.common;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.ui.forms;bundle-version="[3.3.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;x-friends:="org.eclipse.papyrus.gmf.codegen.ui"
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/build.properties
deleted file mode 100644
index 127fd06debf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-bin.includes = icons/,\
-               .,\
-               META-INF/,\
-               plugin.properties,\
-               plugin.xml,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/icons/obj16/GMFGraphModelFile.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/icons/obj16/GMFGraphModelFile.gif
deleted file mode 100644
index 6984fd461e8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/icons/obj16/GMFGraphModelFile.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/plugin.properties
deleted file mode 100644
index 876ecd245cb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-pluginName = Papyrus Graphical Definition Code Generator UI Support
-providerName=Eclipse Modeling Project
-
-wizard.name = Figure definitions converter
-wizard.description = Converts an existing instance of the gmfgraph model into plugin code
-
-generateAction.label=Generate Figures Plug-in ...
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/plugin.xml
deleted file mode 100644
index df4faee055a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/plugin.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-	<extension point="org.eclipse.pde.ui.pluginContent">
-   		<wizard
-   			id="org.eclipse.papyrus.gmf.graphdef.codegen.ui.FigureConverter.NoUI"
-   			name="%wizard.name"
-   			icon="/icons/obj16/GMFGraphModelFile.gif"
-   			ui-content="false"
-   			requiresActivator="true"
-   			class="org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui.FigureGeneratorWizard">
-   			<description>%wizard.description</description>
-   		</wizard>	
-	</extension>
- <extension
-       id="gmf.graphdef.codegen.ui.menus"
-       point="org.eclipse.ui.popupMenus">
-    <objectContribution
-          adaptable="true"
-          id="gmf.graphdef.codegen.ui.menus.modelFile"
-          nameFilter="*.gmfgraph"
-          objectClass="org.eclipse.core.resources.IFile">
-       <action
-             class="org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui.GeneratePluginAction"
-             enablesFor="+"
-             id="gmf.graphdef.codegen.ui.generatePlugin"
-             label="%generateAction.label"
-             menubarPath="additions"/>
-    </objectContribution>
- </extension>
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/pom.xml
deleted file mode 100644
index 4a0e15f890d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-  <artifactId>org.eclipse.papyrus.gmf.graphdef.codegen.ui</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-  
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-  
-  	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-  
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterOptions.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterOptions.java
deleted file mode 100644
index ff74f675212..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterOptions.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;
-
-/**
- * @author artem
- */
-public class ConverterOptions {
-
-	public boolean needMirroredCanvas;
-	public boolean needMirroredGalleries;
-	public boolean separateMirrorFiles;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterOutcome.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterOutcome.java
deleted file mode 100644
index 6438693bb85..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterOutcome.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;
-
-import java.io.IOException;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.Processor;
-import org.eclipse.papyrus.gmf.internal.graphdef.codegen.CanvasProcessor;
-import org.eclipse.papyrus.gmf.internal.graphdef.codegen.GalleryMirrorProcessor;
-import org.eclipse.papyrus.gmf.internal.graphdef.codegen.GalleryProcessor;
-
-
-/**
- * @author artem
- */
-class ConverterOutcome {
-
-	private final ConverterOptions myOptions;
-	private Processor myProcessor;
-	private final Resource[] myInput;
-
-	public ConverterOutcome(ConverterOptions options, Resource[] input) {
-		myOptions = options;
-		myInput = input;
-	}
-
-	public IStatus checkInputAgainstOptions() {
-		if (myOptions.needMirroredCanvas) {
-			Canvas[] c = findCanvases(myInput);
-			if (c.length == 0) {
-				return newError("Need canvas instance", null);
-			} else if (c.length > 1) {
-				return newError("Need exactly one canvas instance", null);
-			}
-		} else if (myOptions.needMirroredGalleries) {
-			FigureGallery[] figures = findFigures(myInput);
-			if (figures.length == 0) {
-				return newError("Need at least one figure gallery", null);
-			}
-		}
-		return Status.OK_STATUS;
-	}
-
-	public Processor getProcessor() {
-		if (myProcessor == null) {
-			myProcessor = createProcessor();
-		}
-		return myProcessor;
-	}
-
-	private Processor createProcessor() {
-		if (myOptions.needMirroredCanvas) {
-			return new CanvasProcessor(inputAsCanvas());
-		} else if (myOptions.needMirroredGalleries) {
-			return new GalleryMirrorProcessor(inputAsGalleries());
-		} else {
-			return new GalleryProcessor(inputAsGalleries());
-		}
-	}
-
-	private FigureGallery[] inputAsGalleries() {
-		return findFigures(myInput);
-	}
-
-	private Canvas inputAsCanvas() {
-		return findCanvases(myInput)[0];
-	}
-
-	public IStatus createResources(ResourceSet rs, URI galleryResourceURI, URI mirroredCanvasURI) {
-		assert rs != null && galleryResourceURI != null && mirroredCanvasURI != null;
-		Resource canvasResource = null;
-		Resource galleryResource = null;
-		if (myOptions.needMirroredCanvas) {
-			// need mirroredCanvas enforces mirrored galleries.
-			// the only difference with galleries in this case is where to put them - either 
-			// separate resource or not. 
-			Canvas mirror = ((CanvasProcessor) getProcessor()).getOutcome();
-			canvasResource = rs.createResource(mirroredCanvasURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-			canvasResource.getContents().add(mirror);
-			if (myOptions.needMirroredGalleries && myOptions.separateMirrorFiles) {
-				// sic! - respect separate mirror files only if explicitly asked to mirror galleries
-				// because separateMirrorFiles could be true when value for galleryOutputPath not set
-				galleryResource = rs.createResource(galleryResourceURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-				// XXX make sure we support containments in different resources
-				galleryResource.getContents().addAll(mirror.getFigures());
-			}
-			
-		} else if (myOptions.needMirroredGalleries) {
-			galleryResource = rs.createResource(galleryResourceURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-			GalleryMirrorProcessor processor = (GalleryMirrorProcessor) getProcessor();
-			galleryResource.getContents().add(processor.convertFigureGallery());
-		}
-		try {
-			if (galleryResource != null) {
-				galleryResource.save(null);
-			}
-			if (canvasResource != null) {
-				canvasResource.save(null);
-			}
-		} catch (IOException ex) {
-			return newError(ex.getMessage(), ex);
-		}
-		return Status.OK_STATUS;
-	}
-
-	private static Status newError(String message, Exception ex) {
-		return new Status(IStatus.ERROR, "org.eclipse.papyrus.gmf.graphdef.codegen.ui", 0, message, ex);
-	}
-
-	private static FigureGallery[] findFigures(Resource[] resources) {
-		ArrayList<FigureGallery> rv = new ArrayList<FigureGallery>();
-		for (int i = 0; i < resources.length; i++) {
-			for(TreeIterator<EObject> it = resources[i].getAllContents(); it.hasNext();) {
-				EObject next = it.next();
-				// FigureGallery could be either top element or as a child of canvas
-				if (next.eClass().getClassifierID() == GMFGraphPackage.FIGURE_GALLERY) {
-					rv.add((FigureGallery) next);
-					it.prune();
-				} else if (next.eClass().getClassifierID() != GMFGraphPackage.CANVAS) {
-					it.prune();
-				}
-			}
-		}
-		return rv.toArray(new FigureGallery[rv.size()]);
-	}
-
-	private static Canvas[] findCanvases(Resource[] resources) {
-		ArrayList<Canvas> rv = new ArrayList<Canvas>();
-		for (int i = 0; i < resources.length; i++) {
-			for(EObject next : resources[i].getContents()) {
-				if (next.eClass().getClassifierID() == GMFGraphPackage.CANVAS) {
-					rv.add((Canvas) next);
-				}
-			}
-		}
-		return rv.toArray(new Canvas[rv.size()]);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterSection.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterSection.java
deleted file mode 100644
index 8cf0e44548c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/ConverterSection.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.Collections;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.osgi.util.ManifestElement;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator;
-import org.eclipse.pde.core.plugin.IPluginImport;
-import org.eclipse.pde.core.plugin.IPluginModel;
-import org.eclipse.pde.core.plugin.IPluginReference;
-import org.eclipse.pde.ui.IFieldData;
-import org.eclipse.pde.ui.templates.BooleanOption;
-import org.eclipse.pde.ui.templates.OptionTemplateSection;
-import org.eclipse.pde.ui.templates.TemplateOption;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-
-public class ConverterSection extends OptionTemplateSection {
-	private static final String MY_PLUGIN_ID = "org.eclipse.papyrus.gmf.graphdef.codegen.ui";
-	private static final String SECTION_ID = "org.eclipse.papyrus.gmf.graphdef.codegen.ui.ConverterSection";
-	private static final int THE_ONLY_PAGE_INDEX = 0;
-	
-	public static final String OPTION_MAIN_PACKAGE_NAME = SECTION_ID + ".mainPackageName";
-	public static final String OPTION_NEEDS_MAP_MODE = SECTION_ID + ".needsMapMode";
-	public static final String OPTION_USE_RUNTIME_FIGURES = SECTION_ID + ".useRuntimeFigures";
-	public static final String OPTION_INPUT_RESOURCE_FULL_PATH = SECTION_ID + ".inputResource";
-	public static final String OPTION_OUTPUT_GALLERY_FULL_PATH = SECTION_ID + ".outputGallery";
-	public static final String OPTION_OUTPUT_DIAGRAM_ELEMENTS_FULL_PATH = SECTION_ID + ".outputDiagramElements";
-	
-	private TemplateOption myPackageNameOption;
-	private FileNameOption myInputPathOption;
-	private FileNameOption myOutputGalleryPathOption;
-	private FileNameOption myOutputDiagramElementsPathOption;
-	private final InputValidationState myCachedInputValidationState;
-	private BooleanOption myNeedsMapModeOption;
-	private BooleanOption myUseRuntimeFiguresOption;
-	private final boolean shouldWarnLiteVerstionDoesNotSupportMapMode;
-	private ManifestElement[] myRequiredBundles;
-	
-	public ConverterSection(){
-		setPageCount(THE_ONLY_PAGE_INDEX + 1);
-		myPackageNameOption = addOption(OPTION_MAIN_PACKAGE_NAME, "Generate figures package", null, THE_ONLY_PAGE_INDEX);
-		myInputPathOption = addFileNameOption(false, OPTION_INPUT_RESOURCE_FULL_PATH, "Input GMFGraph instance", "", THE_ONLY_PAGE_INDEX);
-		myOutputGalleryPathOption = addFileNameOption(true, OPTION_OUTPUT_GALLERY_FULL_PATH, "Create Figure Gallery", "", THE_ONLY_PAGE_INDEX);
-		myOutputGalleryPathOption.setRequired(false);
-		myOutputDiagramElementsPathOption = addFileNameOption(true, OPTION_OUTPUT_DIAGRAM_ELEMENTS_FULL_PATH, "Mirror diagram elements", "", THE_ONLY_PAGE_INDEX);
-		myOutputDiagramElementsPathOption.setRequired(false);
-		myNeedsMapModeOption = (BooleanOption) addOption(OPTION_NEEDS_MAP_MODE, "Use IMapMode", false, THE_ONLY_PAGE_INDEX);
-		myUseRuntimeFiguresOption = (BooleanOption) addOption(OPTION_USE_RUNTIME_FIGURES, "Use Enhanced Figures", true, THE_ONLY_PAGE_INDEX);
-		myCachedInputValidationState = new InputValidationState(myOutputGalleryPathOption, myOutputDiagramElementsPathOption);
-		shouldWarnLiteVerstionDoesNotSupportMapMode = Platform.getBundle("org.eclipse.papyrus.gmf.codegen.lite") != null;
-	}
-	
-	public void addPages(Wizard wizard) {
-		super.addPages(wizard);
-		WizardPage page = createPage(THE_ONLY_PAGE_INDEX);
-		page.setDescription("Converts an existing instance of the gmfgraph model into plugin code");
-		page.setTitle("Figure definitions converter");
-		wizard.addPage(page);
-		markPagesAdded();
-		validateOptions(myPackageNameOption);
-	}
-
-	public IPluginReference[] getDependencies(String schemaVersion) {
-		// no explicit dependencies
-		return new IPluginReference[0];
-	}
-
-	protected void generateFiles(IProgressMonitor monitor) throws CoreException {
-		Resource input = loadResource(myInputPathOption.getText());
-		StandaloneGenerator.Config config = new StandaloneGeneratorConfigAdapter(this);
-		final ConverterOptions options = newConverterOptions();
-		final ConverterOutcome converterOutcome = new ConverterOutcome(options, new Resource[] {input});
-		assert converterOutcome.checkInputAgainstOptions().isOK();
-		StandaloneGenerator generator = new StandaloneGenerator(converterOutcome.getProcessor(), config);
-		generator.setSkipPluginStructure(false);
-		try {
-			generator.run(new SubProgressMonitor(monitor, 1));
-			readRequiredBundles();
-			// XXX readBuildProperties() and use getNewFiles to propagate
-			// XXX readPluginProperties(), use ??? 
-			if (!generator.getRunStatus().isOK()){
-				throw new CoreException(generator.getRunStatus());
-			}
-			IStatus s = converterOutcome.createResources(new ResourceSetImpl(), URI.createFileURI(myOutputGalleryPathOption.getText()), URI.createFileURI(myOutputDiagramElementsPathOption.getText()));
-			if (s.getSeverity() == IStatus.ERROR) {
-				throw new CoreException(s);
-			}
-		} catch (InterruptedException e) {
-			String message = e.getMessage();
-			if (message == null){
-				message = "Interrupted";
-			}
-			throw new CoreException(new Status(IStatus.ERROR, MY_PLUGIN_ID, 0, message, e)); 
-		} catch (IOException ex) {
-			// perhaps, don't need to treat this as error? 
-			throw new CoreException(new Status(IStatus.ERROR, MY_PLUGIN_ID, 0, "Failed to read generated manifest.mf", ex));
-		} finally {
-			input.unload();
-		}
-	}
-
-	private ConverterOptions newConverterOptions() {
-		final ConverterOptions options = new ConverterOptions();
-		options.needMirroredGalleries = shouldGenerate(myOutputGalleryPathOption);
-		options.needMirroredCanvas = shouldGenerate(myOutputDiagramElementsPathOption);
-		options.separateMirrorFiles = options.needMirroredCanvas && myOutputGalleryPathOption.getText().equals(myOutputDiagramElementsPathOption.getText());
-		return options;
-	}
-	
-	private static boolean shouldGenerate(FileNameOption option){
-		return option.isEnabled() && !option.isEmpty();
-	}
-	
-	private void readRequiredBundles() throws CoreException, IOException {
-		try {
-			IFile f = findGeneratedManifest();
-			if (f == null || !f.exists()) {
-				// fail - we do expect manifest to be there?
-				return;
-			}
-			InputStream is = f.getContents(); 
-			String requiredBundles = new Manifest(is).getMainAttributes().getValue(Constants.REQUIRE_BUNDLE);
-			is.close();
-			myRequiredBundles = ManifestElement.parseHeader(Constants.REQUIRE_BUNDLE, requiredBundles);
-		} catch (BundleException ex) {
-			throw new IOException(ex.getMessage());
-		}
-	}
-
-	private IFile findGeneratedManifest() {
-		return (IFile) project.findMember(new Path("META-INF/MANIFEST.MF"));
-	}
-
-	public String getPluginActivatorClassFQN(){
-		return model instanceof IPluginModel ? ((IPluginModel)model).getPlugin().getClassName() : null;
-	}
-	
-	public String getPluginFriendlyName(){
-		return model.getPluginBase().getName();
-	}
-	
-	public String getPluginID(){
-		return model.getPluginBase().getId();
-	}
-	
-	public String getPluginProviderName() {
-		return model.getPluginBase().getProviderName();
-	}
-
-	protected URL getInstallURL() {
-		return getContributingBundle().getEntry("/");
-	}
-
-	public String getSectionId() {
-		return SECTION_ID;
-	}
-
-	public void validateOptions(TemplateOption changed) {
-		if ((myUseRuntimeFiguresOption.equals(changed) || myNeedsMapModeOption.equals(changed)) && shouldWarnLiteVerstionDoesNotSupportMapMode) {
-			boolean useRuntimeFigures = myUseRuntimeFiguresOption.isSelected();
-			boolean needsMapMode = myNeedsMapModeOption.isSelected();
-			if (!useRuntimeFigures && needsMapMode) {
-				getTheOnlyPage().setMessage("It is not recommended to use IMapMode for pure-GEF diagram editors", IMessageProvider.INFORMATION);
-			} else {
-				getTheOnlyPage().setMessage(null);
-			}
-		}
-		if (OPTION_NEEDS_MAP_MODE.equals(changed)){
-			//does not affect state
-			return;
-		}
-		if (validateInputPath() && validatePackageName() &&  
-			validateOutputOption(myOutputDiagramElementsPathOption) && 
-			validateOutputOption(myOutputGalleryPathOption)){   
-				resetPageState();
-		}
-	}
-
-	public boolean isDependentOnParentWizard() {
-		return true;
-	}
-
-	protected void initializeFields(IFieldData data) {
-		super.initializeFields(data);
-		String packageName = getFormattedPackageName(data.getId());
-		initializeOption(OPTION_MAIN_PACKAGE_NAME, packageName);
-	}
-
-	protected ResourceBundle getPluginResourceBundle() {
-		return Platform.getResourceBundle(getContributingBundle());
-	}
-
-	protected void updateModel(IProgressMonitor monitor) throws CoreException {
-		if (myRequiredBundles == null) {
-			return;
-		}
-		for (int i = 0; i < myRequiredBundles.length; i++) {
-			// take first component, ignore any attributes or directives 
-			addImport(myRequiredBundles[i].getValueComponents()[0]);
-		}
-	}
-	
-	private void addImport(String importedPluginId) throws CoreException {
-		IPluginImport pluginImport = model.getPluginFactory().createImport();
-		pluginImport.setId(importedPluginId);
-		model.getPluginBase().add(pluginImport);
-	}
-
-	public String[] getNewFiles() {
-		return new String[0];
-	}
-
-	public String getUsedExtensionPoint() {
-		return null;
-	}
-	
-	private Bundle getContributingBundle(){
-		return Platform.getBundle(MY_PLUGIN_ID);
-	}
-	
-	/**
-	 * Stolen from PDETemplateSection, which can not be reused due to export limitations.
-	 */
-	private String getFormattedPackageName(String id){
-		StringBuffer buffer = new StringBuffer();
-		for (int i = 0; i < id.length(); i++) {
-			char ch = id.charAt(i);
-			if (buffer.length() == 0) {
-				if (Character.isJavaIdentifierStart(ch))
-					buffer.append(Character.toLowerCase(ch));
-			} else {
-				if (Character.isJavaIdentifierPart(ch) || ch == '.')
-					buffer.append(ch);
-			}
-		}
-		return buffer.toString().toLowerCase(Locale.ENGLISH);
-	}
-
-	private FileNameOption addFileNameOption(boolean saveNotLoad, String name, String label, String value, int pageIndex) {
-		FileNameOption result = new FileNameOption(this, name, label, new String[] {"*.gmfgraph"});
-		result.setSaveNotLoad(saveNotLoad);
-		registerOption(result, value, pageIndex);
-		return result;
-	}
-	
-	private boolean validatePackageName(){
-		boolean isValid = !myPackageNameOption.isEmpty();
-		if (!isValid){
-			flagMissingRequiredOption(myPackageNameOption);
-		}
-		return isValid;
-	}
-	
-	private boolean validateInputPath() {
-		if (myInputPathOption.isEmpty()){
-			flagMissingRequiredOption(myInputPathOption);
-			myOutputDiagramElementsPathOption.setEnabled(false);
-			myOutputGalleryPathOption.setEnabled(false);
-			return false;
-		}
-		String path = myInputPathOption.getText();
-		myCachedInputValidationState.updateInput(path);
-		if (!myCachedInputValidationState.isValid()){
-			flagError(myCachedInputValidationState.getErrorMessage());
-			return false;
-		}
-		return true;
-	}
-	
-	private boolean validateOutputOption(FileNameOption option) {
-		if (!option.isEnabled()){
-			return false;
-		}
-		if (!validateMirrorDiagramWithoutFigureGallery()){
-			return false;
-		}
-		if (option.isEmpty()){
-			//optional -- ok
-			return true;
-		}
-		String path = option.getText();
-		return validatePath(path);
-	}
-
-	private boolean validateMirrorDiagramWithoutFigureGallery(){
-		if (!myOutputDiagramElementsPathOption.isEmpty()){
-			if (myOutputGalleryPathOption.isEmpty() || myOutputDiagramElementsPathOption.getText().equals(myOutputGalleryPathOption.getText())){
-				flagError("In order to mirror diagram elements you have to generate separate figure gallery");
-				return false;
-			}
-		}
-		return true;
-	}
-	
-	private boolean validatePath(String path){
-		try {
-			return URI.createFileURI(path) != null; 
-		} catch (IllegalArgumentException e){
-			flagError(MessageFormat.format("Path {0} is invalid", new Object[] {path}));
-			return false;
-		}
-	}
-	
-	private WizardPage getTheOnlyPage() {
-		return getPage(THE_ONLY_PAGE_INDEX);
-	}
-	
-	private void flagError(String message){
-		getTheOnlyPage().setPageComplete(false);
-		getTheOnlyPage().setErrorMessage(message);
-	}
-	
-	private static Resource loadResource(String path){
-		Resource resource = new ResourceSetImpl().createResource(URI.createFileURI(path), ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-		try {
-			resource.load(Collections.EMPTY_MAP);
-			return resource;
-		} catch (IOException e) {
-			return null;
-		}
-	}
-	
-	private static class InputValidationState {
-		private String myCachedPath;
-		private String myCachedErrorMessage;
-		private boolean myHasDiagramElement;
-		private boolean myHasFigure;
-		private final FileNameOption myDiagramElementsOption;
-		private final FileNameOption myGalleryOption;
-		
-		public InputValidationState(FileNameOption galleryOption, FileNameOption diagramElementsOption){
-			myGalleryOption = galleryOption;
-			myDiagramElementsOption = diagramElementsOption;
-		}
-		
-		public void updateInput(String path){
-			if (myCachedPath == null || !myCachedPath.equals(path)){
-				myCachedPath = path;
-				validateInputPath(path);
-				myGalleryOption.setEnabled(myHasFigure);
-				myDiagramElementsOption.setEnabled(myHasDiagramElement);
-			}
-		}
-		
-		public boolean isValid(){
-			return myHasFigure;
-		}
-		
-		public String getErrorMessage(){
-			return myCachedErrorMessage;
-		}
-		
-		private void validateInputPath(String path) {
-			myHasDiagramElement = false;
-			myHasFigure = false;
-			myCachedErrorMessage = null;
-
-			if (path == null || !new File(path).exists()){
-				myCachedErrorMessage = MessageFormat.format("Can not find file {0}", new Object[] {path});
-				return;
-			}
-			
-			Resource resource = loadResource(path);
-			if (resource != null){
-				classifyContents(resource);
-			}
-			
-			if (!myHasFigure){
-				myCachedErrorMessage = MessageFormat.format("File {0} does not contain any figure definitions", new Object[] {path});
-			}
-		}
-
-		private void classifyContents(Resource resource){
-			myHasDiagramElement = false;
-			myHasFigure = false;
-			for (TreeIterator<EObject> contents = resource.getAllContents(); contents.hasNext();){
-				EObject next = contents.next();
-				if (next instanceof FigureGallery){
-					if (!myHasFigure){
-						FigureGallery nextGallery = (FigureGallery) next;
-						myHasFigure = !nextGallery.getFigures().isEmpty();
-					}
-					contents.prune();
-				}
-				if (next instanceof DiagramElement){
-					myHasDiagramElement = true;
-					contents.prune();
-				}
-				if (myHasDiagramElement && myHasFigure){
-					break;
-				}
-			}
-		}
-		
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FigureGeneratorOptionsDialog.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FigureGeneratorOptionsDialog.java
deleted file mode 100644
index 2c23d80885c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FigureGeneratorOptionsDialog.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Boris Blajer (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IMessageProvider;
-import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.papyrus.gmf.graphdef.codegen.MapModeCodeGenStrategy;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-
-public class FigureGeneratorOptionsDialog extends TitleAreaDialog {
-    private Button useMapModeButton;
-    private Button useRuntimeFiguresButton;
-	private boolean useMapMode;
-	private boolean useRuntimeFigures;
-	private String title;
-
-	public FigureGeneratorOptionsDialog(Shell parentShell, String dialogTitle, boolean initialUseRuntimeFigures, boolean initialUseMapMode) {
-		super(parentShell);
-		title = dialogTitle;
-		useMapMode = initialUseMapMode;
-		useRuntimeFigures = initialUseRuntimeFigures;
-	}
-
-	protected void configureShell(Shell newShell) {
-		super.configureShell(newShell);
-		if (title != null) {
-			newShell.setText(title);
-		}
-	}
-
-	protected Control createDialogArea(Composite parent) {
-		Composite result = (Composite) super.createDialogArea(parent);
-		GridLayout layout = new GridLayout();
-		layout.marginHeight = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_MARGIN);
-		layout.marginWidth = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_MARGIN);
-		layout.verticalSpacing = convertVerticalDLUsToPixels(IDialogConstants.VERTICAL_SPACING);
-		layout.horizontalSpacing = convertHorizontalDLUsToPixels(IDialogConstants.HORIZONTAL_SPACING);
-		result.setLayout(layout);
-		createControls(result);
-		setTitle("Generator Model Options");
-        warnLiteVerstionDoesNotSupportMapMode();
-        Dialog.applyDialogFont(result);
-		return result;
-	}
-
-	protected void createControls(Composite result) {
-        useMapModeButton = new Button(result, SWT.CHECK);
-        useMapModeButton.setText("Use &IMapMode");
-        useMapModeButton.setSelection(useMapMode);
-        useMapModeButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_CENTER));
-        useRuntimeFiguresButton = new Button(result, SWT.CHECK);
-        useRuntimeFiguresButton.setText("&Utilize enhanced features of GMF runtime");
-        useRuntimeFiguresButton.setSelection(useRuntimeFigures);
-        useRuntimeFiguresButton.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_BEGINNING | GridData.VERTICAL_ALIGN_CENTER));
-        SelectionListener selectionListener = new SelectionListener() {
-        	public void widgetDefaultSelected(SelectionEvent e) {
-        		warnLiteVerstionDoesNotSupportMapMode();
-        	}
-        	public void widgetSelected(SelectionEvent e) {
-        		warnLiteVerstionDoesNotSupportMapMode();
-        	}
-		};
-        useMapModeButton.addSelectionListener(selectionListener);
-        useRuntimeFiguresButton.addSelectionListener(selectionListener);
-        useMapModeButton.setSelection(useMapMode);
-        useRuntimeFiguresButton.setSelection(useRuntimeFigures);
-	}
-
-    protected void warnLiteVerstionDoesNotSupportMapMode() {
-    	if (!useRuntimeFiguresButton.getSelection() && useMapModeButton.getSelection()) {
-    		setMessage("It is not recommended to use IMapMode for pure-GEF diagram editors", IMessageProvider.INFORMATION);
-    	} else {
-    		setMessage(null);
-    	}
-    }
-
-    protected void okPressed() {
-    	useRuntimeFigures = useRuntimeFiguresButton.getSelection();
-    	useMapMode = useMapModeButton.getSelection();
-    	super.okPressed();
-    }
-
-    public String getRuntimeToken() {
-    	return useRuntimeFigures ? null : "lite";
-    }
-
-    public MapModeCodeGenStrategy getMapModeCodeGenStrategy() {
-    	return useMapMode ? MapModeCodeGenStrategy.DYNAMIC : MapModeCodeGenStrategy.STATIC;
-    }
-
-    public boolean isHelpAvailable() {
-    	return false;
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FigureGeneratorWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FigureGeneratorWizard.java
deleted file mode 100644
index 0bfb20b4e7f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FigureGeneratorWizard.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;
-
-import org.eclipse.pde.ui.templates.ITemplateSection;
-import org.eclipse.pde.ui.templates.NewPluginTemplateWizard;
-
-public class FigureGeneratorWizard extends NewPluginTemplateWizard {
-	
-	public ITemplateSection[] createTemplateSections() {
-		return new ITemplateSection[] {new ConverterSection()};
-	}
-	
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FileNameOption.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FileNameOption.java
deleted file mode 100644
index 48bda0c5075..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/FileNameOption.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;
-
-import org.eclipse.pde.ui.templates.BaseOptionTemplateSection;
-import org.eclipse.pde.ui.templates.TemplateOption;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.FileDialog;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-
-/**
- * @see org.eclipse.pde.ui.templates.StringOption
- */
-public class FileNameOption extends TemplateOption {
-	private final String[] myExtensions;
-	private Text myText;
-	private Label myLabelControl;
-	private Button myBrowseButton;
-	private boolean myIgnoreListener;
-	private boolean mySaveNotLoad;
-	
-	/**
-	 * @param section
-	 *            the parent section
-	 * @param name
-	 *            the unique option name
-	 * @param label
-	 *            the translatable label of the option
-	 */
-	public FileNameOption(BaseOptionTemplateSection section, String name, String label, String[] extensions) {
-		super(section, name, label);
-		setRequired(true);
-		myExtensions = extensions;
-	}
-	
-	public void setSaveNotLoad(boolean saveNotLoad){
-		mySaveNotLoad = saveNotLoad;
-	}
-	
-	/**
-	 * A utility version of the <samp>getValue() </samp> method that converts
-	 * the current value into the String object.
-	 * 
-	 * @return the string version of the current value.
-	 */
-	public String getText() {
-		if (getValue() != null)
-			return getValue().toString();
-		return null;
-	}
-
-	/**
-	 * A utility version of the <samp>setValue </samp> method that accepts
-	 * String objects.
-	 * 
-	 * @param newText
-	 *            the new text value of the option
-	 * @see #setValue(Object)
-	 */
-	public void setText(String newText) {
-		setValue(newText);
-	}
-	
-	/**
-	 * Implements the superclass method by passing the string value of the new
-	 * value to the widget
-	 * 
-	 * @param value
-	 *            the new option value
-	 */
-	public void setValue(Object value) {
-		super.setValue(value);
-		if (myText != null) {
-			myIgnoreListener = true;
-			String textValue = getText();
-			myText.setText(textValue != null ? textValue : ""); //$NON-NLS-1$
-			myIgnoreListener = false;
-		}
-	}
-	
-	/**
-	 * Creates the string option control.
-	 * 
-	 * @param parent
-	 *            parent composite of the string option widget
-	 * @param span
-	 *            the number of columns that the widget should span
-	 */
-	public void createControl(Composite parent, int span) {
-		myLabelControl = createLabel(parent, 1);
-		myLabelControl.setEnabled(isEnabled());
-		
-		Composite textAndButtonGroup = new Composite(parent, SWT.NULL);
-		GridLayout groupLayout = new GridLayout(2, false);
-		groupLayout.marginWidth = 0;
-		groupLayout.marginHeight = 0;
-		groupLayout.verticalSpacing = 0;
-		groupLayout.horizontalSpacing = 5;
-		textAndButtonGroup.setLayout(groupLayout);
-
-		GridData groupLayoutData = new GridData(GridData.FILL_HORIZONTAL);
-		groupLayoutData.horizontalSpan = span - 1;
-		textAndButtonGroup.setLayoutData(groupLayoutData);
-		
-		myText = new Text(textAndButtonGroup, SWT.SINGLE | SWT.BORDER);
-		GridData textGD = new GridData(GridData.FILL_HORIZONTAL);
-		myText.setLayoutData(textGD);
-		
-		myBrowseButton = new Button(textAndButtonGroup, SWT.NULL);
-		GridData buttonGD = new GridData(GridData.HORIZONTAL_ALIGN_CENTER);
-		myBrowseButton.setLayoutData(buttonGD);
-		
-		if (getValue() != null){
-			myText.setText(getValue().toString());
-		}
-		myText.setEnabled(isEnabled());
-		myText.addModifyListener(new ModifyListener() {
-			public void modifyText(ModifyEvent e) {
-				if (myIgnoreListener)
-					return;
-				FileNameOption.super.setValue(myText.getText());
-				getSection().validateOptions(FileNameOption.this);
-			}
-		});
-		
-		myBrowseButton.setText("Browse...");
-		myBrowseButton.setEnabled(isEnabled());
-		myBrowseButton.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-		
-			public void widgetSelected(SelectionEvent e) {
-				FileDialog fileDialog = new FileDialog(e.display.getActiveShell(), getSaveNotLoadDialogStyle() | SWT.PRIMARY_MODAL);
-				fileDialog.setFilterExtensions(myExtensions);
-				setText(fileDialog.open());
-				getSection().validateOptions(FileNameOption.this);
-			}
-			
-			private int getSaveNotLoadDialogStyle(){
-				return FileNameOption.this.isSaveNotLoad() ? SWT.SAVE : SWT.OPEN;
-			}
-		});
-	}
-
-	/**
-	 * A string option is empty if its text field contains no text.
-	 * 
-	 * @return true if there is no text in the text field.
-	 */
-	public boolean isEmpty() {
-		return getValue() == null || getValue().toString().trim().length() == 0;
-	}
-	
-	/**
-	 * Implements the superclass method by passing the enabled state to the
-	 * option's widget.
-	 * 
-	 * @param enabled
-	 */
-	public void setEnabled(boolean enabled) {
-		super.setEnabled(enabled);
-		if (myLabelControl != null) {
-			myLabelControl.setEnabled(enabled);
-			myText.setEnabled(enabled);
-			myBrowseButton.setEnabled(enabled);
-		}
-	}
-	
-	private boolean isSaveNotLoad(){
-		return mySaveNotLoad;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/GeneratePluginAction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/GeneratePluginAction.java
deleted file mode 100644
index 9424913c625..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/GeneratePluginAction.java
+++ /dev/null
@@ -1,299 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.CommonPlugin;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.dialogs.IDialogConstants;
-import org.eclipse.jface.dialogs.IInputValidator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IObjectActionDelegate;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.forms.widgets.ExpandableComposite;
-
-public class GeneratePluginAction implements IObjectActionDelegate, IInputValidator {
-	private List<IFile> mySelectedFiles = Collections.emptyList();
-	private IWorkbenchPart myTargetPart;
-	private ConverterOptions myOptions;
-
-	public GeneratePluginAction() {
-	}
-
-	public void setActivePart(IAction action, IWorkbenchPart targetPart) {
-		myTargetPart = targetPart;
-	}
-
-	public void run(IAction action) {
-		final ResourceSet rs = new ResourceSetImpl();
-		final Resource[] input = loadFromSelection(rs);
-		StandaloneGeneratorOptionsDialog dialog = new StandaloneGeneratorOptionsDialog(getShell(), null, true, this);
-		if (dialog.open() != IDialogConstants.OK_ID) {
-			return;
-		}
-		String pluginId = dialog.getPluginId();
-		final StandaloneGenerator.Config config = new StandaloneGenerator.ConfigImpl(pluginId, pluginId, dialog.getMapModeCodeGenStrategy(), dialog.getRuntimeToken());
-		final ConverterOutcome converterOutcome = new ConverterOutcome(getOptions(), input);
-		final IStatus inputCheck = converterOutcome.checkInputAgainstOptions();
-		if (!inputCheck.isOK()) {
-			MessageDialog.openInformation(getShell(), "Nothing to do", inputCheck.getMessage());
-			return;
-		}
-		URL[] dynamicTemplates = null;
-		if (dialog.getTemplatesPath() != null) {
-			try {
-				dynamicTemplates = new URL[1];
-				dynamicTemplates[0] = new URL(dialog.getTemplatesPath());
-			} catch (MalformedURLException ex) {
-				MessageDialog.openWarning(getShell(), "Invalid dynamic template path", "Path for dynamic templates is invalid, proceeding without dynamic templates");
-				// fallthrough
-			}
-		}
-		final StandaloneGenerator generator = new StandaloneGenerator(converterOutcome.getProcessor(), config, dynamicTemplates);
-		generator.setSkipPluginStructure(false);
-
-		new Job(action.getText()) {
-			private IContainer myResourcesContainer;
-			{
-				setUser(true); 
-			}
-
-			protected IStatus run(IProgressMonitor monitor) {
-				try {
-					generator.run(monitor);
-					if (!generator.getRunStatus().isOK()) {
-						return generator.getRunStatus();
-					}
-					URI galleryURI = URI.createPlatformResourceURI(decideOnDestinationFile("bundled").getFullPath().toString(), true);
-					URI canvasURI = URI.createPlatformResourceURI(decideOnDestinationFile("mirrored").getFullPath().toString(), true);
-					return converterOutcome.createResources(rs, galleryURI, canvasURI);					
-
-				} catch (InterruptedException e) {
-					return Status.CANCEL_STATUS;
-				} finally {
-					for (Resource next : rs.getResources()) {
-						next.unload();
-					}
-				}
-			}
-
-			private IFile decideOnDestinationFile(String baseName) {
-				final IPath basePath = new Path(baseName);
-				final String ext = "gmfgraph";
-				IFile resultFile = getResourcesContainer().getFile(basePath.addFileExtension(ext));
-				for (int i = 1; resultFile.exists(); i++) {
-					resultFile = getResourcesContainer().getFile(new Path(basePath.lastSegment() + String.valueOf(i)).addFileExtension(ext));
-				}
-				return resultFile;
-			}
-			
-			private IContainer getResourcesContainer(){
-				if (myResourcesContainer == null){
-					IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject(config.getPluginID());
-					assert p.exists(); // generator.runStatus.ok makes us believe
-					myResourcesContainer = p;
-					IFolder modelsFolder = p.getFolder("models");
-					if (!modelsFolder.exists()) {
-						try {
-							modelsFolder.create(true, true, new NullProgressMonitor());
-							myResourcesContainer = modelsFolder;
-						} catch (CoreException ex) {
-							// ignore or log?
-						}
-					}
-				}
-				return myResourcesContainer;
-			}
-		}.schedule();
-	}
-
-	private Resource[] loadFromSelection(ResourceSet rs) {
-		Resource[] rv = new Resource[mySelectedFiles.size()];
-		int i = 0;
-		for (IFile next : mySelectedFiles) {
-			rv[i++] = rs.getResource(URI.createPlatformResourceURI(next.getFullPath().toString(), true), true);
-		}
-		return rv;
-	}
-
-	public String isValid(String newText) {
-		IStatus s = JavaConventions.validatePackageName(newText, JavaCore.VERSION_1_4, JavaCore.VERSION_1_4);
-		if (s.isOK()) {
-			return null;
-		}
-		return s.getMessage();
-	}
-
-	private Shell getShell() {
-		return myTargetPart.getSite().getShell();
-	}
-
-	public void selectionChanged(IAction action, ISelection selection) {
-		mySelectedFiles = new ArrayList<IFile>(5);
-		if (selection instanceof IStructuredSelection) {
-			@SuppressWarnings("unchecked") List<IFile> sel = ((IStructuredSelection) selection).toList();
-			mySelectedFiles.addAll(sel);
-		}
-	}
-
-	private ConverterOptions getOptions() {
-		if (myOptions == null) {
-			myOptions = loadOptions();
-		}
-		return myOptions;
-	}
-
-	private ConverterOptions loadOptions() {
-		ConverterOptions options = new ConverterOptions();
-		options.needMirroredCanvas = true;
-		options.needMirroredGalleries = true;
-		return options;
-	}
-
-	private static class StandaloneGeneratorOptionsDialog extends FigureGeneratorOptionsDialog {
-	    private IInputValidator pluginIdValidator;
-	    private Text pluginIdText;
-		private String pluginId;
-		private String templatesPath;
-		private final boolean shouldWarnLiteVerstionDoesNotSupportMapMode;
-		private Text templatesPathControl;
-
-		public StandaloneGeneratorOptionsDialog(Shell parentShell, String initialPluginId, boolean initialUseRuntimeFigures, IInputValidator pluginIdValidator) {
-			this(parentShell, initialPluginId, initialUseRuntimeFigures, false, pluginIdValidator);
-		}
-
-		public StandaloneGeneratorOptionsDialog(Shell parentShell, String initialPluginId, boolean initialUseRuntimeFigures, boolean initialUseMapMode, IInputValidator pluginIdValidator) {
-			super(parentShell, "Figure Gallery Generator", initialUseRuntimeFigures, initialUseMapMode);
-			pluginId = initialPluginId;
-			if (pluginId == null) {
-				pluginId = "";	//$NON-NLS-1$
-			}
-			this.pluginIdValidator = pluginIdValidator;
-			shouldWarnLiteVerstionDoesNotSupportMapMode = Platform.getBundle("org.eclipse.papyrus.gmf.codegen.lite") != null;
-		}
-
-		protected void createControls(Composite result) {
-	        Label label = new Label(result, SWT.WRAP);
-	        label.setText("Please specify the name of plug-in/main package");
-	        GridData data = new GridData(GridData.GRAB_HORIZONTAL
-	                | GridData.GRAB_VERTICAL | GridData.HORIZONTAL_ALIGN_FILL
-	                | GridData.VERTICAL_ALIGN_CENTER);
-	        data.widthHint = convertHorizontalDLUsToPixels(IDialogConstants.MINIMUM_MESSAGE_AREA_WIDTH);
-	        label.setLayoutData(data);
-	        pluginIdText = new Text(result, SWT.SINGLE | SWT.BORDER);
-	        pluginIdText.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL
-	                | GridData.HORIZONTAL_ALIGN_FILL));
-	        final ModifyListener modifyListener = new ModifyListener() {
-				            public void modifyText(ModifyEvent e) {
-				                validateInput();
-				            }
-				        };
-			pluginIdText.addModifyListener(modifyListener);
-	        ExpandableComposite c = new ExpandableComposite(result, SWT.NONE, ExpandableComposite.TWISTIE);
-	        final GridData d = new GridData(SWT.FILL, SWT.TOP, true, true);
-	        d.minimumHeight = convertVerticalDLUsToPixels(IDialogConstants.BUTTON_BAR_HEIGHT);
-	        d.verticalIndent = 10;
-			c.setLayoutData(d);
-	        c.setText("Dynamic templates");
-	        templatesPathControl = new Text(c, SWT.SINGLE | SWT.BORDER);
-	        templatesPathControl.addModifyListener(modifyListener);
-			c.setClient(templatesPathControl);
-			super.createControls(result);
-		}
-
-	    protected void validateInput() {
-	        String errorMessage = null;
-	        if (pluginIdValidator != null) {
-	            errorMessage = pluginIdValidator.isValid(pluginIdText.getText());
-	        }
-	        if (errorMessage == null && templatesPathControl.getText().trim().length() > 0) { // do dynamic templates check only when pluginID is ok
-	        	try {
-	        		new URL(guessAndResolvePathURL(templatesPathControl.getText().trim()));
-	        	} catch (Exception ex) {
-	        		errorMessage = "Illegal dynamic templates path";
-	        	}
-	        }
-	        // Bug 16256: important not to treat "" (blank error) the same as null
-	        // (no error)
-	        setErrorMessage(errorMessage);
-	    }
-
-	    protected void warnLiteVerstionDoesNotSupportMapMode() {
-	    	if (shouldWarnLiteVerstionDoesNotSupportMapMode) {
-	    		super.warnLiteVerstionDoesNotSupportMapMode();
-	    	}
-	    }
-
-	    protected void okPressed() {
-	    	pluginId = pluginIdText.getText();
-	    	templatesPath = templatesPathControl.getText().trim();
-	    	if (templatesPath.length() == 0) {
-	    		templatesPath = null;
-	    	} else {
-	    		templatesPath = guessAndResolvePathURL(templatesPath);
-	    	}
-	    	super.okPressed();
-	    }
-
-		private static String guessAndResolvePathURL(String path) {
-			assert path != null;
-			URI templatesURI = path.indexOf(':') == -1 ? URI.createPlatformResourceURI(path, true) : URI.createURI(path);
-			return CommonPlugin.resolve(templatesURI).toString();
-		}
-
-	    public String getPluginId() {
-	    	return pluginId;
-	    }
-	    public String getTemplatesPath() {
-	    	return templatesPath;
-	    }
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/StandaloneGeneratorConfigAdapter.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/StandaloneGeneratorConfigAdapter.java
deleted file mode 100644
index 1ec698bdf2b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen.ui/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/ui/StandaloneGeneratorConfigAdapter.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen.ui;
-
-import org.eclipse.papyrus.gmf.graphdef.codegen.MapModeCodeGenStrategy;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator;
-
-class StandaloneGeneratorConfigAdapter implements StandaloneGenerator.Config {
-	private final ConverterSection mySection;
-
-	public StandaloneGeneratorConfigAdapter(ConverterSection section){
-		mySection = section;
-		getPluginActivatorClassName();
-	}
-	
-	public String getMainPackageName() {
-		return mySection.getStringOption(ConverterSection.OPTION_MAIN_PACKAGE_NAME);
-	}
-	
-	public String getPluginActivatorClassName() {
-		String activatorFQN = mySection.getPluginActivatorClassFQN();
-		if (activatorFQN == null){
-			activatorFQN = "";
-		}
-		return extractClassName(activatorFQN);
-	}
-	
-	public String getPluginActivatorPackageName() {
-		String activatorFQN = mySection.getPluginActivatorClassFQN();
-		if (activatorFQN == null){
-			activatorFQN = "";
-		}
-		return extractPackageName(activatorFQN);
-	}
-	
-	public String getPluginFriendlyName() {
-		return notNull(mySection.getPluginFriendlyName());
-	}
-	
-	public String getPluginID() {
-		return notNull(mySection.getPluginID());
-	}
-	
-	public String getPluginProviderName() {
-		return notNull(mySection.getPluginProviderName());
-	}
-	
-	public MapModeCodeGenStrategy getMapMode() {
-		return mySection.getBooleanOption(ConverterSection.OPTION_NEEDS_MAP_MODE) ? MapModeCodeGenStrategy.DYNAMIC : MapModeCodeGenStrategy.STATIC;
-	}
-
-	public String getRuntimeToken() {
-		// TODO Auto-generated method stub
-		return mySection.getBooleanOption(ConverterSection.OPTION_USE_RUNTIME_FIGURES) ? null : "lite";
-	}
-	
-	/**
-	 * FIXME: this does not work if fqn is inner class
-	 * However, default PDE plugin generator treats any input string this way  
-	 */
-	private static String extractPackageName(String fqn){
-		int lastDot = fqn.lastIndexOf('.');
-		return lastDot < 0 ? "" : fqn.substring(0, lastDot);
-	}
-	
-	/**
-	 * @see StandaloneGeneratorConfigAdapter#extractPackageName(String)
-	 */
-	private static String extractClassName(String fqn){
-		int lastDot = fqn.lastIndexOf('.');
-		return lastDot < 0 ? fqn : fqn.substring(lastDot + ".".length());
-	}
-	
-	private static String notNull(String text){
-		return text == null ? "" : text;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.classpath
deleted file mode 100644
index c816f6c9490..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="templates.qvtlib"/>
-	<classpathentry kind="src" path="templates"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.project
deleted file mode 100644
index dc38fd2fdf4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.project
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.graphdef.codegen</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.m2m.qvt.oml.project.QVTOBuilder</name>
-			<arguments>
-				<dictionary>
-					<key>src_container</key>
-					<value>templates</value>
-				</dictionary>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.papyrus.gmf.xpand.xpandBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-		<nature>org.eclipse.m2m.qvt.oml.project.QVTONature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index ec7f7d6717e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Wed Mar 18 18:08:15 CET 2009
-eclipse.preferences.version=1
-encoding/templates=UTF-8
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
deleted file mode 100644
index 889a7243b8c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.settings/org.eclipse.m2m.qvt.oml.mmodel.urimap
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<uriMap:MappingContainer xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:uriMap="http:///www.eclipse.org/m2m/qvt/oml/MModelUriMap/1.0.0">
-  <mapping sourceURI="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition" targetURI="platform:/plugin/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore"/>
-</uriMap:MappingContainer>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.xpand-root b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.xpand-root
deleted file mode 100644
index f8a268712f8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/.xpand-root
+++ /dev/null
@@ -1 +0,0 @@
-templates
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/META-INF/MANIFEST.MF
deleted file mode 100644
index a8af57101f4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.graphdef.codegen;singleton:=true
-Bundle-Version: 2.10.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.papyrus.gmf.common;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.gmf.graphdef;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.papyrus.gmf.xpand;bundle-version="[2.1.0,3.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)"
-Export-Package: org.eclipse.papyrus.gmf.graphdef.codegen,
- org.eclipse.papyrus.gmf.internal.graphdef.codegen;x-friends:="org.eclipse.papyrus.gmf.graphdef.codegen.ui,org.eclipse.gmf.tests"
-Bundle-Activator: org.eclipse.papyrus.gmf.internal.graphdef.codegen.Activator
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/build.properties
deleted file mode 100644
index 1db7c1cf203..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-source.. = src/,\
-           templates.qvtlib/,\
-           templates
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               about.html,\
-               plugin.xml,\
-               plugin.properties,\
-               templates/
-jars.compile.order = .
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/plugin.properties
deleted file mode 100644
index 6c995ad4ca6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-pluginName = Papyrus GMF Graphic Code Generator
-providerName = Eclipse Modeling Project
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/plugin.xml
deleted file mode 100644
index e37e53630cc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-	<extension point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
-		<library class="NativeUtil"><metamodel nsURI="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition"/><metamodel nsURI="http://www.eclipse.org/emf/2002/Ecore"/></library>
-	</extension>
-</plugin>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/pom.xml
deleted file mode 100644
index 7efe1a915ad..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.graphdef.codegen</artifactId>
-	<version>2.10.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/FigureGenerator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/FigureGenerator.java
deleted file mode 100644
index 28e74fa13c8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/FigureGenerator.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020, 2021 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *    Etienne ALLOGO (ARTAL) - etienne.allogo@artal.fr - Bug 569174 - newline characters preference api consistency
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.graphdef.codegen;
-
-import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.internal.common.codegen.TextEmitter;
-import org.eclipse.papyrus.gmf.internal.graphdef.codegen.Activator;
-import org.eclipse.papyrus.gmf.internal.xpand.BufferOutput;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-import org.eclipse.papyrus.gmf.internal.xpand.XpandFacade;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AmbiguousDefinitionException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Scope;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-
-public class FigureGenerator implements TextEmitter {
-
-	private static final String VAR_MM_ACCESS = "mapModeAccessor";
-	private static final String VAR_RT_TOKEN = "runtimeToken";
-
-	private final ResourceManager resourceManager;
-
-	private final StringBuilder result = new StringBuilder();
-
-	private final ArrayList<Variable> globals = new ArrayList<Variable>();
-
-	private final boolean myIsInnerClassCode;
-
-	private String packageStatement;
-
-
-	/**
-	 * XXX consider using enum for runtimeToken
-	 * @param runtimeToken either "full" or null to indicate full GMF runtime use, any other value is to be processed by custom templates 
-	 * @param asInnerClass
-	 */
-	public FigureGenerator(String runtimeToken, String packageStmt, boolean asInnerClass) {
-		this(runtimeToken, packageStmt, MapModeCodeGenStrategy.DYNAMIC, "getMapMode().", asInnerClass);
-	}
-
-	public FigureGenerator(String runtimeToken, String packageStmt, MapModeCodeGenStrategy mapModeStrategy, String mapModeAccessor, boolean asInnerClass) {
-		this(runtimeToken, packageStmt, mapModeStrategy, mapModeAccessor, asInnerClass, null);
-	}
-
-	public FigureGenerator(String runtimeToken, String packageStmt, MapModeCodeGenStrategy mapModeStrategy, String mapModeAccessor, boolean asInnerClass, URL[] dynamicTemplates) {
-		myIsInnerClassCode = asInnerClass;
-		this.packageStatement = packageStmt;
-		if (mapModeStrategy == MapModeCodeGenStrategy.STATIC) {
-			if (mapModeAccessor != null && mapModeAccessor.trim().length() > 0) {
-				throw new IllegalArgumentException("Can't use map mode accessor with identity map mode");
-			}
-		}
-		if (mapModeStrategy == MapModeCodeGenStrategy.DYNAMIC) {
-			globals.add(new Variable(VAR_MM_ACCESS, EcorePackage.eINSTANCE.getEString(), mapModeAccessor == null ? "" : mapModeAccessor));
-		}
-		if (runtimeToken != null) {
-			globals.add(new Variable(VAR_RT_TOKEN, EcorePackage.eINSTANCE.getEString(), runtimeToken));
-		}
-		resourceManager = Activator.createResourceEngine(mapModeStrategy, dynamicTemplates);
-	}
-
-	public String getPackageName() {
-		return packageStatement;
-	}
-
-	public String fqnSwitch(Figure figure) {
-		try {
-			xpandFacade().evaluate("Runtime::fqn", figure, null);
-		} catch (AmbiguousDefinitionException e) {
-			throw new EvaluationException(e);
-		}
-		return result.toString();
-	}
-	
-	/**
-	 * @param packageStmt can be null if asInnerClass was true
-	 * @param figure
-	 */
-	public String go(FigureDescriptor figure) {
-		try {
-			if (myIsInnerClassCode) {
-				xpandFacade().evaluate("top::Descriptor::Inner", figure, null);
-			} else {
-				xpandFacade().evaluate("top::Descriptor::Top", figure, new Object[] { packageStatement });
-			}
-		} catch (AmbiguousDefinitionException e) {
-			throw new EvaluationException(e);
-		}
-		return result.toString();
-	}
-
-	private XpandFacade xpandFacade() {
-		result.setLength(0);
-		BufferOutput bufferOutput = new BufferOutput(result);
-
-		return new XpandFacade(new Scope(resourceManager, globals, bufferOutput));
-	}
-
-	public String generate(IProgressMonitor monitor, Object[] arguments, String lineSeparator) throws InterruptedException, InvocationTargetException, UnexpectedBehaviourException {
-		if (arguments == null || arguments.length != 1 || false == arguments[0] instanceof FigureDescriptor) {
-			throw new UnexpectedBehaviourException("(FigureDescriptor) expected as arguments, not " + arguments);
-		}
-		return go((FigureDescriptor) arguments[0]);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/MapModeCodeGenStrategy.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/MapModeCodeGenStrategy.java
deleted file mode 100644
index d4f0bc768a7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/MapModeCodeGenStrategy.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - redesigned as enumeration
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.graphdef.codegen;
-
-/**
- * @author artem
- */
-public enum MapModeCodeGenStrategy { 
-	STATIC(""), 
-	DYNAMIC("rt_mm");
-
-	private final String token;
-
-	private MapModeCodeGenStrategy(String token) {
-		assert token != null;
-		this.token = token;
-	}
-
-	/**
-	 * @return identifying token of this strategy 
-	 */
-	public String getToken() {
-		return token;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/StandaloneEmitters.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/StandaloneEmitters.java
deleted file mode 100644
index f4a11f2a6f4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/StandaloneEmitters.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Artem Tikhomirov (Borland) - migrating JET-Xpand
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.graphdef.codegen;
-
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.Config;
-import org.eclipse.papyrus.gmf.internal.common.codegen.TextEmitter;
-import org.eclipse.papyrus.gmf.internal.common.codegen.XpandTextEmitter;
-import org.eclipse.papyrus.gmf.internal.graphdef.codegen.Activator;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-
-class StandaloneEmitters {
-	private final ResourceManager myResourceManager;
-
-	StandaloneEmitters(MapModeCodeGenStrategy mapModeStrategy, URL[] dynamicTemplates) {
-		assert mapModeStrategy != null;
-		myResourceManager = Activator.createResourceEngine(mapModeStrategy, dynamicTemplates);
-	}
-	
-	public TextEmitter getBuildPropertiesEmitter() throws UnexpectedBehaviourException {
-		return new XpandTextEmitter(myResourceManager, "plugin::BuildProperties", "Init");
-	}
-	
-	public TextEmitter getPluginPropertiesEmitter() throws UnexpectedBehaviourException {
-		return new XpandTextEmitter(myResourceManager, "plugin::PluginProperties", "Init") {
-			@Override
-			protected Object[] extractArguments(Object[] arguments) {
-				assert arguments != null && arguments.length > 0 && arguments[0] instanceof Config;
-				Config config = (Config) arguments[0];
-				return new Object[] {
-					config.getPluginFriendlyName(),
-					config.getPluginProviderName()
-				};
-			}
-		};
-	}
-	
-	public TextEmitter getManifestMFEmitter() throws UnexpectedBehaviourException {
-		return new XpandTextEmitter(myResourceManager, "plugin::Manifest", "Init") {
-			@Override
-			protected Object[] extractArguments(Object[] arguments) {
-				assert arguments != null && arguments.length > 1 && arguments[0] instanceof Config && arguments[1] instanceof String[];
-				Config config = (Config) arguments[0];
-				List<String> exportedPackages = (config.getMainPackageName() == null || config.getMainPackageName().trim().length() == 0) ? Collections.singletonList(config.getPluginActivatorPackageName()) : Arrays.asList(config.getPluginActivatorPackageName(), config.getMainPackageName());
-				List<String> referencedBundles = Arrays.asList((String[]) arguments[1]);
-				return new Object[] {
-					config.getPluginID(),
-					config.getPluginActivatorPackageName() + '.' + config.getPluginActivatorClassName(),
-					exportedPackages,
-					referencedBundles
-				};
-			}
-		};
-	}
-	
-	public TextEmitter getPluginActivatorEmitter() throws UnexpectedBehaviourException {
-		return new XpandTextEmitter(myResourceManager, "plugin::Activator", "Init") {
-			@Override
-			protected Object extractTarget(Object[] arguments) {
-				assert arguments != null && arguments.length >= 2;
-				assert arguments[2] instanceof List<?>;
-				return arguments[2];
-			}
-			@Override
-			protected Object[] extractArguments(Object[] arguments) {
-				assert arguments != null && arguments.length > 0 && arguments[0] instanceof Config;
-				Config config = (Config) arguments[0];
-				return new Object[] {
-					config.getPluginActivatorPackageName(),
-					config.getPluginActivatorClassName(),
-					config.getPluginID(),
-				};
-			}
-		};
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/StandaloneGenerator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/StandaloneGenerator.java
deleted file mode 100644
index 97449c8fdf9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/graphdef/codegen/StandaloneGenerator.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020, 2021 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *    Etienne ALLOGO (ARTAL) - etienne.allogo@artal.fr - Bug 569174 - newline characters preference api consistency
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.graphdef.codegen;
-
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.codegen.merge.java.JControlModel;
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.internal.common.codegen.DefaultTextMerger;
-import org.eclipse.papyrus.gmf.internal.common.codegen.GeneratorBase;
-import org.eclipse.papyrus.gmf.internal.common.codegen.ImportUtil;
-import org.eclipse.papyrus.gmf.internal.common.codegen.TextEmitter;
-import org.eclipse.papyrus.gmf.internal.common.codegen.TextMerger;
-
-/**
- * FIXME move to internal package as it's not necessary to expose this class to public
- */
-public class StandaloneGenerator extends GeneratorBase {
-	protected final Config myArgs;
-	private final TextEmitter myFigureGenerator;
-	private final StandaloneEmitters myAuxiliaryGenerators;
-	private boolean mySkipPluginStructire;
-	protected Processor myProcessor;
-	private final Map<String, FigureDescriptor> myCallbackFigures = new LinkedHashMap<String, FigureDescriptor>(); 
-	
-	public interface Config {
-		public String getPluginID();
-		public String getPluginFriendlyName();
-		public String getPluginProviderName();
-		public String getMainPackageName();
-
-		public String getPluginActivatorClassName();
-		public String getPluginActivatorPackageName();
-		public MapModeCodeGenStrategy getMapMode();
-		public String getRuntimeToken();
-	}
-
-	public static class ConfigImpl implements Config {
-		private final String myPluginId;
-		private final String myMainPackageName;
-		private final String myPluginFriendlyName;
-		private final String myPluginProviderName;
-		
-		private final String myPluginActivatorClassName;
-		private final String myPluginActivatorPackageName;
-
-		private final MapModeCodeGenStrategy myMapMode;
-		private final String myRuntimeToken;
-		
-		public ConfigImpl(String pluginId, String mainPackageName){
-			this(pluginId, mainPackageName, MapModeCodeGenStrategy.DYNAMIC, null);
-		}
-
-		public ConfigImpl(String pluginId, String mainPackageName, MapModeCodeGenStrategy mapMode, String runtimeToken) {
-			this(pluginId, mainPackageName, pluginId, "", "PluginActivator", (mainPackageName == null ? "" : mainPackageName + ".")  + "activator", mapMode, runtimeToken);
-		}
-
-		public ConfigImpl(String pluginId, String mainPackageName, String pluginFriendlyName, String pluginProviderName, String pluginActivatorClassName, String pluginActivatorPackageName, MapModeCodeGenStrategy mapMode, String runtimeToken){
-			myPluginId = pluginId;
-			myMainPackageName = mainPackageName == null ? "" : mainPackageName;
-			myPluginFriendlyName = pluginFriendlyName;
-			myPluginProviderName = pluginProviderName;
-			myPluginActivatorClassName = pluginActivatorClassName;
-			myPluginActivatorPackageName = pluginActivatorPackageName;
-			myMapMode = mapMode;
-			myRuntimeToken = runtimeToken;
-		}
-		
-		public String getMainPackageName() {
-			return myMainPackageName;
-		}
-		
-		public String getPluginFriendlyName() {
-			return myPluginFriendlyName;
-		}
-		
-		public String getPluginID() {
-			return myPluginId;
-		}
-		
-		public String getPluginProviderName() {
-			return myPluginProviderName;
-		}
-		
-		public String getPluginActivatorClassName() {
-			return myPluginActivatorClassName;
-		}
-		
-		public String getPluginActivatorPackageName() {
-			return myPluginActivatorPackageName;
-		}
-		
-		public MapModeCodeGenStrategy getMapMode() {
-			return myMapMode;
-		}
-
-		public String getRuntimeToken() {
-			return myRuntimeToken;
-		}
-	}
-
-	public static abstract class Processor {
-		public abstract void go(ProcessorCallback callback, Config config) throws InterruptedException ;
-
-		public String[] getRequiredBundles() {
-			return new String[0];
-		}
-	}
-
-	public interface ProcessorCallback {
-		public String visitFigure(FigureDescriptor f) throws InterruptedException;
-	}
-
-
-	public StandaloneGenerator(Processor p, Config config) {
-		this(p, config, null);
-	}
-
-	public StandaloneGenerator(Processor p, Config config, URL[] dynamicTemplates) {
-		assert p != null && config != null;
-		myArgs = config;
-		myProcessor = p;
-		String pluginActivatorFQN = composePluginActivatorClassFQN(config);
-		final MapModeCodeGenStrategy strategy;
-		String accessor;
-		if (config.getMapMode() == MapModeCodeGenStrategy.DYNAMIC) {
-			strategy = MapModeCodeGenStrategy.DYNAMIC;
-			accessor = pluginActivatorFQN + ".getDefault().";
-		} else {
-			strategy = config.getMapMode() == null ? MapModeCodeGenStrategy.STATIC : config.getMapMode();
-			accessor = null;
-		}
-		
-		myFigureGenerator = new FigureGenerator(config.getRuntimeToken(), getPackageName(), strategy, accessor, false, dynamicTemplates);
-		myAuxiliaryGenerators = new StandaloneEmitters(strategy, dynamicTemplates);
-	}
-
-	/**
-	 * Allows clients to skip generating of manifest.mf, pligin and build properties files. 
-	 * "New-plugin-by-template" generator uses this feature because it delegates this generation to PDE defaults.
-	 */
-	public void setSkipPluginStructure(boolean skipManifest){
-		mySkipPluginStructire = skipManifest;
-	}
-	
-	protected void setupProgressMonitor() {
-		//setupProgressMonitor("Generating GMFGraph plugin", 100);
-	}
-	
-	@Override
-	protected TextMerger createMergeService() {
-		// jcontrol model that is not initialized can't merge, hence java merging won't happen
-		// -   workspace preference as new line characters
-
-		return new DefaultTextMerger(getLocalLineSeparator(), new JControlModel());
-	}
-	
-	protected void customRun() throws InterruptedException, UnexpectedBehaviourException {
-		initializeEditorProject(myArgs.getPluginID(), null /*support only workspace project with figures*/);
-		
-		if (!mySkipPluginStructire){
-			generatePluginStructure();
-		}
-		try {
-			generateTopLevelFigures();
-			generatePluginActivator();
-		} catch (IllegalStateException e){
-			throw new UnexpectedBehaviourException(e);
-		}
-	}
-	
-	protected void generatePluginActivator() throws UnexpectedBehaviourException, InterruptedException{
-		Object[] args = new Object[] {myArgs, new ImportUtil(myArgs.getPluginActivatorPackageName(), myArgs.getPluginActivatorClassName()), new ArrayList<String>(myCallbackFigures.keySet())};
-		doGenerateJavaClass(myAuxiliaryGenerators.getPluginActivatorEmitter(), myArgs.getPluginActivatorPackageName(), myArgs.getPluginActivatorClassName(), args);		
-	}
-	
-	protected void generatePluginStructure() throws UnexpectedBehaviourException, InterruptedException {
-		doGenerateFile(myAuxiliaryGenerators.getBuildPropertiesEmitter(), new Path("build.properties"), myArgs);
-		doGenerateFile(myAuxiliaryGenerators.getManifestMFEmitter(), new Path("META-INF/MANIFEST.MF"), myArgs, myProcessor.getRequiredBundles());
-		doGenerateFile(myAuxiliaryGenerators.getPluginPropertiesEmitter(), new Path("plugin.properties"), myArgs);
-	}
-
-	private void generateTopLevelFigures() throws InterruptedException {
-		myCallbackFigures.clear(); // just in case
-		myProcessor.go(new ProcessorCallback() {
-			public String visitFigure(FigureDescriptor f) throws InterruptedException {
-				return StandaloneGenerator.this.visitFigure(f);
-			}
-		}, myArgs);
-	}
-
-	private String visitFigure(FigureDescriptor figureDescriptor) throws InterruptedException {
-		// XXX either use compilationUnitName from Util.ext or pass cu name as template argument
-		if (figureDescriptor.getName() == null) {
-			throw new IllegalArgumentException("FigureDescriptor needs a name");
-		}
-		final String compilationUnitName = CodeGenUtil.validJavaIdentifier(CodeGenUtil.capName(figureDescriptor.getName()));  
-		doGenerateJavaClass(myFigureGenerator, getPackageName(), compilationUnitName, figureDescriptor);
-		final String qualifiedName = composeFQN(getPackageName(), compilationUnitName);
-		myCallbackFigures.put(qualifiedName, figureDescriptor);
-		return qualifiedName;
-	}
-
-	private String getPackageName(){
-		return myArgs.getMainPackageName();
-	}
-	
-	private static String composePluginActivatorClassFQN(Config config) {
-		String packageName = config.getPluginActivatorPackageName();
-		String className = config.getPluginActivatorClassName();
-		return composeFQN(packageName, className);
-	}
-
-	private static String composeFQN(String packageName, String className){
-		return packageName == null || "".equals(packageName) ? className : packageName + "." + className; 
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/Activator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/Activator.java
deleted file mode 100644
index aecafdeb2c4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/Activator.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.papyrus.gmf.graphdef.codegen.MapModeCodeGenStrategy;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-import org.eclipse.papyrus.gmf.internal.xpand.util.BundleResourceManager;
-import org.osgi.framework.BundleContext;
-
-public class Activator extends Plugin {
-	private static Activator instance;
-
-	public Activator() {
-		instance = this;
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		instance = null;
-		super.stop(context);
-	}
-
-	public static ResourceManager createResourceEngine(MapModeCodeGenStrategy strategy, URL... dynamicTemplates) {
-		try {
-			URL baseURL = instance.getBundle().getEntry("/templates/");
-			ArrayList<URL> urls = new ArrayList<URL>(3);
-			if (dynamicTemplates != null) {
-				// XXX perhaps, add strategy token to each url
-				// to keep dynamic template structure similar to those bundled?
-				urls.addAll(Arrays.asList(dynamicTemplates));
-			}
-			if (strategy.getToken().length() > 0) {
-				urls.add(new URL(baseURL, strategy.getToken() + '/'));
-			}
-			urls.add(baseURL);
-			return new BundleResourceManager(urls.toArray(new URL[urls.size()]));
-		} catch (MalformedURLException ex) {
-			throw new Error(ex);
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/CanvasProcessor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/CanvasProcessor.java
deleted file mode 100644
index e8405710dc1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/CanvasProcessor.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.Config;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.Processor;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.ProcessorCallback;
-
-public class CanvasProcessor extends Processor {
-	private final DiagramElementsCopier myElementCopier;
-	private ProcessorCallback myCallback;
-	final Canvas myInput;
-	private Canvas myOutcome;
-	private FigureGallery myOutcomeGallery; 
-
-	public CanvasProcessor(Canvas input) {
-		assert input != null;
-		myInput = input;
-		myElementCopier = new DiagramElementsCopier();
-	}
-
-	public Canvas getOutcome() {
-		return myOutcome;
-	}
-
-	public void go(ProcessorCallback callback, Config config) throws InterruptedException {
-		myCallback = callback;
-		myOutcomeGallery = GMFGraphFactory.eINSTANCE.createFigureGallery();
-		myOutcomeGallery.setName(myInput.getFigures().size() == 1 ? myInput.getFigures().get(0).getName() : "GeneratedGallery");
-		// TODO respect implementation from original FigureGallery, see (#x#) 
-		myOutcomeGallery.setImplementationBundle(config.getPluginID());
-		handleNodes();
-		handleLinks();
-		handleCompartments();
-		handleLabels();
-		// can't use 
-		// = (Canvas) diagramElementCopier.copy(myInput);
-		// here because Copier.copy doesn't respect already copied elements
-		myOutcome = GMFGraphFactory.eINSTANCE.createCanvas();
-		myOutcome.setName(myInput.getName());
-		myOutcome.getFigures().add(myOutcomeGallery);
-
-		myOutcome.getCompartments().addAll(myElementCopier.copyAll(myInput.getCompartments()));
-		myOutcome.getLabels().addAll(myElementCopier.copyAll(myInput.getLabels()));
-		myOutcome.getNodes().addAll(myElementCopier.copyAll(myInput.getNodes()));
-		myOutcome.getConnections().addAll(myElementCopier.copyAll(myInput.getConnections()));
-
-		if (!myOutcome.eContents().isEmpty()) {
-			myElementCopier.copyReferences();
-		}
-		myCallback = null;
-	}
-
-	@Override
-	public String[] getRequiredBundles() {
-		HashSet<String> rv = new HashSet<String>();
-		for (FigureGallery next : myInput.getFigures()) {
-			if (next.getImplementationBundle() != null && next.getImplementationBundle().trim().length() > 0) {
-				// need this for a while, though this should be done in the fqnswitch. But as I'm trying to get rid of the
-				// switch, that's a temp hack to pass through
-				rv.add(next.getImplementationBundle());
-			}
-		}
-		return rv.toArray(new String[rv.size()]);
-	}
-
-	private void handleNodes() throws InterruptedException {
-		for (Node next : myInput.getNodes()) {
-			handleFigure(next.getFigure());
-		}
-	}
-
-	private void handleLinks() throws InterruptedException {
-		for (Connection next : myInput.getConnections()) {
-			handleFigure(next.getFigure());
-		}
-	}
-
-	private void handleCompartments() throws InterruptedException {
-		for (Compartment next : myInput.getCompartments()) {
-			FigureDescriptor nextFigure = next.getFigure();
-			if (nextFigure == null){
-				throw new NullPointerException("Compartment without figure : " + next);
-			}
-			handleFigure(nextFigure);
-		}
-	}
-
-	private void handleLabels() throws InterruptedException {
-		for (DiagramLabel next : myInput.getLabels()) {
-			if (next.getAccessor() == null) {
-				handleFigure(next.getFigure());
-			}
-			// else nothing to do as child accessors will get copied as part of parent figure process
-		}
-	}
-
-	private void handleFigure(FigureDescriptor fd) throws InterruptedException {
-		if (myElementCopier.isSubstituted(fd)) {
-			// already processed, nothing to do
-			return;
-			// XXX originally CustomFigures do not get into history of elementCopier, 
-			// hence may still get copied more than once. Perhaps, makes sense to have separate 'History'
-			// to keep track of processed figures?
-		}
-		if (fd.getActualFigure() instanceof CustomFigure && isPlainBareCustomFigure((CustomFigure) fd.getActualFigure())) {
-			// XXX an implementationBundle might be an issue here (#x#),
-			// since myOutcomeGallery gonna get one we generate, while the original CustomFigure
-			// may have one specified in the ownining FigureGallery.
-			final CustomFigure f = (CustomFigure) fd.getActualFigure();
-			myOutcomeGallery.getFigures().add(myElementCopier.xcopy(f));
-		} else {
-			String fqn = myCallback.visitFigure(fd);
-			final FigureDescriptor newFD = createCustomFigure(fd, fqn);
-			myElementCopier.registerSubstitution(fd, newFD);
-			for (ChildAccess ca : fd.getAccessors()) {
-				FigureAccessor newFA = GMFGraphFactory.eINSTANCE.createFigureAccessor();
-				newFA.setAccessor(ca.getAccessor());
-				newFA.setTypedFigure(createReferencedFigure(ca));
-				((CustomFigure) newFD.getActualFigure()).getCustomChildren().add(newFA);
-				final ChildAccess newCA = myElementCopier.xcopy(ca);
-				newCA.setFigure(newFA.getTypedFigure());
-				newFD.getAccessors().add(newCA);
-			}
-		}
-	}
-
-
-	/**
-	 * FIXME diplicates {@link org.eclipse.papyrus.gmf.bridge.genmodel.InnerClassViewmapProducer#isBareInstance}
-	 * Should be merged somehow.
-	 */
-	private static boolean isPlainBareCustomFigure(CustomFigure figure) {
-		if (!figure.getChildren().isEmpty()) {
-			return false;
-		}
-		final LinkedList<EStructuralFeature> featuresToCheck = new LinkedList<EStructuralFeature>(figure.eClass().getEAllStructuralFeatures());
-		featuresToCheck.remove(GMFGraphPackage.eINSTANCE.getRealFigure_Name());
-		featuresToCheck.remove(GMFGraphPackage.eINSTANCE.getRealFigure_Children());
-
-		featuresToCheck.remove(GMFGraphPackage.eINSTANCE.getCustomClass_QualifiedClassName());
-		featuresToCheck.remove(GMFGraphPackage.eINSTANCE.getCustomFigure_CustomChildren());
-
-		for(EStructuralFeature next : featuresToCheck) {
-			if (next.isDerived()) {
-				continue;
-			}
-			if (figure.eIsSet(next)) {
-				return false;
-			}
-		}
-		return true;
-	}
-
-	private FigureDescriptor createCustomFigure(FigureDescriptor original, String fqn) {
-		CustomFigure cf = GalleryMirrorProcessor.createCustomFigure(original.getActualFigure());
-		cf.setQualifiedClassName(fqn);
-		FigureDescriptor fd = GMFGraphFactory.eINSTANCE.createFigureDescriptor();
-		fd.setName(original.getName());
-		fd.setActualFigure(cf);
-		myOutcomeGallery.getDescriptors().add(fd);
-		return fd;
-	}
-
-	private static RealFigure createReferencedFigure(ChildAccess ca) {
-		// XXX ca.getFigure() may be FigureRef, need to revisit this usecase
-		if (false == ca.getFigure() instanceof RealFigure) {
-			return null;
-		}
-		EClass eType = ca.getFigure().eClass();
-		// it's just a type holder, hence no need to copy any attribute/children but type only.
-		RealFigure copy = (RealFigure) eType.getEPackage().getEFactoryInstance().create(eType);
-		if (copy instanceof CustomFigure) {
-			((CustomFigure) copy).setQualifiedClassName(((CustomFigure) ca.getFigure()).getQualifiedClassName());
-		}
-		return copy;
-	}
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/DiagramElementsCopier.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/DiagramElementsCopier.java
deleted file mode 100644
index cd89d1b8a87..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/DiagramElementsCopier.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen;
-
-import java.util.HashSet;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-
-class DiagramElementsCopier extends EcoreUtil.Copier {
-	private final HashSet<FigureDescriptor> myOriginalFigures = new HashSet<FigureDescriptor>();
-	
-	public void registerSubstitution(FigureDescriptor original, FigureDescriptor substituted){
-		put(original, substituted);
-		myOriginalFigures.add(original);
-	}
-
-	public boolean isSubstituted(FigureDescriptor original) {
-		return containsKey(original);
-	}
-
-	@SuppressWarnings("unchecked")
-	public <T extends EObject> T xcopy(T original) {
-		return (T) super.copy(original);
-	}
-
-	protected void copyReference(EReference eReference, EObject eObject, EObject copyEObject) {
-		if (EcoreUtil.isAncestor(myOriginalFigures, eObject)){
-			//no such features in the CustomFigure's
-			return;
-		}
-		super.copyReference(eReference, eObject, copyEObject);
-	}
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/GalleryMirrorProcessor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/GalleryMirrorProcessor.java
deleted file mode 100644
index aee99f8170e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/GalleryMirrorProcessor.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen;
-
-import java.util.Collections;
-import java.util.IdentityHashMap;
-import java.util.Map;
-
-import org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.Config;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.ProcessorCallback;
-
-/**
- * In addition to {@link GalleryProcessor} activities, collects names of transformed figures and 
- * allows to create {@link FigureGallery} full of them. 
- * @author artem
- */
-public class GalleryMirrorProcessor extends GalleryProcessor {
-	private final Map<FigureDescriptor, String> myFigure2FQN = new IdentityHashMap<FigureDescriptor, String>();
-	private String myGeneratedBundle;
-
-	public GalleryMirrorProcessor(FigureGallery[] input) {
-		super(input);
-	}
-
-	public void go(ProcessorCallback callback, Config config) throws InterruptedException {
-		super.go(callback, config);
-		myGeneratedBundle = config.getPluginID();
-	}
-
-	public FigureGallery convertFigureGallery(){
-		FigureGallery result = GMFGraphFactory.eINSTANCE.createFigureGallery();
-		result.setName("GeneratedGallery"); // FIXME smth reasonable
-		result.setImplementationBundle(myGeneratedBundle);
-		
-		for (FigureDescriptor fd : myFigure2FQN.keySet()) {
-			Figure nextOriginal = fd.getActualFigure();
-			String nextConvertedFqn = myFigure2FQN.get(fd);
-			CustomFigure custom = createCustomFigure(nextOriginal);
-			custom.setName(fd.getName());
-			custom.setQualifiedClassName(nextConvertedFqn);
-
-			result.getFigures().add(custom);
-		}
-		return result;
-	}
-
-	public Map<FigureDescriptor, String> getGenerationInfo() {
-		return Collections.unmodifiableMap(myFigure2FQN);
-	}
-
-	protected void handle(FigureDescriptor next, String fqn) {
-		myFigure2FQN.put(next, fqn);
-	}
-
-	static CustomFigure createCustomFigure(Figure original){
-		GMFGraphFactory factory = GMFGraphFactory.eINSTANCE;
-		if (original instanceof DecorationFigure){
-			return factory.createCustomDecoration();
-		} 
-		if (original instanceof ConnectionFigure){
-			return factory.createCustomConnection();
-		}
-		return factory.createCustomFigure();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/GalleryProcessor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/GalleryProcessor.java
deleted file mode 100644
index 43e33b59b1a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/src/org/eclipse/papyrus/gmf/internal/graphdef/codegen/GalleryProcessor.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.graphdef.codegen;
-
-import java.util.Arrays;
-import java.util.HashSet;
-
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.Config;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.Processor;
-import org.eclipse.papyrus.gmf.graphdef.codegen.StandaloneGenerator.ProcessorCallback;
-
-/**
- * Straightforwardly transforms all top-level figures from supplied galleries
- * @author artem
- */
-public class GalleryProcessor extends Processor {
-	private final FigureGallery[] myInput;
-
-	public GalleryProcessor(FigureGallery input) {
-		this(new FigureGallery[] { input });
-	}
-
-	public GalleryProcessor(FigureGallery[] input) {
-		assert !Arrays.asList(input).contains(null);
-		myInput = input;
-	}
-	
-	public void go(ProcessorCallback callback, Config config) throws InterruptedException {
-		for (int i = 0; i < myInput.length; i++) {
-			for (FigureDescriptor next : myInput[i].getDescriptors()) {
-				String fqn = callback.visitFigure(next);
-				handle(next, fqn);
-			}
-		}
-	}
-
-	/**
-	 * does nothing by default, override to do smth usable
-	 */
-	protected void handle(FigureDescriptor next, String fqn) {
-	}
-
-	@Override
-	public String[] getRequiredBundles() {
-		HashSet<String> rv = new HashSet<String>();
-		for (int i = 0; i < myInput.length; i++) {
-			if (myInput[i].getImplementationBundle() != null && myInput[i].getImplementationBundle().trim().length() > 0) {
-				rv.add(myInput[i].getImplementationBundle());
-			}
-		}
-		return rv.toArray(new String[rv.size()]);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates.qvtlib/NativeUtil.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates.qvtlib/NativeUtil.java
deleted file mode 100644
index 837b075aa92..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates.qvtlib/NativeUtil.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-public class NativeUtil {
-@Operation(contextual = false, kind = Kind.HELPER)
-public static String messageFormat(String pattern, java.util.List<Object> argument) { return java.text.MessageFormat.format(pattern, argument.toArray(new Object[argument.size()])); }
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Attrs.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Attrs.xpt
deleted file mode 100644
index beb79b736c8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Attrs.xpt
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«REM»Define attributes for Figures (for DecorationFigure subclasses see Decoration.xpt)«ENDREM»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Figure»
-«REM»Polymorphic entry point for any Figure's subclass attributes«ENDREM»
-«EXPAND attr::Figure::figureAttrs(figureVarName)»
-«ENDDEFINE»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Shape-»
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Label-»
-«figureVarName».setText("«text»");
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::VerticalLabel-»
-«figureVarName».setText("«text»");
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::RoundedRectangle-»
-«figureVarName».setCornerDimensions(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map FOR cornerWidth», «EXPAND MapMode::_map FOR cornerHeight»));
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::InvisibleRectangle-»
-«figureVarName».setOutline(false);
-«figureVarName».setFill(false);
-«figureVarName».setOpaque(false);
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::CustomFigure-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«REM»#379461 - Custom Attributes are set up as part of the call above«ENDREM»«-»
-«ENDDEFINE»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Polyline-»
-«FOREACH template AS pt-»
-«figureVarName».addPoint(new org.eclipse.draw2d.geometry.Point(«EXPAND MapMode::_map FOR pt»));
-«ENDFOREACH-»
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::SVGFigure-»
-«figureVarName».setURI("«documentURI»");
-«IF noCanvasWidth-»
-«figureVarName».setSpecifyCanvasWidth(false);
-«ENDIF-»
-«IF noCanvasHeight-»
-«figureVarName».setSpecifyCanvasHeight(false);
-«ENDIF-»
-«IF areaOfInterest <> null-»
-«figureVarName».setAreaOfInterest(«EXPAND Instance FOR areaOfInterest»);
-«ENDIF-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE Instance FOR gmfgraph::Rectangle2D-»
-new java.awt.geom.Rectangle2D.Float(«x»f, «y»f, «width»f, «height»f)
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Border.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Border.xpt
deleted file mode 100644
index 024e60c30fe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Border.xpt
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
-
-«DEFINE Init(figureVarName : String) FOR gmfgraph::Border-»
-«figureVarName».setBorder(«EXPAND border(figureVarName)»);
-«ENDDEFINE»
-
-«DEFINE InitMethods FOR gmfgraph::Figure»
-«FOREACH getBordersInUse() AS b»«EXPAND initMethod((getBordersInUse()->indexOf(b) - 1)) FOR b»«ENDFOREACH-»
-«ENDDEFINE»
-
-«DEFINE initMethod(c : Integer) FOR gmfgraph::CustomBorder-»
-	/**
-	 * @generated
-	 */
-	private org.eclipse.draw2d.Border createBorder«c»() {
-		«EXPAND Runtime::newInstance('result')»
-		«EXPAND attr::CustomClass::Init('result')»
-		return result;
-	}
-«ENDDEFINE»
-
-«DEFINE border(figureVarName : String) FOR gmfgraph::Border»
-«ERROR 'This is an abstract definition border(String, Border) invoked for ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE border(figureVarName : String) FOR gmfgraph::LineBorder-»
-new org.eclipse.draw2d.LineBorder(«IF null = color»null«ELSE»«EXPAND attr::Figure::color(figureVarName.toUpper() + '_BORDER') FOR color»«ENDIF», «EXPAND MapMode::_map FOR width»)«ENDDEFINE»
-
-«DEFINE border(figureVarName : String) FOR gmfgraph::MarginBorder-»
-new org.eclipse.draw2d.MarginBorder(«EXPAND MapMode::_map FOR insets»)«ENDDEFINE»
-
-«DEFINE border(figureVarName : String) FOR gmfgraph::CompoundBorder-»
-new org.eclipse.draw2d.CompoundBorder(«IF outer = null»null«ELSE»«EXPAND border(figureVarName) FOR outer»«ENDIF», «IF inner = null»null«ELSE»«EXPAND border(figureVarName) FOR inner»«ENDIF»)
-«ENDDEFINE»
-
-«DEFINE border(figureVarName : String) FOR gmfgraph::CustomBorder-»
-createBorder«getBordersInUse()->size()»()«addBorder(self)-»
-«ENDDEFINE»
-
-«DEFINE border(figureVarName : String) FOR gmfgraph::BorderRef-»
-«EXPAND border(figureVarName) FOR actual-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Children.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Children.xpt
deleted file mode 100644
index 15adf656994..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Children.xpt
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«EXTENSION Util»
-
-«DEFINE CreateChildren FOR gmfgraph::RealFigure-»
-	/**
-	 * @generated
-	 */
-	private void createContents(){
-«EXPAND instantiate(0, self, 'this') FOREACH children»
-	}
-«ENDDEFINE»
-
-«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::Figure»
-«ERROR 'Abstract instantiate(int, RealFigure, String)'»
-«ENDDEFINE»
-
-«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::FigureRef-»
-«LET figureVariableName(figure, count) AS figureVarName»
-«EXPAND instantiate(count, parentFigure, parentFigureVariable) FOR figure-»
-// Process FigureRef details
-«EXPAND populate(count, parentFigure, parentFigureVariable, figureVarName) FOR self-»
-«ENDLET»
-«ENDDEFINE»
-
-«DEFINE instantiate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String) FOR gmfgraph::RealFigure»
-«LET figureVariableName(self, count) AS figureVarName»
-«EXPAND newFigureInstance(figureVarName)»
-«EXPAND populate(count, parentFigure, parentFigureVariable, figureVarName) FOR self-»
-«EXPAND instantiate(count + 1, self, figureVarName) FOREACH children-»
-«ENDLET»
-«ENDDEFINE»
-
-«DEFINE populate(count : Integer, parentFigure : gmfgraph::RealFigure, parentFigureVariable : String, figureVarName : String) FOR gmfgraph::Figure»
-«EXPAND Attrs::Init(figureVarName)-»
-«IF null = layoutData or null = parentFigure.layout-»«REM»Check for (parentLayout != null) to avoid generating data that won't be used. Not sure it's essential, but it was that way with old jet templates«ENDREM»
-«parentFigureVariable».add(«figureVarName»);
-«ELSE-»
-«EXPAND LayoutData::Init(parentFigureVariable, figureVarName) FOR layoutData-»
-«ENDIF-»
-«EXPAND Layout::Init(figureVarName) FOR layout-»
-«ENDDEFINE»
-
-«DEFINE newFigureInstance(figureVarName : String) FOR gmfgraph::RealFigure»«IF needsField(self)»«figureVarName» = «EXPAND Runtime::newInstance»;«ELSE»«EXPAND Runtime::newInstance(figureVarName)»«ENDIF»«ENDDEFINE»
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Decoration.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Decoration.xpt
deleted file mode 100644
index bbcceecad1f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Decoration.xpt
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
-
-«REM»Instantiate and define attributes for DecorationFigures«ENDREM»
-
-«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::DecorationFigure-»
-«EXPAND Runtime::newInstance(figureVarName)»
-«EXPAND Attrs::Init(figureVarName)»
-«ENDDEFINE»
-
-«REM»Guess, can't delegate to attrs through Attrs::Init because there's already Init for Polyline«ENDREM»
-«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
-«EXPAND Runtime::newInstance(figureVarName)»
-«EXPAND attr::Decoration::polylineAttrs(figureVarName)-»
-«ENDDEFINE»
-
-«REM»Copy of above template for PolylineDecoration, just because PolygonDecoration doesn't extend PolylineDecoration in draw2d and gmfgraph«ENDREM»
-«DEFINE Instantiate(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
-«EXPAND Runtime::newInstance(figureVarName)»
-«EXPAND attr::Decoration::polylineAttrs(figureVarName)-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Extras.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Extras.xpt
deleted file mode 100644
index 6401181c0f5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Extras.xpt
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«EXTENSION Util»
-
-«DEFINE extraMethods FOR gmfgraph::Figure»«ENDDEFINE»
-
-«DEFINE extraMethods FOR gmfgraph::SVGFigure-»
-«EXPAND svgProperty FOREACH properties-»
-«ENDDEFINE»
-
-// XXX move to distinct location (folder)
-«DEFINE svgProperty FOR gmfgraph::SVGProperty-»
-«IF getter <> null-»
-	«EXPAND svgPropertyGetter-»
-«ENDIF-»
-«IF setter <> null-»
-	«EXPAND svgPropertySetter-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE svgPropertyGetter FOR gmfgraph::SVGProperty-»
-
-	/**
-	 * @generated
-	 */
-	public «svgPropertyType(self)» «getter»() {
-		org.w3c.dom.NodeList nodes = getNodes("«_query»"); //$NON-NLS-1$
-		if (nodes.getLength() > 0) {
-			org.w3c.dom.Element element = (org.w3c.dom.Element) nodes.item(0);
-			«IF type = gmfgraph::SVGPropertyType::COLOR-»
-			return getColor(element, "«attribute»"); //$NON-NLS-1$
-			«ELSEIF type = gmfgraph::SVGPropertyType::FLOAT-»
-			String value = element.getAttributeNS(null, "«attribute»"); //$NON-NLS-1$
-			return Float.parseFloat(value);
-			«ELSE-»
-			return element.getAttributeNS(null, "«attribute»"); //$NON-NLS-1$
-			«ENDIF-»
-		}
-		«IF type = gmfgraph::SVGPropertyType::FLOAT-»
-		return 0;
-		«ELSE-»
-		return null;
-		«ENDIF-»
-	}
-«ENDDEFINE»
-
-«DEFINE svgPropertySetter FOR gmfgraph::SVGProperty-»
-
-	/**
-	 * @generated
-	 */
-	public void «setter»(«svgPropertyType(self)» value) {
-		«IF type = gmfgraph::SVGPropertyType::COLOR-»
-		String svalue = org.eclipse.gmf.runtime.lite.svg.SVGUtils.toSVGColor(getDocument(), value);
-		«ELSEIF type = gmfgraph::SVGPropertyType::FLOAT-»
-		String svalue = Float.toString(value);
-		«ENDIF-»
-		org.w3c.dom.NodeList nodes = getNodes("«_query»"); //$NON-NLS-1$
-		for (int i = 0; i < nodes.getLength(); i++) {
-			((org.w3c.dom.Element) nodes.item(i)).setAttributeNS(null, "«attribute»", //$NON-NLS-1$
-				«IF type = gmfgraph::SVGPropertyType::STRING»value«ELSE»svalue«ENDIF»);
-		}
-		«IF callSuper-»
-		super.«setter»(value);
-		«ENDIF-»
-	}
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Layout.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Layout.xpt
deleted file mode 100644
index e0bb5ee6044..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Layout.xpt
+++ /dev/null
@@ -1,95 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Michael Golubev (Borland) - GridLayout attributes
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
-
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::Layout-»
-«owningFigureVariable».setLayoutManager(«EXPAND Runtime::newInstance»);
-«ENDDEFINE»
-
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::LayoutRef-»
-«EXPAND Init(owningFigureVariable) FOR actual-»
-«ENDDEFINE»
-
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::BorderLayout-»
-«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
-	«EXPAND Runtime::newInstance(layoutVarName)»
-«IF null <> spacing-»
-	«layoutVarName».setHorizontalSpacing(«spacing.dx»);// TODO mapMode?
-	«layoutVarName».setVerticalSpacing(«spacing.dy»);
-«ENDIF-»
-	«owningFigureVariable».setLayoutManager(«layoutVarName»);
-«ENDLET»
-«ENDDEFINE»
-
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::GridLayout-»
-«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
-	«EXPAND Runtime::newInstance(layoutVarName)»
-	«layoutVarName».numColumns = «numColumns»;
-	«layoutVarName».makeColumnsEqualWidth = «equalWidth»;
-«IF null <> spacing-»
-	«layoutVarName».horizontalSpacing = «spacing.dx»;
-	«layoutVarName».verticalSpacing = «spacing.dy»;
-«ENDIF-»
-«IF null <> margins-»
-	«layoutVarName».marginWidth = «margins.dx»;
-	«layoutVarName».marginHeight = «margins.dy»;
-«ENDIF-»
-	«owningFigureVariable».setLayoutManager(«layoutVarName»);
-«ENDLET»
-«ENDDEFINE»
-
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::FlowLayout-»
-«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
-	«EXPAND Runtime::newInstance(layoutVarName)»
-	«layoutVarName».setStretchMinorAxis(«matchMinorSize»);
-	«layoutVarName».setMinorAlignment(«EXPAND Runtime::fqn».«EXPAND alignment(forceSingleLine) FOR minorAlignment»);
-«IF forceSingleLine»
-	«layoutVarName».setSpacing(«majorSpacing»);
-	«layoutVarName».setVertical(«vertical»);
-«ELSE»
-	«layoutVarName».setMajorAlignment(«EXPAND Runtime::fqn».«EXPAND alignment(forceSingleLine) FOR majorAlignment»);
-	«layoutVarName».setMajorSpacing(«majorSpacing»);
-	«layoutVarName».setMinorSpacing(«minorSpacing»);
-	«layoutVarName».setHorizontal(«not vertical»);
-«ENDIF»
-	«owningFigureVariable».setLayoutManager(«layoutVarName»);
-«ENDLET»
-«ENDDEFINE»
-
-«DEFINE Init(owningFigureVariable : String) FOR gmfgraph::CustomLayout-»
-«LET 'layout' + owningFigureVariable.firstToUpper() AS layoutVarName»
-	«EXPAND Runtime::newInstance(layoutVarName)»
-«EXPAND attr::CustomClass::Init(layoutVarName)-»
-	«owningFigureVariable».setLayoutManager(«layoutVarName»);
-«ENDLET»
-«ENDDEFINE»
-
-«DEFINE alignment(forceSingleLine : Boolean) FOR gmfgraph::Alignment-»
-«IF self = gmfgraph::Alignment::BEGINNING-»
-«IF forceSingleLine»ALIGN_TOPLEFT«ELSE»ALIGN_LEFTTOP«ENDIF-»
-«ELSEIF self = gmfgraph::Alignment::END-»
-«IF forceSingleLine»ALIGN_BOTTOMRIGHT«ELSE»ALIGN_RIGHTBOTTOM«ENDIF-»
-«ELSE-»
-ALIGN_CENTER«ENDIF-»
-«REM»XXX implement as extension
-switch (value) {
-  case Alignment.BEGINNING : ""
-  default : ""
-}«ENDREM»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/LayoutData.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/LayoutData.xpt
deleted file mode 100644
index 2c4a531ec83..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/LayoutData.xpt
+++ /dev/null
@@ -1,63 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
-
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::LayoutData»
-«ERROR 'Abstract definition, there should be specific template for ' + self.repr()»
-«ENDDEFINE»
-
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::BorderLayoutData»
-«parentFigureVariable».add(«owningFigureVariable», org.eclipse.draw2d.BorderLayout.«borderLayoutConstant(self)»);
-«ENDDEFINE»
-
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::XYLayoutData»
-«parentFigureVariable».add(«owningFigureVariable», «EXPAND newRectangle»);
-«ENDDEFINE»
-
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::CustomLayoutData»
-«LET 'constraint' + owningFigureVariable.firstToUpper() AS constraintVarName-»
-«qualifiedClassName» «constraintVarName» = new «qualifiedClassName»();
-«EXPAND attr::CustomClass::Init(constraintVarName)»
-«parentFigureVariable».add(«owningFigureVariable», «constraintVarName»);
-«ENDLET-»
-«ENDDEFINE»
-
-«DEFINE Init(parentFigureVariable : String, owningFigureVariable : String) FOR gmfgraph::GridLayoutData»
-«LET 'constraint' + owningFigureVariable.firstToUpper() AS constraintVarName»
-«EXPAND Runtime::newInstance(constraintVarName)»
-«constraintVarName».verticalAlignment = «EXPAND Runtime::fqn».«verticalAlignment.repr()»;«REM».literal, not .name!«ENDREM»
-«constraintVarName».horizontalAlignment = «EXPAND Runtime::fqn».«horizontalAlignment.repr()»;
-«constraintVarName».horizontalIndent = «horizontalIndent»;
-«constraintVarName».horizontalSpan = «horizontalSpan»;
-«constraintVarName».verticalSpan = «verticalSpan»;
-«constraintVarName».grabExcessHorizontalSpace = «grabExcessHorizontalSpace»;
-«constraintVarName».grabExcessVerticalSpace = «grabExcessVerticalSpace»;
-«IF null <> sizeHint-»
-«constraintVarName».widthHint = «sizeHint.dx»;
-«constraintVarName».heightHint = «sizeHint.dy»;
-«ENDIF-»
-«parentFigureVariable».add(«owningFigureVariable», «constraintVarName»);
-«ENDLET»
-«ENDDEFINE»
-
-«DEFINE newRectangle FOR gmfgraph::XYLayoutData»
-new org.eclipse.draw2d.geometry.Rectangle(«IF null <> topLeft-»
-«EXPAND MapMode::_map FOR topLeft», «ELSE»0, 0, «ENDIF-»
-«IF null <> size-»
-«EXPAND MapMode::_map FOR size»«ELSE»0, 0«ENDIF»)
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/MapMode.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/MapMode.xpt
deleted file mode 100644
index 9cd3b7139ef..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/MapMode.xpt
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-
-«REM»No mapMode at all«ENDREM»
-
-«DEFINE _map FOR gmfgraph::Dimension-»
-«dx», «dy-»
-«ENDDEFINE»
-
-«DEFINE _map FOR gmfgraph::Point-»
-«x», «y-»
-«ENDDEFINE»
-
-«DEFINE _map FOR Integer»
-«self-»
-«ENDDEFINE»
-
-«DEFINE _map FOR gmfgraph::Insets-»
-«top», «left», «bottom», «right-»
-«ENDDEFINE»
-
-«DEFINE Activator FOR OclAny-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Runtime.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Runtime.xpt
deleted file mode 100644
index 7bbe268b864..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Runtime.xpt
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«EXTENSION Util»
-
-«DEFINE newInstance(figureVarName : String) FOR gmfgraph::Figure»«EXPAND fqn» «figureVarName» = «EXPAND newInstance»;«ENDDEFINE»
-«DEFINE newInstance FOR gmfgraph::Figure»new «EXPAND fqn»()«ENDDEFINE»
-
-«DEFINE newInstance(layoutVarName : String) FOR gmfgraph::Layout»«EXPAND fqn» «layoutVarName» = «EXPAND newInstance»;«ENDDEFINE»
-«DEFINE newInstance FOR gmfgraph::Layout»new «EXPAND fqn»()«ENDDEFINE»
-
-«DEFINE newInstance(constraintVarName : String) FOR gmfgraph::LayoutData»«EXPAND fqn» «constraintVarName» = «EXPAND newInstance»;«ENDDEFINE»
-«DEFINE newInstance FOR gmfgraph::LayoutData»new «EXPAND fqn»()«ENDDEFINE»
-
-«DEFINE newInstance(borderVarName : String) FOR gmfgraph::Border»«EXPAND fqn» «borderVarName» = «EXPAND newInstance»;«ENDDEFINE»
-«DEFINE newInstance FOR gmfgraph::Border»new «EXPAND fqn»()«ENDDEFINE»
-
-
-«DEFINE fqn FOR gmfgraph::Figure»«ERROR 'Abstract definition fqn(Figure)'»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Layout»«ERROR 'Abstract definition fqn(Layout)'»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::LayoutData»«ERROR 'Abstract definition fqn(LayoutData)'»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Border»«ERROR 'Abstract definition fqn(Border)'»«ENDDEFINE»
-
-////////////////////////
-«DEFINE fqn FOR gmfgraph::CustomLayout»«qualifiedClassName»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::CustomBorder»«qualifiedClassName»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::CustomFigure»«qualifiedClassName»«ENDDEFINE»
-
-////////////////////////
-«DEFINE fqn FOR gmfgraph::FlowLayout»«IF forceSingleLine»org.eclipse.draw2d.ToolbarLayout«ELSE»org.eclipse.draw2d.FlowLayout«ENDIF»«ENDDEFINE»
-
-«DEFINE fqn FOR gmfgraph::XYLayout»org.eclipse.draw2d.XYLayout«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::XYLayoutData»org.eclipse.draw2d.geometry.Rectangle«ENDDEFINE»
-
-«DEFINE fqn FOR gmfgraph::GridLayout»org.eclipse.draw2d.GridLayout«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::GridLayoutData»org.eclipse.draw2d.GridData«ENDDEFINE»
-
-«DEFINE fqn FOR gmfgraph::StackLayout»org.eclipse.draw2d.StackLayout«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::BorderLayout»org.eclipse.draw2d.BorderLayout«ENDDEFINE»
-
-«REM»CenterLayout requires dependency to tooling runtime if the stabdalone plugin is generated«ENDREM»
-«DEFINE fqn FOR gmfgraph::CenterLayout»org.eclipse.gmf.tooling.runtime.draw2d.CenterLayout«ENDDEFINE»
-
-////////////////////////
-«DEFINE fqn FOR gmfgraph::FigureRef»«EXPAND fqn FOR figure»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»org.eclipse.draw2d.Label«ENDIF»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::VerticalLabel»org.eclipse.gmf.tooling.runtime.draw2d.labels.VerticalLabel«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::LabeledContainer»org.eclipse.draw2d.LabeledContainer«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Rectangle»org.eclipse.draw2d.RectangleFigure«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::RoundedRectangle»org.eclipse.draw2d.RoundedRectangle«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::InvisibleRectangle»org.eclipse.draw2d.RectangleFigure«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Ellipse»org.eclipse.draw2d.Ellipse«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Polygon»org.eclipse.draw2d.PolygonShape«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::ScalablePolygon»org.eclipse.draw2d.ScalablePolygonShape«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::PolygonDecoration»org.eclipse.draw2d.PolygonDecoration«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::Polyline»org.eclipse.draw2d.PolylineShape«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::PolylineDecoration»org.eclipse.draw2d.PolylineDecoration«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::PolylineConnection»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx«ELSE»org.eclipse.draw2d.PolylineConnection«ENDIF»«ENDDEFINE»
-«DEFINE fqn FOR gmfgraph::SVGFigure»org.eclipse.gmf.runtime.lite.svg.SVGFigure«ENDDEFINE»
-
-«REM»
-to utilize around, need to fix XpandExecutionContextImpl to get aspects not only from relative aspects/ path, but from
-template file as well.
-// Full GMF Runtime
-////////////////////////
-«AROUND fqn FOR PolylineConnection»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.PolylineConnectionEx«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
-«AROUND fqn FOR Label»«IF isFullRuntime()»org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel«ELSE»«targetDef.proceed()»«ENDIF»«ENDAROUND»
-«ENDREM»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Util.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Util.qvto
deleted file mode 100644
index d783557f203..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/Util.qvto
+++ /dev/null
@@ -1,217 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.GlobalVarOperations;
-import xpt.StreamOperations;
-import xpt.StringOperations;
-
-modeltype gmfgraph uses "http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition";
-modeltype ECORE uses ecore('http://www.eclipse.org/emf/2002/Ecore');
-
-library Util;
-
-property bordersInUse : Sequence(gmfgraph::CustomBorder) = Sequence {  };
-
-helper addBorder(border : gmfgraph::CustomBorder) : OclVoid {
-	bordersInUse := bordersInUse->including(border);
-	return null
-}
-
-helper clearBorders() : OclVoid {
-	bordersInUse := Sequence {  };
-	return null
-}
-
-helper getBordersInUse() : Sequence(gmfgraph::CustomBorder) {
-	return bordersInUse;
-}
-
-helper compilationUnitName(figure : gmfgraph::FigureDescriptor) : String {
-	return figure.name.firstToUpper()
-}
-
-helper hasSourceDecoration(figure : gmfgraph::PolylineConnection) : Boolean {
-	return null <> figure.sourceDecoration
-}
-
-helper requiredBundles(referencedBundles : Sequence(String)) : Sequence(String) {
-	return (
-		let fixedBundles : Sequence(String) = 
-			if isFullRuntime() 
-			then Sequence { 'org.eclipse.core.runtime', 'org.eclipse.draw2d', 'org.eclipse.gmf.runtime.draw2d.ui' }  
-			else Sequence { 'org.eclipse.core.runtime', 'org.eclipse.draw2d' }
-			endif
-		in
-			//suspicious '->asOrderedSet()->asSequence()->asOrderedSet()->asSequence()' but I am not brave enough to change it 
-			fixedBundles->union(referencedBundles)->asOrderedSet()->asSequence()->asOrderedSet()->asSequence() 
-	)
-}
-
-helper additionalStaticFields() : String {
-return if xpandGetStreamNames()->includes('staticFields') then xpandGetStreamContents('staticFields') else '' endif
-}
-
-helper hasTargetDecoration(figure : gmfgraph::PolylineConnection) : Boolean {
-	return null <> figure.targetDecoration
-}
-
-helper isFullRuntime() : Boolean {
-	return (if internalCheckRuntimeToken() <> null then internalCheckRuntimeToken().toLower() = 'full' else true endif)
-}
-
-helper internalCheckRuntimeToken() : String {
-return xpandGetStringGlobalVar('runtimeToken')
-}
-
-helper needsField(figure : gmfgraph::RealFigure) : Boolean {
-	return realFigureNeedsField(figure)
-}
-
-helper realFigureNeedsField(figure : gmfgraph::RealFigure) : Boolean {
-	return hasDescriptor(figure) and figure.descriptor.accessors.figure->includes(figure)
-}
-
-helper hasDescriptor(figure : gmfgraph::RealFigure) : Boolean {
-	return figure.descriptor <> null
-}
-
-helper needsField(figure : gmfgraph::CustomFigure) : Boolean {
-	return realFigureNeedsField(figure) or customFigureNeedsField(figure)
-}
-
-helper customFigureNeedsField(figure : gmfgraph::CustomFigure) : Boolean {
-	return hasDescriptor(figure) and not figure.customChildren->isEmpty()
-}
-
-helper childrenWithoutDecoration(connection : gmfgraph::PolylineConnection) : Sequence(gmfgraph::Figure) {
- return safeExcluding2(connection.children->asSequence(), connection.sourceDecoration, connection.targetDecoration) 
-}
-
-helper safeExcluding2(list : Sequence(gmfgraph::Figure), exclusionA: gmfgraph::Figure, exclusionB: gmfgraph::Figure) : Sequence(gmfgraph::Figure) {
- return safeExcluding(safeExcluding(list, exclusionA), exclusionB)
-}
-
-helper safeExcluding(list : Sequence(gmfgraph::Figure), exclusion: gmfgraph::Figure) : Sequence(gmfgraph::Figure) {
- return if null <> exclusion then list->excluding(exclusion) else list endif
-}
-
-helper figureVariableName(figure : gmfgraph::RealFigure, count : Integer) : String {
-	return (if needsField(figure) then figure.figureFieldName() else (if figure.name <> null and figure.name.trim().size() > 0 then figure.name.xpandToFirstLower() + count.repr() else figure.variableNameStem() + count.repr() endif) endif)
-}
-
-helper gmfgraph::FigureRef::nameStem() : String {
-	return self.figure.variableNameStem()
-}
-
-helper gmfgraph::Figure::nameStem() : String {
-	return self.variableNameStem()
-}
-
-helper gmfgraph::Figure::variableNameStem() : String {
-	return 'fig'
-}
-
-helper gmfgraph::RealFigure::variableNameStem() : String {
-	return 'fig'
-}
-
-helper gmfgraph::Shape::variableNameStem() : String {
-	return 'shape'
-}
-
-helper gmfgraph::Rectangle::variableNameStem() : String {
-	return 'rect'
-}
-
-helper gmfgraph::RoundedRectangle::variableNameStem() : String {
-	return 'rrect'
-}
-
-helper gmfgraph::Ellipse::variableNameStem() : String {
-	return 'elli'
-}
-
-helper gmfgraph::Polyline::variableNameStem() : String {
-	return 'polyline'
-}
-
-helper gmfgraph::Label::variableNameStem() : String {
-	return 'l'
-}
-
-helper gmfgraph::DecorationFigure::variableNameStem() : String {
-	return 'dec'
-}
-
-helper gmfgraph::ConnectionFigure::variableNameStem() : String {
-	return 'conn'
-}
-
-helper gmfgraph::RealFigure::figureFieldName() : String {
-	return figureFieldName(self.descriptor.accessors->select(a | self = a.figure)->asSequence())
-}
-
-helper figureFieldName(aaa : Sequence(gmfgraph::ChildAccess)) : String {
-	return aaa->collect(x | x.figureFieldName())->first()
-}
-
-helper gmfgraph::CustomFigure::figureFieldName() : String {
-	return 'my' + self.name.firstToUpper();
-}
-
-helper gmfgraph::ChildAccess::figureFieldName() : String {
-	return 'f' + (if self.accessor.startsWith('get') and self.accessor.size() > 3 then self.accessor.substringAfter('get') else self.accessor endif)
-}
-
-helper borderLayoutConstant(layoutData : gmfgraph::BorderLayoutData) : String {
-	return switch { case (layoutData.alignment = gmfgraph::Alignment::BEGINNING) (if layoutData.vertical then 'TOP' else 'LEFT' endif); case (layoutData.alignment = gmfgraph::Alignment::END) (if layoutData.vertical then 'BOTTOM' else 'RIGHT' endif); else 'CENTER'; }
-}
-
-helper allCustomAccessors(fd : gmfgraph::FigureDescriptor) : Sequence(gmfgraph::FigureAccessor) {
-	return filterCustom(Sequence { fd.actualFigure }).customChildren
-}
-
-helper filterCustom(fd : gmfgraph::FigureDescriptor) : Sequence(gmfgraph::CustomFigure) {
-	return filterCustom(Sequence { fd.actualFigure });
-}
-
-helper filterCustom(figures : Sequence(gmfgraph::Figure)) : Sequence(gmfgraph::CustomFigure) {
-	return (if figures->isEmpty() then Sequence { } else
-		(figures)[gmfgraph::CustomFigure]->
-			union(filterCustom((figures)[gmfgraph::RealFigure].children))->
-			union(filterCustom((figures)[gmfgraph::CustomFigure].customChildren.
-				typedFigure)) endif)->collect(it | it)->asSequence()
-}
-
-helper getCustomFigureChainFigureAccess(xptSelf : gmfgraph::ChildAccess) : Sequence(gmfgraph::FigureAccessor) {
-	var res : Sequence(FigureAccessor) = Sequence { } ;
-	var cf = xptSelf.figure;
-	if cf <> null and cf.oclAsType(EObject).eContainer().oclIsKindOf(gmfgraph::FigureAccessor) then
-		return getChainFigureAccessors(cf.oclAsType(EObject).eContainer().oclAsType(gmfgraph::FigureAccessor))
-	endif;
-	return null;
-}
-
-helper getChainFigureAccessors(accessor : gmfgraph::FigureAccessor) : Sequence(gmfgraph::FigureAccessor){
-	var res : Sequence(FigureAccessor) = Sequence { } ;
-	var figure = accessor.oclAsType(ECORE::EObject).eContainer();
-	if figure.oclIsKindOf(gmfgraph::CustomFigure) and figure.eContainer().oclIsKindOf(gmfgraph::FigureAccessor) then {
-		res := getChainFigureAccessors(figure.eContainer().oclAsType(gmfgraph::FigureAccessor));
-	} endif;
-	return res->append(accessor);
-}
-
-helper svgPropertyType(p : gmfgraph::SVGProperty) : String {
-	return switch { case (p.type = gmfgraph::SVGPropertyType::COLOR) 'org.eclipse.swt.graphics.Color'; case (p.type = gmfgraph::SVGPropertyType::FLOAT) 'float'; else 'String'; }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/CustomAttributeOwner.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/CustomAttributeOwner.xpt
deleted file mode 100644
index b1b55078a46..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/CustomAttributeOwner.xpt
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2012, 2020 Montages A.G., CEA LIST, Artal 
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Montages) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«REM»
-We would like to move implementation of the customAttribute' and related from CustomClass.xpt to here, 
-But have to respect the possibility that someone has AROUND's for them a the old location in the CustomClass.xpt
-«ENDREM» 
-
-«DEFINE customAttributes(instanceVarName : String) FOR gmfgraph::CustomAttributeOwner -»
-«EXPAND attr::CustomClass::customAttribute(instanceVarName) FOREACH attributes -»
-«ENDDEFINE»
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/CustomClass.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/CustomClass.xpt
deleted file mode 100644
index 436b877c11e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/CustomClass.xpt
+++ /dev/null
@@ -1,39 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«EXTENSION NativeUtil»
-
-«DEFINE Init(instanceVarName : String) FOR gmfgraph::CustomClass -»
-«EXPAND customAttribute(instanceVarName) FOREACH attributes -»
-«ENDDEFINE»
-
-«DEFINE customAttribute(instanceVarName : String) FOR gmfgraph::CustomAttribute -»
-«EXPAND customAttrValueImpl-»
-«IF directAccess -»
-«instanceVarName».«name» = «EXPAND customAttrValue»;
-«ELSE -»
-«instanceVarName».set«name.firstToUpper()»(«EXPAND customAttrValue»);
-«ENDIF -»
-«ENDDEFINE»
-
-«DEFINE customAttrValueImpl FOR gmfgraph::CustomAttribute -»
-«IF multiStatementValue-»
-«messageFormat(value, Sequence { 'attr' + name.firstToUpper() })-»
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE customAttrValue FOR gmfgraph::CustomAttribute -»
-«IF multiStatementValue»attr«name.firstToUpper()»«ELSE-»«value»«ENDIF-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Decoration.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Decoration.xpt
deleted file mode 100644
index f1d79b15814..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Decoration.xpt
+++ /dev/null
@@ -1,55 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION Util»
-
-«DEFINE polylineAttrs(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«EXPAND templatePoints(figureVarName)-»
-«EXPAND scale(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE polylineAttrs(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
-«EXPAND attr::Shape::shapeAttrs(figureVarName)-»
-«EXPAND attr::Figure::figureAttrs(figureVarName)-»
-«EXPAND templatePoints(figureVarName)-»
-«EXPAND scale(figureVarName)-»
-«ENDDEFINE»
-
-«DEFINE templatePoints(figureVarName : String) FOR gmfgraph::Polyline-»
-«IF not template->isEmpty()-»
-org.eclipse.draw2d.geometry.PointList pl = new org.eclipse.draw2d.geometry.PointList();
-«EXPAND templatePoint('pl') FOREACH template-»
-«figureVarName».setTemplate(pl);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE templatePoint(pointListVarName : String) FOR gmfgraph::Point-»
-«pointListVarName».addPoint(«EXPAND MapMode::_map»);
-«ENDDEFINE»
-
-«DEFINE scale(figureVarName : String) FOR gmfgraph::PolylineDecoration-»
-«IF not template->isEmpty()-»
-«figureVarName».setScale(«EXPAND MapMode::_map FOR 7», «EXPAND MapMode::_map FOR 3»);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE scale(figureVarName : String) FOR gmfgraph::PolygonDecoration-»
-«IF not template->isEmpty()-»
-«figureVarName».setScale(«EXPAND MapMode::_map FOR 7», «EXPAND MapMode::_map FOR 3»);
-«ENDIF-»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Figure.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Figure.xpt
deleted file mode 100644
index 2327e01e859..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Figure.xpt
+++ /dev/null
@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«DEFINE figureAttrs(figureVarName : String) FOR gmfgraph::Figure-»
-«EXPAND foregroundColor(self, figureVarName) FOR foregroundColor-»
-«EXPAND backgroundColor(self, figureVarName) FOR backgroundColor-»
-«EXPAND font(figureVarName) FOR font-»
-«EXPAND preferredSize(figureVarName) FOR preferredSize-»
-«EXPAND maximumSize(figureVarName) FOR maximumSize-»
-«EXPAND minimumSize(figureVarName) FOR minimumSize-»
-«EXPAND position(figureVarName) FOR location-»
-«EXPAND size(figureVarName) FOR size-»
-«EXPAND insets(figureVarName) FOR insets-»
-«EXPAND Border::Init(figureVarName) FOR border-»
-«EXPAND _customAttributes(figureVarName) FOR self-»
-«ENDDEFINE»
-
-«DEFINE foregroundColor(figure : gmfgraph::Figure, figureVarName : String) FOR gmfgraph::Color-»
-	«figureVarName».setForegroundColor(«EXPAND color(figureVarName.toUpper() + '_FORE')»);
-«ENDDEFINE»
-«DEFINE backgroundColor(figure : gmfgraph::Figure, figureVarName : String) FOR gmfgraph::Color-»
-	«figureVarName».setBackgroundColor(«EXPAND color(figureVarName.toUpper() + '_BACK')»);
-«ENDDEFINE»
-
-«DEFINE preferredSize(figureVarName : String) FOR gmfgraph::Dimension-»
-«figureVarName».setPreferredSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
-«ENDDEFINE»
-
-«DEFINE maximumSize(figureVarName : String) FOR gmfgraph::Dimension-»
-«figureVarName».setMaximumSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
-«ENDDEFINE»
-
-«DEFINE minimumSize(figureVarName : String) FOR gmfgraph::Dimension-»
-«figureVarName».setMinimumSize(new org.eclipse.draw2d.geometry.Dimension(«EXPAND MapMode::_map»));
-«ENDDEFINE»
-
-«DEFINE position(figureVarName : String) FOR gmfgraph::Point-»
-«figureVarName».setLocation(new org.eclipse.draw2d.geometry.Point(«EXPAND MapMode::_map»));
-«ENDDEFINE»
-
-«DEFINE size(figureVarName : String) FOR gmfgraph::Point-»
-«figureVarName».setSize(«EXPAND MapMode::_map»);
-«ENDDEFINE»
-
-«DEFINE insets(figureVarName : String) FOR gmfgraph::Insets-»
-«REM»using MarginBorder for insets is not good idea«ENDREM»
-«figureVarName».setBorder(new org.eclipse.draw2d.MarginBorder(«EXPAND MapMode::_map»));
-«ENDDEFINE»
-
-«DEFINE font(figureVarName : String) FOR gmfgraph::Font»
-«ERROR 'This is abstact definition, just to overcome some xpand polymorphism limitations'»
-«ENDDEFINE»
-
-«DEFINE color(variableName : String) FOR gmfgraph::Color»
-«ERROR 'This is abstact definition, just to overcome some xpand polymorphism limitations'»
-«ENDDEFINE»
-
-«DEFINE color(variableName : String) FOR gmfgraph::RGBColor-»
-«variableName-»
-«FILE '' staticFields»
-/**
- * @generated
- */
-static final org.eclipse.swt.graphics.Color «variableName» = new org.eclipse.swt.graphics.Color(null, «red», «green», «blue»);
-«ENDFILE»
-«ENDDEFINE»
-
-«DEFINE color(variableName : String) FOR gmfgraph::ConstantColor-»
-org.eclipse.draw2d.ColorConstants.«value-»
-«ENDDEFINE»
-
-«DEFINE font(figureVarName : String) FOR gmfgraph::BasicFont-»
-«LET figureVarName.toUpper() + '_FONT' AS variableName»
-«figureVarName».setFont(«variableName»);
-«FILE '' staticFields»
-/**
- * @generated
- */
-static final org.eclipse.swt.graphics.Font «variableName» = new org.eclipse.swt.graphics.Font(org.eclipse.swt.widgets.Display.getCurrent(), «IF null = faceName or faceName.trim().size() = 0»org.eclipse.swt.widgets.Display.getDefault().getSystemFont().getFontData()[0].getName()«ELSE»"«faceName»"«ENDIF», «height», org.eclipse.swt.SWT.«style»);
-«ENDFILE»
-«ENDLET»
-«ENDDEFINE»
-
-«DEFINE _customAttributes(figureVarName : String) FOR gmfgraph::Figure -»
-«ENDDEFINE»
-
-«DEFINE _customAttributes(figureVarName : String) FOR gmfgraph::RealFigure -»
-«EXPAND attr::CustomAttributeOwner::customAttributes(figureVarName) FOR self -»
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Shape.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Shape.xpt
deleted file mode 100644
index f7243dc2ba3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/attr/Shape.xpt
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«REM»
-org.eclipse.draw2d.Shape
-	private boolean fill = true, outline = true, xorFill, xorOutline;
-	lineAttributes.width = 1.0
-	lineAttributes.style = LINE_SOLID
-«ENDREM»
-«DEFINE shapeAttrs(figureVarName : String) FOR gmfgraph::Shape-»
-«EXPAND fill(figureVarName)-»
-«IF xorFill»«EXPAND xorFill(figureVarName)»«ENDIF-»
-«IF not outline»«EXPAND outline(figureVarName)»«ENDIF-»
-«IF xorOutline»«EXPAND xorOutline(figureVarName)»«ENDIF-»
-«IF lineWidth <> 1»«EXPAND lineWidth(figureVarName)»«ENDIF-»
-«IF lineKind <> gmfgraph::LineKind::LINE_SOLID»«EXPAND lineKind(figureVarName)»«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE fill(figureVarName : String) FOR gmfgraph::Shape-»
-«IF not fill»«figureVarName».setFill(«fill»);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE fill(figureVarName : String) FOR gmfgraph::Polygon-»
-«IF fill»«figureVarName».setFill(«fill»);
-«ENDIF-»
-«ENDDEFINE»
-
-«DEFINE xorFill(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setFillXOR(«xorFill»);
-«ENDDEFINE»
-
-«DEFINE outline(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setOutline(«outline»);
-«ENDDEFINE»
-
-«DEFINE xorOutline(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setOutlineXOR(«xorOutline»);
-«ENDDEFINE»
-
-«DEFINE lineWidth(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setLineWidth(«lineWidth»);
-«ENDDEFINE»
-
-«DEFINE lineKind(figureVarName : String) FOR gmfgraph::Shape-»
-«figureVarName».setLineStyle(org.eclipse.draw2d.Graphics.«lineKind»);
-«ENDDEFINE»
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/Activator.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/Activator.xpt
deleted file mode 100644
index 2fccac7e6cf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/Activator.xpt
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-
-«DEFINE Init(packageName : String, pluginActivatorClassName : String, pluginID : String) FOR Collection(OclAny)-»
-«EXPAND Init(packageName, pluginActivatorClassName, pluginID) FOR ''-»
-«ENDDEFINE»
-
-«DEFINE Init(packageName : String, pluginActivatorClassName : String, pluginID : String) FOR OclAny-»
-package «packageName»;
-
-/**
- * @generated
- */
-public class «pluginActivatorClassName» extends org.eclipse.core.runtime.Plugin {
-
-	/**
-	 * @generated
-	 */
-	public static final String ID = "«pluginID»"; //$NON-NLS-1$
-
-	/**
-	 * @generated
-	 */
-	private static «pluginActivatorClassName» ourInstance;
-
-	/**
-	 * @generated
-	 */
-	public «pluginActivatorClassName»() {
-	}
-
-	/**
-	 * @generated
-	 */
-	public void start(org.osgi.framework.BundleContext context) throws Exception {
-		super.start(context);
-		ourInstance = this;
-	}
-
-	/**
-	 * @generated
-	 */
-	public void stop(org.osgi.framework.BundleContext context) throws Exception {
-		ourInstance = null;
-		super.stop(context);
-	}
-
-	/**
-	 * @generated
-	 */
-	public static «pluginActivatorClassName» getDefault() {
-		return ourInstance;
-	}
-«EXPAND MapMode::Activator-»
-«EXPAND additions-»
-}
-«ENDDEFINE»
-
-«DEFINE additions FOR OclAny»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt
deleted file mode 100644
index 59bc78fbfd0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/BuildProperties.xpt
+++ /dev/null
@@ -1,21 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«DEFINE Init FOR OclAny-»
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/Manifest.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/Manifest.xpt
deleted file mode 100644
index ea825ad43d7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/Manifest.xpt
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-«EXTENSION Util»
-
-/*
- * FIXME add a simple model (either non-generated, .ecore only?) to descripbe GenConfig 
- */
-
-«DEFINE Init(pluginID : String, pluginActivatorQualifiedName : String, exportedPackages : Sequence(String), referencedBundles : Sequence(String)) FOR OclAny-»
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: «pluginID»; singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Vendor: %providerName
-Bundle-Activator: «pluginActivatorQualifiedName»
-Bundle-Localization: plugin
-Export-Package:«EXPAND exportPackageHeader FOR exportedPackages»
-Require-Bundle:«EXPAND requireBundleHeader FOR requiredBundles(referencedBundles)»
-Eclipse-LazyStart: true
-«EXPAND additions-»
-«ENDDEFINE»
-
-«DEFINE exportPackageHeader FOR Sequence(String)-»
-«EXPAND print FOREACH self SEPARATOR ',\n'-»
-«ENDDEFINE»
-
-«REM»FIXME Set[String] - improve union recognition«ENDREM»
-«DEFINE requireBundleHeader FOR Collection(OclAny)-»
-«EXPAND print FOREACH (self->collect(it | it))[String]->asSequence() SEPARATOR ',\n'-»
-«ENDDEFINE»
-
-«DEFINE print FOR String» «self»«ENDDEFINE»
-
-«DEFINE additions FOR OclAny»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt
deleted file mode 100644
index 359384253fc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/plugin/PluginProperties.xpt
+++ /dev/null
@@ -1,19 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«DEFINE Init(pluginName : String, providerName : String) FOR OclAny-»
-pluginName = «pluginName»
-providerName = «providerName»
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt
deleted file mode 100644
index f93c088e625..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/rt_mm/MapMode.xpt
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-«EXTENSION rt_mm::MapModeUtil»
-
-«REM»Using MapMode«ENDREM»
-
-«DEFINE _map FOR gmfgraph::Dimension-»
-«EXPAND deviceToLogic FOR dx», «EXPAND deviceToLogic FOR dy-»
-«ENDDEFINE»
-
-«DEFINE _map FOR gmfgraph::Point-»
-«EXPAND deviceToLogic FOR x», «EXPAND deviceToLogic FOR y-»
-«ENDDEFINE»
-
-«DEFINE _map FOR Integer-»
-«EXPAND deviceToLogic-»
-«ENDDEFINE»
-
-«DEFINE _map FOR gmfgraph::Insets-»
-«EXPAND deviceToLogic FOR top», «EXPAND deviceToLogic FOR left», «EXPAND deviceToLogic FOR bottom», «EXPAND deviceToLogic FOR right-»
-«ENDDEFINE»
-
-«DEFINE deviceToLogic FOR Integer-»
-«mapModeAccessor()»getMapMode().DPtoLP(«self»)
-«ENDDEFINE»
-
-«DEFINE Activator FOR OclAny-»
-	private org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode myMapMode = org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes.IDENTITY_MM;
-
-	/**
-	 * @generated
-	 */
-	public void setMapMode(org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode mapMode) {
-		myMapMode = mapMode;
-		if (myMapMode == null){
-			myMapMode = org.eclipse.gmf.runtime.draw2d.ui.mapmode.MapModeTypes.IDENTITY_MM;
-		}
-	}
-
-	/**
-	 * @generated
-	 */
-	public org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode getMapMode() {
-		return myMapMode;
-	}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/rt_mm/MapModeUtil.qvto b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/rt_mm/MapModeUtil.qvto
deleted file mode 100644
index 0493590f5f4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/rt_mm/MapModeUtil.qvto
+++ /dev/null
@@ -1,21 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-import xpt.GlobalVarOperations;
-
-library MapModeUtil;
-
-helper mapModeAccessor() : String {
-return xpandGetStringGlobalVar('mapModeAccessor')
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/top/Descriptor.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/top/Descriptor.xpt
deleted file mode 100644
index f0e0b587282..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/top/Descriptor.xpt
+++ /dev/null
@@ -1,98 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-«IMPORT 'http://www.eclipse.org/emf/2002/Ecore'»
-
-«EXTENSION Util»
-
-«DEFINE Top(packageStmt : String) FOR gmfgraph::FigureDescriptor»
-«IF packageStmt <> null and packageStmt.size() > 0»package «packageStmt»;
-«ENDIF-»
-/**
- * @generated
- */
-public class «compilationUnitName(self)» extends «EXPAND Runtime::fqn FOR actualFigure» {
-«EXPAND body»
-«additionalStaticFields()»
-}
-«ENDDEFINE»
-
-
-
-«DEFINE Inner FOR gmfgraph::FigureDescriptor»
-/**
- * @generated
- */
-public class «compilationUnitName(self)» extends «EXPAND Runtime::fqn FOR actualFigure» {
-«EXPAND body»
-}
-«additionalStaticFields()»
-«ENDDEFINE»
-
-«REM»«ENDREM»
-«DEFINE body FOR gmfgraph::FigureDescriptor»
-
-«EXPAND accessorField FOREACH accessors->select(a | not (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))»
-
-«FOREACH filterCustom(Sequence {self.actualFigure}) AS custom»«IF needsField(custom)»«EXPAND accessorCustomField FOR custom»«ENDIF»«ENDFOREACH»
-
-«EXPAND Figure::ClassBody(compilationUnitName(self)) FOR actualFigure»
-
-«EXPAND accessorToField FOREACH accessors->select(a | not (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))»
-«FOREACH accessors->select(a | (allCustomAccessors(self).typedFigure)[gmfgraph::Figure]->includes(a.figure))->asSequence() AS a-»
-«EXPAND accessorToCustom(getCustomFigureChainFigureAccess(a)) FOR a»
-«ENDFOREACH-»
-«ENDDEFINE»
-
-
-«DEFINE accessorField FOR gmfgraph::ChildAccess-»
-	/**
-	 * @generated
-	 */
-	private «EXPAND Runtime::fqn FOR figure» «self.figureFieldName()»; 
-«ENDDEFINE»
-
-«DEFINE accessorCustomField FOR gmfgraph::CustomFigure-»
-	/**
-	 * @generated
-	 */
-	private «EXPAND Runtime::fqn FOR self» «self.figureFieldName()»;
-«ENDDEFINE»
-
-«REM»ChildAccess points to figure we've generated, there's a field for it«ENDREM»
-«DEFINE accessorToField FOR gmfgraph::ChildAccess-»
-	/**
-	 * @generated
-	 */
-	public «EXPAND Runtime::fqn FOR figure» «accessor»() {
-		return «self.figureFieldName()»;
-	}
-«ENDDEFINE»
-
-«REM»ChildAccess points to some child of a CustomFigure, need to delegate to it's accessor
-Perhaps, should add support for ChildAccess not being generated (in case they are have same name as 
-FigureAccessor.accessor
-«ENDREM»
-«DEFINE accessorToCustom(fa : Sequence(gmfgraph::FigureAccessor)) FOR gmfgraph::ChildAccess-»
-	/**
-	 * @generated
-	 */
-	public «EXPAND Runtime::fqn FOR figure» «accessor»() {
-		return «fa->first().oclAsType(ecore::EObject).eContainer().oclAsType(CustomFigure).figureFieldName()-»
-			«FOREACH fa AS figureAccessor»«IF figureAccessor.accessor <> null and not figureAccessor.accessor->isEmpty()».«figureAccessor.accessor»()«ELSE-»
-				«ERROR 'Invalide figure accessor' + figureAccessor.repr()»«ENDIF»«ENDFOREACH»;
-	}
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/top/Figure.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/top/Figure.xpt
deleted file mode 100644
index 7b14a0ac7f7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/top/Figure.xpt
+++ /dev/null
@@ -1,109 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«EXTENSION Util»
-
-«DEFINE ClassBody(cuName : String) FOR gmfgraph::Figure»«ERROR 'abstract ClassBody(Figure)'»«ENDDEFINE»
-
-«DEFINE ClassBody(cuName : String) FOR gmfgraph::FigureRef-»
-«EXPAND ClassBody(cuName, self) FOR figure-»
-«ENDDEFINE»
-
-«DEFINE ClassBody(cuName : String) FOR gmfgraph::RealFigure-»
-«EXPAND ClassBody(cuName, null) FOR self-»
-«ENDDEFINE»
-
-«DEFINE ClassBody(cuName : String, figureRef : gmfgraph::FigureRef) FOR gmfgraph::RealFigure-»
-	/**
-	 * @generated
-	 */
-	public «cuName»() {
-«clearBorders()-»
-		«EXPAND Layout::Init('this') FOR layout-»
-		«EXPAND Attrs::Init('this')-»
-«IF not figureRef->isEmpty()-»
-		// «figureRef.figure.name» 
-		// Process FigureRef details
-		«EXPAND Layout::Init('this') FOR figureRef.layout-»
-		«EXPAND Attrs::Init('this') FOR figureRef-»
-«ENDIF-»		
-«IF not (children)[gmfgraph::Figure]->isEmpty()-»
-		createContents();
-	}
-«EXPAND Children::CreateChildren-»
-«ELSE-»
-	}
-«ENDIF-»
-«EXPAND Border::InitMethods»
-«EXPAND Extras::extraMethods»
-«EXPAND additions-»
-«ENDDEFINE»
-
-«DEFINE ClassBody(cuName : String, figureRef : gmfgraph::FigureRef) FOR gmfgraph::PolylineConnection-»
-	/**
-	 * @generated
-	 */
-	public «cuName»() {
-		«EXPAND Attrs::Init('this')»
-«LET childrenWithoutDecoration(self) AS childrenWithoutDecorators-»
-«IF not childrenWithoutDecorators->isEmpty()-»
-		createContents();
-«ENDIF-»
-«IF hasSourceDecoration(self)-»
-		setSourceDecoration(createSourceDecoration());
-«ENDIF-»
-«IF hasTargetDecoration(self)-»
-		setTargetDecoration(createTargetDecoration());
-«ENDIF-»
-	}
-«IF not childrenWithoutDecorators->isEmpty()»
-«REM»
-	Copy of Children::CreateChildren with temp workaround to generate child figures for labels only.
-	Though this is temp workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=193180, I'm not sure
-	what's the right approach with e.g. decoration as child of a link.
-«ENDREM»
-	/**
-	 * @generated
-	 */
-	private void createContents(){
-«EXPAND Children::instantiate(0, self, 'this') FOREACH childrenWithoutDecorators»
-	}
-«ENDIF-»
-«IF hasSourceDecoration(self)»
-	/**
-	 * @generated
-	 */
-	private org.eclipse.draw2d.RotatableDecoration createSourceDecoration() {
-		«EXPAND Decoration::Instantiate('df') FOR sourceDecoration-»
-		return df;
-	}
-«ENDIF-»
-«IF hasTargetDecoration(self)»
-	/**
-	 * @generated
-	 */
-	private org.eclipse.draw2d.RotatableDecoration createTargetDecoration() {
-		«EXPAND Decoration::Instantiate('df') FOR targetDecoration-»
-		return df;
-	}
-«ENDIF-»
-«ENDLET-»
-«EXPAND additions-»
-«ENDDEFINE»
-
-«REM»Our regular way to add smth inside generated class body«ENDREM»
-«DEFINE additions FOR gmfgraph::Figure»«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt
deleted file mode 100644
index a40a53b2cb4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.codegen/templates/xtras/ScalablePolygon.xpt
+++ /dev/null
@@ -1,20 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Michael Golubev (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-«IMPORT 'http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition'»
-
-«DEFINE behaviour FOR gmfgraph::ScalablePolygon-»
-	FIXME - with 238874 resolved, generated ScalablePolygon hack has been replaced with use of org.eclipse.draw2d.ScalablePolygonShape
-«ENDDEFINE»
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.project
deleted file mode 100644
index ebb9e0c03b4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.graphdef.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 47f43f33894..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.graphdef.edit; singleton:=true
-Bundle-Version: 2.9.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.papyrus.gmf.gmfgraph.presentation,
- org.eclipse.papyrus.gmf.gmfgraph.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.graphdef;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/build.properties
deleted file mode 100644
index 4018a921e9a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateBorderLayout_spacing_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateBorderLayout_spacing_Dimension.gif
deleted file mode 100644
index 2bdaa748bba..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateBorderLayout_spacing_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_compartments_Compartment.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_compartments_Compartment.gif
deleted file mode 100644
index 860276f4bbc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_compartments_Compartment.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_connections_Connection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_connections_Connection.gif
deleted file mode 100644
index 5f8c2018a1c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_connections_Connection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_figures_FigureGallery.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_figures_FigureGallery.gif
deleted file mode 100644
index eabf210dc76..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_figures_FigureGallery.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_labels_DiagramLabel.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_labels_DiagramLabel.gif
deleted file mode 100644
index 9a73c8d2dbc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_labels_DiagramLabel.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_nodes_DiagramLabel.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_nodes_DiagramLabel.gif
deleted file mode 100644
index 9a73c8d2dbc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_nodes_DiagramLabel.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_nodes_Node.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_nodes_Node.gif
deleted file mode 100644
index 8a4acfb07bd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCanvas_nodes_Node.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_BorderRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_BorderRef.gif
deleted file mode 100644
index 08b62b9af29..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_BorderRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_CompoundBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_CompoundBorder.gif
deleted file mode 100644
index b1e7722b4d9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_CompoundBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_CustomBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_CustomBorder.gif
deleted file mode 100644
index 9dc793f5689..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_CustomBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_LineBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_LineBorder.gif
deleted file mode 100644
index f641dcd4958..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_LineBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_MarginBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_MarginBorder.gif
deleted file mode 100644
index 3256d56ca4d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_inner_MarginBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_BorderRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_BorderRef.gif
deleted file mode 100644
index 08b62b9af29..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_BorderRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_CompoundBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_CompoundBorder.gif
deleted file mode 100644
index b1e7722b4d9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_CompoundBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_CustomBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_CustomBorder.gif
deleted file mode 100644
index 9dc793f5689..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_CustomBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_LineBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_LineBorder.gif
deleted file mode 100644
index f641dcd4958..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_LineBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_MarginBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_MarginBorder.gif
deleted file mode 100644
index 3256d56ca4d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCompoundBorder_outer_MarginBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCustomClass_attributes_CustomAttribute.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCustomClass_attributes_CustomAttribute.gif
deleted file mode 100644
index 7403d3965a5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCustomClass_attributes_CustomAttribute.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCustomFigure_customChildren_FigureAccessor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCustomFigure_customChildren_FigureAccessor.gif
deleted file mode 100644
index 7403d3965a5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateCustomFigure_customChildren_FigureAccessor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDefaultSizeFacet_defaultSize_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDefaultSizeFacet_defaultSize_Dimension.gif
deleted file mode 100644
index 539fcf4adce..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDefaultSizeFacet_defaultSize_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_AlignmentFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_AlignmentFacet.gif
deleted file mode 100644
index fb357f5d86c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_AlignmentFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_DefaultSizeFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_DefaultSizeFacet.gif
deleted file mode 100644
index 7af2290ed51..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_DefaultSizeFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_GeneralFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_GeneralFacet.gif
deleted file mode 100644
index 3eb3c309805..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_GeneralFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_GradientFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_GradientFacet.gif
deleted file mode 100644
index 92060017376..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_GradientFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_LabelOffsetFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_LabelOffsetFacet.gif
deleted file mode 100644
index 2bed2e1badc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateDiagramElement_facets_LabelOffsetFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomConnection.gif
deleted file mode 100644
index 122b828b2ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomDecoration.gif
deleted file mode 100644
index b3a2d022b7a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomFigure.gif
deleted file mode 100644
index 291b0624799..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_CustomFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Ellipse.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Ellipse.gif
deleted file mode 100644
index 8e8c9603553..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Ellipse.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_InvisibleRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_InvisibleRectangle.gif
deleted file mode 100644
index 2f9f86f0713..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_InvisibleRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Label.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Label.gif
deleted file mode 100644
index 52be1a507e5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Label.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_LabeledContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_LabeledContainer.gif
deleted file mode 100644
index f2eedabaf15..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_LabeledContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Polygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Polygon.gif
deleted file mode 100644
index b446c03e573..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Polygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolygonDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolygonDecoration.gif
deleted file mode 100644
index 3bed4f36c2a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolygonDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Polyline.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Polyline.gif
deleted file mode 100644
index 621468ed1da..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Polyline.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolylineConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolylineConnection.gif
deleted file mode 100644
index 31a5c1d4551..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolylineConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolylineDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolylineDecoration.gif
deleted file mode 100644
index d2df954b265..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_PolylineDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Rectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Rectangle.gif
deleted file mode 100644
index d2df954b265..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_Rectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_RoundedRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_RoundedRectangle.gif
deleted file mode 100644
index fb31e4b0528..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_RoundedRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_SVGFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_SVGFigure.gif
deleted file mode 100644
index a8473096049..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_SVGFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_ScalablePolygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_ScalablePolygon.gif
deleted file mode 100644
index 783befad5e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_ScalablePolygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_VerticalLabel.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_VerticalLabel.gif
deleted file mode 100644
index 946cda2c363..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureAccessor_typedFigure_VerticalLabel.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_accessors_ChildAccess.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_accessors_ChildAccess.gif
deleted file mode 100644
index 9a2ca8b1cd7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_accessors_ChildAccess.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomConnection.gif
deleted file mode 100644
index 84084d87cfc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomDecoration.gif
deleted file mode 100644
index e2ee3160f16..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomFigure.gif
deleted file mode 100644
index 8abb185ecb7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_CustomFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Ellipse.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Ellipse.gif
deleted file mode 100644
index a5e8711fee0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Ellipse.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_FigureRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_FigureRef.gif
deleted file mode 100644
index 8129448469a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_FigureRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_InvisibleRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_InvisibleRectangle.gif
deleted file mode 100644
index bb9da6cc739..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_InvisibleRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Label.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Label.gif
deleted file mode 100644
index b6bdc3869b0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Label.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_LabeledContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_LabeledContainer.gif
deleted file mode 100644
index 4b2c3fa9c9b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_LabeledContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Polygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Polygon.gif
deleted file mode 100644
index 56138f044a2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Polygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolygonDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolygonDecoration.gif
deleted file mode 100644
index 63f9fd2cc56..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolygonDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Polyline.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Polyline.gif
deleted file mode 100644
index 38bcb032f4e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Polyline.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolylineConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolylineConnection.gif
deleted file mode 100644
index a6fdabb17b6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolylineConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolylineDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolylineDecoration.gif
deleted file mode 100644
index 871e70c714a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_PolylineDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Rectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Rectangle.gif
deleted file mode 100644
index 871e70c714a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_Rectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_RoundedRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_RoundedRectangle.gif
deleted file mode 100644
index 025f0306c7e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_RoundedRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_SVGFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_SVGFigure.gif
deleted file mode 100644
index c2565683961..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_SVGFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_ScalablePolygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_ScalablePolygon.gif
deleted file mode 100644
index 8cf4d774b64..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_ScalablePolygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_VerticalLabel.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_VerticalLabel.gif
deleted file mode 100644
index f0c0ecee2c1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureDescriptor_actualFigure_VerticalLabel.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_BorderRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_BorderRef.gif
deleted file mode 100644
index bbdb41d8452..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_BorderRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_CompoundBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_CompoundBorder.gif
deleted file mode 100644
index 053b43458eb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_CompoundBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_CustomBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_CustomBorder.gif
deleted file mode 100644
index 4b36c8a973d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_CustomBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_LineBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_LineBorder.gif
deleted file mode 100644
index f3f1023e529..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_LineBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_MarginBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_MarginBorder.gif
deleted file mode 100644
index 852e7907209..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_borders_MarginBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_descriptors_FigureDescriptor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_descriptors_FigureDescriptor.gif
deleted file mode 100644
index 69c61195fdb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_descriptors_FigureDescriptor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomConnection.gif
deleted file mode 100644
index 7b611480bea..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomDecoration.gif
deleted file mode 100644
index 06746988709..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomFigure.gif
deleted file mode 100644
index f3f1023e529..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_CustomFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Ellipse.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Ellipse.gif
deleted file mode 100644
index 8b41d35c74d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Ellipse.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_InvisibleRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_InvisibleRectangle.gif
deleted file mode 100644
index bbdb41d8452..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_InvisibleRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Label.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Label.gif
deleted file mode 100644
index dde736fe7e0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Label.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_LabeledContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_LabeledContainer.gif
deleted file mode 100644
index f0eecfb27dd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_LabeledContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Polygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Polygon.gif
deleted file mode 100644
index 8526cb69d7e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Polygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolygonDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolygonDecoration.gif
deleted file mode 100644
index 506a19bf586..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolygonDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Polyline.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Polyline.gif
deleted file mode 100644
index 691dd114dee..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Polyline.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolylineConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolylineConnection.gif
deleted file mode 100644
index a4aa4f84ee0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolylineConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolylineDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolylineDecoration.gif
deleted file mode 100644
index 053b43458eb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_PolylineDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Rectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Rectangle.gif
deleted file mode 100644
index 053b43458eb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_Rectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_RoundedRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_RoundedRectangle.gif
deleted file mode 100644
index ada3f02b27c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_RoundedRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_SVGFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_SVGFigure.gif
deleted file mode 100644
index 0c070475d5d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_SVGFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_ScalablePolygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_ScalablePolygon.gif
deleted file mode 100644
index fa72058174b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_ScalablePolygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_VerticalLabel.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_VerticalLabel.gif
deleted file mode 100644
index a2ea8fe4fb0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_figures_VerticalLabel.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_BorderLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_BorderLayout.gif
deleted file mode 100644
index 8b41d35c74d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_BorderLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_CenterLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_CenterLayout.gif
deleted file mode 100644
index b901f6eda44..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_CenterLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_CustomLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_CustomLayout.gif
deleted file mode 100644
index 852e7907209..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_CustomLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_FlowLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_FlowLayout.gif
deleted file mode 100644
index 69c61195fdb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_FlowLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_GridLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_GridLayout.gif
deleted file mode 100644
index f82b4be3227..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_GridLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_LayoutRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_LayoutRef.gif
deleted file mode 100644
index 66cbc4c0481..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_LayoutRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_StackLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_StackLayout.gif
deleted file mode 100644
index 7acbca393c0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_StackLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_XYLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_XYLayout.gif
deleted file mode 100644
index efa5ade010e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigureGallery_layouts_XYLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_backgroundColor_ConstantColor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_backgroundColor_ConstantColor.gif
deleted file mode 100644
index 2833425da49..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_backgroundColor_ConstantColor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_backgroundColor_RGBColor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_backgroundColor_RGBColor.gif
deleted file mode 100644
index 8e648cd5cfe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_backgroundColor_RGBColor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_CompoundBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_CompoundBorder.gif
deleted file mode 100644
index 0c81e8e0889..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_CompoundBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_CustomBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_CustomBorder.gif
deleted file mode 100644
index 0d9f24061d3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_CustomBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_LineBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_LineBorder.gif
deleted file mode 100644
index 236984d2d5a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_LineBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_MarginBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_MarginBorder.gif
deleted file mode 100644
index e5009558ce2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_border_MarginBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_font_BasicFont.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_font_BasicFont.gif
deleted file mode 100644
index 36e9ea8424e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_font_BasicFont.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_foregroundColor_ConstantColor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_foregroundColor_ConstantColor.gif
deleted file mode 100644
index 2833425da49..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_foregroundColor_ConstantColor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_foregroundColor_RGBColor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_foregroundColor_RGBColor.gif
deleted file mode 100644
index 8e648cd5cfe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_foregroundColor_RGBColor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_insets_Insets.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_insets_Insets.gif
deleted file mode 100644
index f8c38fbfdae..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_insets_Insets.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_location_Point.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_location_Point.gif
deleted file mode 100644
index 96b347e1ad4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_location_Point.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_maximumSize_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_maximumSize_Dimension.gif
deleted file mode 100644
index 986fb9cf107..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_maximumSize_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_minimumSize_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_minimumSize_Dimension.gif
deleted file mode 100644
index 986fb9cf107..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_minimumSize_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_preferredSize_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_preferredSize_Dimension.gif
deleted file mode 100644
index 986fb9cf107..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_preferredSize_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_size_Point.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_size_Point.gif
deleted file mode 100644
index 96b347e1ad4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateFigure_size_Point.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayoutData_sizeHint_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayoutData_sizeHint_Dimension.gif
deleted file mode 100644
index 6fd731e45d0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayoutData_sizeHint_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayout_margins_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayout_margins_Dimension.gif
deleted file mode 100644
index a29fe36e7e8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayout_margins_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayout_spacing_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayout_spacing_Dimension.gif
deleted file mode 100644
index a29fe36e7e8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateGridLayout_spacing_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_BorderLayoutData.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_BorderLayoutData.gif
deleted file mode 100644
index 3f8d415eb14..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_BorderLayoutData.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_CustomLayoutData.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_CustomLayoutData.gif
deleted file mode 100644
index b7364612037..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_CustomLayoutData.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_GridLayoutData.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_GridLayoutData.gif
deleted file mode 100644
index 89badf28dc7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_GridLayoutData.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_XYLayoutData.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_XYLayoutData.gif
deleted file mode 100644
index eac376d4d95..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layoutData_XYLayoutData.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_BorderLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_BorderLayout.gif
deleted file mode 100644
index 2c5a5dfe196..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_BorderLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_CustomLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_CustomLayout.gif
deleted file mode 100644
index 94841a6c115..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_CustomLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_FlowLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_FlowLayout.gif
deleted file mode 100644
index 2ff67ac122b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_FlowLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_GridLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_GridLayout.gif
deleted file mode 100644
index 22ecc645b5f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_GridLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_StackLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_StackLayout.gif
deleted file mode 100644
index 3afb8e00a82..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_StackLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_XYLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_XYLayout.gif
deleted file mode 100644
index 23833103786..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLayoutable_layout_XYLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLineBorder_color_ConstantColor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLineBorder_color_ConstantColor.gif
deleted file mode 100644
index 1c4c5221527..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLineBorder_color_ConstantColor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLineBorder_color_RGBColor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLineBorder_color_RGBColor.gif
deleted file mode 100644
index c8cc4e94ab2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateLineBorder_color_RGBColor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateMarginBorder_insets_Insets.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateMarginBorder_insets_Insets.gif
deleted file mode 100644
index 1e0e0f326f8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateMarginBorder_insets_Insets.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreatePolyline_template_Point.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreatePolyline_template_Point.gif
deleted file mode 100644
index 43703db9854..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreatePolyline_template_Point.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomConnection.gif
deleted file mode 100644
index 9cd6c785747..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomDecoration.gif
deleted file mode 100644
index fe734c7198a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomFigure.gif
deleted file mode 100644
index 4e7f8d9ecc7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_CustomFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Ellipse.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Ellipse.gif
deleted file mode 100644
index b1bf686b0b7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Ellipse.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_FigureRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_FigureRef.gif
deleted file mode 100644
index 5723f6db894..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_FigureRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_InvisibleRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_InvisibleRectangle.gif
deleted file mode 100644
index aac8a7fda79..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_InvisibleRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Label.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Label.gif
deleted file mode 100644
index 1368d9acca4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Label.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_LabeledContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_LabeledContainer.gif
deleted file mode 100644
index 7a5b36204c5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_LabeledContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Polygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Polygon.gif
deleted file mode 100644
index e22a3704b9e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Polygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolygonDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolygonDecoration.gif
deleted file mode 100644
index 8d3a8e05ac1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolygonDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Polyline.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Polyline.gif
deleted file mode 100644
index 63fcd96dd1a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Polyline.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolylineConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolylineConnection.gif
deleted file mode 100644
index c15eee4b41d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolylineConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolylineDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolylineDecoration.gif
deleted file mode 100644
index e6967b75767..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_PolylineDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Rectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Rectangle.gif
deleted file mode 100644
index e6967b75767..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_Rectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_RoundedRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_RoundedRectangle.gif
deleted file mode 100644
index 309abb616c2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_RoundedRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_SVGFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_SVGFigure.gif
deleted file mode 100644
index 976910af059..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_SVGFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_ScalablePolygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_ScalablePolygon.gif
deleted file mode 100644
index 6357a53a81f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_ScalablePolygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_VerticalLabel.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_VerticalLabel.gif
deleted file mode 100644
index 3fdc2eae153..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateRealFigure_children_VerticalLabel.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateSVGFigure_areaOfInterest_Rectangle2D.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateSVGFigure_areaOfInterest_Rectangle2D.gif
deleted file mode 100644
index 1d2f734b151..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateSVGFigure_areaOfInterest_Rectangle2D.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateSVGFigure_properties_SVGProperty.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateSVGFigure_properties_SVGProperty.gif
deleted file mode 100644
index 959b8924b24..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateSVGFigure_properties_SVGProperty.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateXYLayoutData_size_Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateXYLayoutData_size_Dimension.gif
deleted file mode 100644
index c0020e2a7fc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateXYLayoutData_size_Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateXYLayoutData_topLeft_Point.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateXYLayoutData_topLeft_Point.gif
deleted file mode 100644
index b0583b810ae..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/ctool16/CreateXYLayoutData_topLeft_Point.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/AlignmentFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/AlignmentFacet.gif
deleted file mode 100644
index 420eee17752..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/AlignmentFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BasicFont.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BasicFont.gif
deleted file mode 100644
index 904159880b3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BasicFont.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderLayout.gif
deleted file mode 100644
index b53e8d0d7ab..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderLayoutData.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderLayoutData.gif
deleted file mode 100644
index f85190204e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderLayoutData.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderRef.gif
deleted file mode 100644
index 4365960a04b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/BorderRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Canvas.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Canvas.gif
deleted file mode 100644
index b1f8afa4766..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Canvas.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CenterLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CenterLayout.gif
deleted file mode 100644
index db7414e9372..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CenterLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ChildAccess.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ChildAccess.gif
deleted file mode 100644
index c8d381f0b32..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ChildAccess.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ColorPin.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ColorPin.gif
deleted file mode 100644
index 83afb9b3c9a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ColorPin.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Compartment.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Compartment.gif
deleted file mode 100644
index 33854e98c25..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Compartment.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CompoundBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CompoundBorder.gif
deleted file mode 100644
index 8a5c70cbd74..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CompoundBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Connection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Connection.gif
deleted file mode 100644
index e4b530eca17..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Connection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ConstantColor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ConstantColor.gif
deleted file mode 100644
index 14af8aaee9f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ConstantColor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomAttribute.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomAttribute.gif
deleted file mode 100644
index e0575392bb8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomAttribute.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomBorder.gif
deleted file mode 100644
index 136e3b27269..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomConnection.gif
deleted file mode 100644
index b3643da048a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomDecoration.gif
deleted file mode 100644
index 53500daf98e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomFigure.gif
deleted file mode 100644
index c673a5200a5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomLayout.gif
deleted file mode 100644
index dfe8c51455b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomLayoutData.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomLayoutData.gif
deleted file mode 100644
index db974f3e45a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomLayoutData.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomPin.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomPin.gif
deleted file mode 100644
index 33a997a1606..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/CustomPin.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/DefaultSizeFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/DefaultSizeFacet.gif
deleted file mode 100644
index c4c797b7f84..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/DefaultSizeFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/DiagramLabel.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/DiagramLabel.gif
deleted file mode 100644
index 53500daf98e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/DiagramLabel.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Dimension.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Dimension.gif
deleted file mode 100644
index cdd3b76e3c0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Dimension.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Ellipse.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Ellipse.gif
deleted file mode 100644
index 106881e5d9b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Ellipse.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureAccessor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureAccessor.gif
deleted file mode 100644
index d3dc5a9ad81..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureAccessor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureDescriptor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureDescriptor.gif
deleted file mode 100644
index c8d381f0b32..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureDescriptor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureGallery.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureGallery.gif
deleted file mode 100644
index 90d10f94707..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureGallery.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureRef.gif
deleted file mode 100644
index 05dc74ad5da..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FigureRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FlowLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FlowLayout.gif
deleted file mode 100644
index 93f27c8f3f5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/FlowLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GMFGraphModelFile.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GMFGraphModelFile.gif
deleted file mode 100644
index f47b7ffdbe2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GMFGraphModelFile.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GeneralFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GeneralFacet.gif
deleted file mode 100644
index d92f34c8aea..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GeneralFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GradientFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GradientFacet.gif
deleted file mode 100644
index 1e5345fb323..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GradientFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GridLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GridLayout.gif
deleted file mode 100644
index 792fb4e1c28..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GridLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GridLayoutData.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GridLayoutData.gif
deleted file mode 100644
index f8cea0ef885..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/GridLayoutData.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Insets.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Insets.gif
deleted file mode 100644
index 498364f1c1a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Insets.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/InvisibleRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/InvisibleRectangle.gif
deleted file mode 100644
index 4365960a04b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/InvisibleRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Label.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Label.gif
deleted file mode 100644
index 7bac4fd3808..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Label.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LabelOffsetFacet.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LabelOffsetFacet.gif
deleted file mode 100644
index badaab0664a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LabelOffsetFacet.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LabeledContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LabeledContainer.gif
deleted file mode 100644
index f8041d22553..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LabeledContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LayoutRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LayoutRef.gif
deleted file mode 100644
index caf2804510d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LayoutRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LineBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LineBorder.gif
deleted file mode 100644
index c673a5200a5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/LineBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/MarginBorder.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/MarginBorder.gif
deleted file mode 100644
index 338fb8d9a72..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/MarginBorder.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Node.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Node.gif
deleted file mode 100644
index ef56c140853..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Node.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Point.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Point.gif
deleted file mode 100644
index 53500daf98e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Point.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Polygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Polygon.gif
deleted file mode 100644
index 33a997a1606..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Polygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolygonDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolygonDecoration.gif
deleted file mode 100644
index ea58a657dc0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolygonDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Polyline.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Polyline.gif
deleted file mode 100644
index 7c2aaac84ee..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Polyline.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolylineConnection.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolylineConnection.gif
deleted file mode 100644
index 1e5345fb323..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolylineConnection.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolylineDecoration.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolylineDecoration.gif
deleted file mode 100644
index 8a5c70cbd74..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/PolylineDecoration.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/RGBColor.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/RGBColor.gif
deleted file mode 100644
index 420eee17752..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/RGBColor.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Rectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Rectangle.gif
deleted file mode 100644
index 8a5c70cbd74..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Rectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Rectangle2D.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Rectangle2D.gif
deleted file mode 100644
index ea58a657dc0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/Rectangle2D.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/RoundedRectangle.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/RoundedRectangle.gif
deleted file mode 100644
index 2124f3e3ab2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/RoundedRectangle.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/SVGFigure.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/SVGFigure.gif
deleted file mode 100644
index 739ebbfa6ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/SVGFigure.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/SVGProperty.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/SVGProperty.gif
deleted file mode 100644
index caf2804510d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/SVGProperty.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ScalablePolygon.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ScalablePolygon.gif
deleted file mode 100644
index 7473e242201..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/ScalablePolygon.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/StackLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/StackLayout.gif
deleted file mode 100644
index 24124b22077..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/StackLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/VerticalLabel.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/VerticalLabel.gif
deleted file mode 100644
index cdd3b76e3c0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/VerticalLabel.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/VisiblePin.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/VisiblePin.gif
deleted file mode 100644
index 14af8aaee9f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/VisiblePin.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/XYLayout.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/XYLayout.gif
deleted file mode 100644
index bf71d31b57f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/XYLayout.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/XYLayoutData.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/XYLayoutData.gif
deleted file mode 100644
index 480c478072d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/obj16/XYLayoutData.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/wizban/NewGMFGraph.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/wizban/NewGMFGraph.gif
deleted file mode 100644
index f3829ed22d1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/icons/full/wizban/NewGMFGraph.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/plugin.properties
deleted file mode 100644
index 19bbb3d1a86..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/plugin.properties
+++ /dev/null
@@ -1,635 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-#####################################################
-# Properties in this section SHOULD NOT be translated
-#####################################################
-
-_UI_GMFGraphEditorFilenameDefaultBase = My
-_UI_GMFGraphEditorFilenameExtension = gmfgraph
-
-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
-
-################
-# End of section
-################
-
-#############################################################
-# Properties in this section ARE REALLY NEED to be translated
-#############################################################
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_GMFGraphEditor_menu = &GMFGraph Editor
-
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-
-_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-
-_UI_SelectionPage_label = Selection
-_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-
-_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-
-_UI_OpenEditorError_label = Open Editor
-
-_UI_GMFGraphModelWizard_label = GMFGraph Model
-_UI_GMFGraphModelWizard_description = Create a new GMFGraph model
-
-_UI_GMFGraphEditor_label = GMFGraph Model Editor
-
-_UI_Wizard_label = New
-
-_WARN_FilenameExtension = The file name must end in ".{0}"
-
-_UI_ModelObject = Model Object
-_UI_XMLEncoding = XML Encoding
-_UI_Wizard_initial_object_description = Select a model object to create
-
-_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-
-_UI_CreateModelError_message = Problems encountered in file "{0}"
-
-################
-# End of section
-################
-
-######################################################################################
-# Properties in this section MAY be translated, although they are quite ok in English.
-# Mostly there are names of classes and features that are often referenced to by
-# their English names
-######################################################################################
-_UI_Canvas_type = Canvas
-_UI_FigureGallery_type = Figure Gallery
-_UI_Identity_type = Identity
-_UI_DiagramElement_type = Diagram Element
-_UI_Node_type = Node
-_UI_Connection_type = Connection
-_UI_Compartment_type = Compartment
-_UI_DiagramLabel_type = Diagram Label
-_UI_DiagramLabel_elementIcon_feature = Element Icon
-_UI_VisualFacet_type = Visual Facet
-_UI_GeneralFacet_type = General Facet
-_UI_AlignmentFacet_type = Alignment Facet
-_UI_GradientFacet_type = Gradient Facet
-_UI_LabelOffsetFacet_type = Label Offset Facet
-_UI_FigureMarker_type = Figure Marker
-_UI_Figure_type = Figure
-_UI_FigureRef_type = Figure Ref
-_UI_ConnectionFigure_type = Connection Figure
-_UI_DecorationFigure_type = Decoration Figure
-_UI_Shape_type = Shape
-_UI_Label_type = Label
-_UI_LabeledContainer_type = Labeled Container
-_UI_Rectangle_type = Rectangle
-_UI_RoundedRectangle_type = Rounded Rectangle
-_UI_Ellipse_type = Ellipse
-_UI_Polyline_type = Polyline
-_UI_Polygon_type = Polygon
-_UI_PolylineConnection_type = Polyline Connection
-_UI_PolylineDecoration_type = Polyline Decoration
-_UI_PolygonDecoration_type = Polygon Decoration
-_UI_CustomClass_type = Custom Class
-_UI_CustomFigure_type = Custom Figure
-_UI_CustomFigure_customChildren_feature = Custom Children
-_UI_CustomDecoration_type = Custom Decoration
-_UI_CustomConnection_type = Custom Connection
-_UI_Color_type = Color
-_UI_RGBColor_type = RGB Color
-_UI_ConstantColor_type = Constant Color
-_UI_Font_type = Font
-_UI_BasicFont_type = Basic Font
-_UI_Point_type = Point
-_UI_Dimension_type = Dimension
-_UI_Insets_type = Insets
-_UI_Border_type = Border
-_UI_LineBorder_type = Line Border
-_UI_MarginBorder_type = Margin Border
-_UI_CompoundBorder_type = Compound Border
-_UI_CustomBorder_type = Custom Border
-_UI_LayoutData_type = Layout Data
-_UI_CustomLayoutData_type = Custom Layout Data
-_UI_GridLayoutData_type = Grid Layout Data
-_UI_BorderLayoutData_type = Border Layout Data
-_UI_Layoutable_type = Layoutable
-_UI_Layout_type = Layout
-_UI_CustomLayout_type = Custom Layout
-_UI_GridLayout_type = Grid Layout
-_UI_BorderLayout_type = Border Layout
-_UI_CustomAttribute_type = Custom Attribute
-_UI_FlowLayout_type = Flow Layout
-_UI_XYLayout_type = XY Layout
-_UI_XYLayoutData_type = XY Layout Data
-_UI_StackLayout_type = Stack Layout
-_UI_Unknown_type = Object
-_UI_Unknown_datatype= Value
-_UI_Canvas_figures_feature = Figures
-_UI_Canvas_nodes_feature = Nodes
-_UI_Canvas_connections_feature = Connections
-_UI_Canvas_compartments_feature = Compartments
-_UI_Canvas_labels_feature = Labels
-_UI_FigureGallery_figures_feature = Figures
-_UI_FigureGallery_implementationBundle_feature = Implementation Bundle
-_UI_Identity_name_feature = Name
-_UI_DiagramElement_figure_feature = Figure
-_UI_DiagramElement_facets_feature = Facets
-_UI_Node_nodeFigure_feature = <XXX>
-_UI_Node_resizeConstraint_feature = Resize Constraint
-_UI_Node_affixedParentSide_feature = Affixed Parent Side
-_UI_Connection_connectionFigure_feature = <XXX>
-_UI_Compartment_collapsible_feature = Collapsible
-_UI_Compartment_needsTitle_feature = Needs Title
-_UI_GeneralFacet_identifier_feature = Identifier
-_UI_GeneralFacet_data_feature = Data
-_UI_AlignmentFacet_alignment_feature = Alignment
-_UI_GradientFacet_direction_feature = Direction
-_UI_LabelOffsetFacet_x_feature = X
-_UI_LabelOffsetFacet_y_feature = Y
-_UI_FigureMarker_parent_feature = Parent
-_UI_Figure_children_feature = Children
-_UI_Figure_foregroundColor_feature = Foreground Color
-_UI_Figure_backgroundColor_feature = Background Color
-_UI_Figure_maximumSize_feature = Maximum Size
-_UI_Figure_minimumSize_feature = Minimum Size
-_UI_Figure_preferredSize_feature = Preferred Size
-_UI_Figure_font_feature = Font
-_UI_Figure_insets_feature = Insets
-_UI_Figure_border_feature = Border
-_UI_Figure_location_feature = Location
-_UI_Figure_size_feature = Size
-_UI_FigureRef_figure_feature = Figure
-_UI_Shape_outline_feature = Outline
-_UI_Shape_fill_feature = Fill
-_UI_Shape_lineWidth_feature = Line Width
-_UI_Shape_lineKind_feature = Line Kind
-_UI_Shape_xorFill_feature = Xor Fill
-_UI_Shape_xorOutline_feature = Xor Outline
-_UI_Shape_resolvedChildren_feature = Resolved Children
-_UI_Label_text_feature = Text
-_UI_RoundedRectangle_cornerWidth_feature = Corner Width
-_UI_RoundedRectangle_cornerHeight_feature = Corner Height
-_UI_Polyline_template_feature = Template
-_UI_PolylineConnection_sourceDecoration_feature = Source Decoration
-_UI_PolylineConnection_targetDecoration_feature = Target Decoration
-_UI_CustomClass_qualifiedClassName_feature = Qualified Class Name
-_UI_CustomClass_bundleName_feature = Bundle Name
-_UI_CustomClass_attributes_feature = Attributes
-_UI_RGBColor_red_feature = Red
-_UI_RGBColor_green_feature = Green
-_UI_RGBColor_blue_feature = Blue
-_UI_ConstantColor_value_feature = Value
-_UI_BasicFont_faceName_feature = Face Name
-_UI_BasicFont_height_feature = Height
-_UI_BasicFont_style_feature = Style
-_UI_Point_x_feature = X
-_UI_Point_y_feature = Y
-_UI_Dimension_dx_feature = Dx
-_UI_Dimension_dy_feature = Dy
-_UI_Insets_top_feature = Top
-_UI_Insets_left_feature = Left
-_UI_Insets_bottom_feature = Bottom
-_UI_Insets_right_feature = Right
-_UI_Insets_toStringPattern = Insets [t: {0}, b: {1}, l: {2}, r: {3}]
-_UI_LineBorder_color_feature = Color
-_UI_LineBorder_width_feature = Width
-_UI_MarginBorder_insets_feature = Insets
-_UI_CompoundBorder_outer_feature = Outer
-_UI_CompoundBorder_inner_feature = Inner
-_UI_LayoutData_owner_feature = Owner
-_UI_GridLayoutData_grabExcessHorizontalSpace_feature = Grab Excess Horizontal Space
-_UI_GridLayoutData_grabExcessVerticalSpace_feature = Grab Excess Vertical Space
-_UI_GridLayoutData_verticalAlignment_feature = Vertical Alignment
-_UI_GridLayoutData_horizontalAlignment_feature = Horizontal Alignment
-_UI_GridLayoutData_verticalSpan_feature = Vertical Span
-_UI_GridLayoutData_horizontalSpan_feature = Horizontal Span
-_UI_GridLayoutData_horizontalIndent_feature = Horizontal Indent
-_UI_GridLayoutData_sizeHint_feature = Size Hint
-_UI_BorderLayoutData_alignment_feature = Alignment
-_UI_BorderLayoutData_vertical_feature = Vertical
-_UI_Layoutable_layoutData_feature = Layout Data
-_UI_Layoutable_layout_feature = Layout
-_UI_GridLayout_numColumns_feature = Num Columns
-_UI_GridLayout_equalWidth_feature = Equal Width
-_UI_GridLayout_margins_feature = Margins
-_UI_GridLayout_spacing_feature = Spacing
-_UI_BorderLayout_spacing_feature = Spacing
-_UI_CustomAttribute_name_feature = Name
-_UI_CustomAttribute_value_feature = Value
-_UI_CustomAttribute_directAccess_feature = Direct Access
-_UI_CustomAttribute_multiStatementValue_feature = Multi Statement Value
-_UI_FlowLayout_vertical_feature = Vertical
-_UI_FlowLayout_matchMinorSize_feature = Match Minor Size
-_UI_FlowLayout_forceSingleLine_feature = Force Single Line
-_UI_FlowLayout_majorAlignment_feature = Major Alignment
-_UI_FlowLayout_minorAlignment_feature = Minor Alignment
-_UI_FlowLayout_majorSpacing_feature = Major Spacing
-_UI_FlowLayout_minorSpacing_feature = Minor Spacing
-_UI_XYLayoutData_topLeft_feature = Top Left
-_UI_XYLayoutData_size_feature = Size
-_UI_Unknown_feature = Unspecified
-
-_UI_ColorConstants_white_literal = white
-_UI_ColorConstants_black_literal = black
-_UI_ColorConstants_lightGray_literal = lightGray
-_UI_ColorConstants_gray_literal = gray
-_UI_ColorConstants_darkGray_literal = darkGray
-_UI_ColorConstants_red_literal = red
-_UI_ColorConstants_orange_literal = orange
-_UI_ColorConstants_yellow_literal = yellow
-_UI_ColorConstants_green_literal = green
-_UI_ColorConstants_lightGreen_literal = lightGreen
-_UI_ColorConstants_darkGreen_literal = darkGreen
-_UI_ColorConstants_cyan_literal = cyan
-_UI_ColorConstants_lightBlue_literal = lightBlue
-_UI_ColorConstants_blue_literal = blue
-_UI_ColorConstants_darkBlue_literal = darkBlue
-
-_UI_FontStyle_NORMAL_literal = NORMAL
-_UI_FontStyle_BOLD_literal = BOLD
-_UI_FontStyle_ITALIC_literal = ITALIC
-
-_UI_Direction_NONE_literal = NONE
-_UI_Direction_NORTH_literal = NORTH
-_UI_Direction_SOUTH_literal = SOUTH
-_UI_Direction_WEST_literal = WEST
-_UI_Direction_EAST_literal = EAST
-_UI_Direction_NORTH_EAST_literal = NORTH_EAST
-_UI_Direction_NORTH_WEST_literal = NORTH_WEST
-_UI_Direction_SOUTH_EAST_literal = SOUTH_EAST
-_UI_Direction_SOUTH_WEST_literal = SOUTH_WEST
-_UI_Direction_NORTH_SOUTH_literal = NORTH_SOUTH
-_UI_Direction_EAST_WEST_literal = EAST_WEST
-_UI_Direction_NSEW_literal = NSEW
-
-_UI_LineKind_LINE_SOLID_literal = LINE_SOLID
-_UI_LineKind_LINE_DASH_literal = LINE_DASH
-_UI_LineKind_LINE_DOT_literal = LINE_DOT
-_UI_LineKind_LINE_DASHDOT_literal = LINE_DASHDOT
-_UI_LineKind_LINE_DASHDOTDOT_literal = LINE_DASHDOTDOT
-_UI_LineKind_LINE_CUSTOM_literal = LINE_CUSTOM
-
-_UI_Alignment_BEGINNING_literal = BEGINNING
-_UI_Alignment_CENTER_literal = CENTER
-_UI_Alignment_END_literal = END
-_UI_Alignment_FILL_literal = FILL
-
-_UI_FigureHandle_type = Figure Handle
-_UI_FigureHandle_referencingElements_feature = Referencing Elements
-
-_UI_FigureAccessor_type = Figure Accessor
-_UI_FigureAccessor_accessor_feature = Accessor
-_UI_FigureAccessor_typedFigure_feature = Typed Figure
-_UI_ScalablePolygon_type = Scalable Polygon
-
-_UI_DefaultSizeFacet_type = Default Size Facet
-_UI_DefaultSizeFacet_defaultSize_feature = Default Size
-
-# ====================================================================
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-_UI_PropertyDescriptor_description = The {0} of the {1}
-_UI_Canvas_type = Canvas
-_UI_FigureGallery_type = Figure Gallery
-_UI_Identity_type = Identity
-_UI_DiagramElement_type = Diagram Element
-_UI_Node_type = Node
-_UI_Connection_type = Connection
-_UI_Compartment_type = Compartment
-_UI_DiagramLabel_type = Diagram Label
-_UI_VisualFacet_type = Visual Facet
-_UI_GeneralFacet_type = General Facet
-_UI_AlignmentFacet_type = Alignment Facet
-_UI_GradientFacet_type = Gradient Facet
-_UI_LabelOffsetFacet_type = Label Offset Facet
-_UI_FigureMarker_type = Figure Marker
-_UI_FigureHandle_type = Figure Handle
-_UI_Figure_type = Figure
-_UI_FigureRef_type = Figure Ref
-_UI_ConnectionFigure_type = Connection Figure
-_UI_DecorationFigure_type = Decoration Figure
-_UI_Shape_type = Shape
-_UI_Label_type = Label
-_UI_LabeledContainer_type = Labeled Container
-_UI_Rectangle_type = Rectangle
-_UI_RoundedRectangle_type = Rounded Rectangle
-_UI_Ellipse_type = Ellipse
-_UI_Polyline_type = Polyline
-_UI_Polygon_type = Polygon
-_UI_ScalablePolygon_type = Scalable Polygon
-_UI_PolylineConnection_type = Polyline Connection
-_UI_PolylineDecoration_type = Polyline Decoration
-_UI_PolygonDecoration_type = Polygon Decoration
-_UI_CustomClass_type = Custom Class
-_UI_CustomAttribute_type = Custom Attribute
-_UI_FigureAccessor_type = Figure Accessor
-_UI_CustomFigure_type = Custom Figure
-_UI_CustomDecoration_type = Custom Decoration
-_UI_CustomConnection_type = Custom Connection
-_UI_Color_type = Color
-_UI_RGBColor_type = RGB Color
-_UI_ConstantColor_type = Constant Color
-_UI_Font_type = Font
-_UI_BasicFont_type = Basic Font
-_UI_Point_type = Point
-_UI_Dimension_type = Dimension
-_UI_Insets_type = Insets
-_UI_Border_type = Border
-_UI_LineBorder_type = Line Border
-_UI_MarginBorder_type = Margin Border
-_UI_CompoundBorder_type = Compound Border
-_UI_CustomBorder_type = Custom Border
-_UI_LayoutData_type = Layout Data
-_UI_CustomLayoutData_type = Custom Layout Data
-_UI_GridLayoutData_type = Grid Layout Data
-_UI_BorderLayoutData_type = Border Layout Data
-_UI_Layoutable_type = Layoutable
-_UI_Layout_type = Layout
-_UI_CustomLayout_type = Custom Layout
-_UI_GridLayout_type = Grid Layout
-_UI_BorderLayout_type = Border Layout
-_UI_FlowLayout_type = Flow Layout
-_UI_XYLayout_type = XY Layout
-_UI_XYLayoutData_type = XY Layout Data
-_UI_StackLayout_type = Stack Layout
-_UI_Unknown_type = Object
-_UI_Unknown_datatype= Value
-_UI_Canvas_figures_feature = Figures
-_UI_Canvas_nodes_feature = Nodes
-_UI_Canvas_connections_feature = Connections
-_UI_Canvas_compartments_feature = Compartments
-_UI_Canvas_labels_feature = Labels
-_UI_FigureGallery_figures_feature = Figures
-_UI_FigureGallery_implementationBundle_feature = Implementation Bundle
-_UI_Identity_name_feature = Name
-_UI_DiagramElement_figure_feature = Figure
-_UI_DiagramElement_facets_feature = Facets
-_UI_Node_nodeFigure_feature = Node Figure
-_UI_Node_resizeConstraint_feature = Resize Constraint
-_UI_Node_affixedParentSide_feature = Affixed Parent Side
-_UI_Connection_connectionFigure_feature = Connection Figure
-_UI_Compartment_collapsible_feature = Collapsible
-_UI_Compartment_needsTitle_feature = Needs Title
-_UI_DiagramLabel_elementIcon_feature = Element Icon
-_UI_GeneralFacet_identifier_feature = Identifier
-_UI_GeneralFacet_data_feature = Data
-_UI_AlignmentFacet_alignment_feature = Alignment
-_UI_GradientFacet_direction_feature = Direction
-_UI_LabelOffsetFacet_x_feature = X
-_UI_LabelOffsetFacet_y_feature = Y
-_UI_DefaultSizeFacet_defaultSize_feature = Default Size
-_UI_FigureMarker_parent_feature = Parent
-_UI_FigureHandle_referencingElements_feature = Referencing Elements
-_UI_Figure_children_feature = Children
-_UI_Figure_foregroundColor_feature = Foreground Color
-_UI_Figure_backgroundColor_feature = Background Color
-_UI_Figure_maximumSize_feature = Maximum Size
-_UI_Figure_minimumSize_feature = Minimum Size
-_UI_Figure_preferredSize_feature = Preferred Size
-_UI_Figure_font_feature = Font
-_UI_Figure_insets_feature = Insets
-_UI_Figure_border_feature = Border
-_UI_Figure_location_feature = Location
-_UI_Figure_size_feature = Size
-_UI_FigureRef_figure_feature = Figure
-_UI_Shape_outline_feature = Outline
-_UI_Shape_fill_feature = Fill
-_UI_Shape_lineWidth_feature = Line Width
-_UI_Shape_lineKind_feature = Line Kind
-_UI_Shape_xorFill_feature = Xor Fill
-_UI_Shape_xorOutline_feature = Xor Outline
-_UI_Shape_resolvedChildren_feature = Resolved Children
-_UI_Label_text_feature = Text
-_UI_RoundedRectangle_cornerWidth_feature = Corner Width
-_UI_RoundedRectangle_cornerHeight_feature = Corner Height
-_UI_Polyline_template_feature = Template
-_UI_PolylineConnection_sourceDecoration_feature = Source Decoration
-_UI_PolylineConnection_targetDecoration_feature = Target Decoration
-_UI_CustomClass_qualifiedClassName_feature = Qualified Class Name
-_UI_CustomClass_bundleName_feature = Bundle Name
-_UI_CustomClass_attributes_feature = Attributes
-_UI_CustomAttribute_name_feature = Name
-_UI_CustomAttribute_value_feature = Value
-_UI_CustomAttribute_directAccess_feature = Direct Access
-_UI_CustomAttribute_multiStatementValue_feature = Multi Statement Value
-_UI_FigureAccessor_accessor_feature = Accessor
-_UI_FigureAccessor_typedFigure_feature = Typed Figure
-_UI_CustomFigure_customChildren_feature = Custom Children
-_UI_RGBColor_red_feature = Red
-_UI_RGBColor_green_feature = Green
-_UI_RGBColor_blue_feature = Blue
-_UI_ConstantColor_value_feature = Value
-_UI_BasicFont_faceName_feature = Face Name
-_UI_BasicFont_height_feature = Height
-_UI_BasicFont_style_feature = Style
-_UI_Point_x_feature = X
-_UI_Point_y_feature = Y
-_UI_Dimension_dx_feature = Dx
-_UI_Dimension_dy_feature = Dy
-_UI_Insets_top_feature = Top
-_UI_Insets_left_feature = Left
-_UI_Insets_bottom_feature = Bottom
-_UI_Insets_right_feature = Right
-_UI_LineBorder_color_feature = Color
-_UI_LineBorder_width_feature = Width
-_UI_MarginBorder_insets_feature = Insets
-_UI_CompoundBorder_outer_feature = Outer
-_UI_CompoundBorder_inner_feature = Inner
-_UI_LayoutData_owner_feature = Owner
-_UI_GridLayoutData_grabExcessHorizontalSpace_feature = Grab Excess Horizontal Space
-_UI_GridLayoutData_grabExcessVerticalSpace_feature = Grab Excess Vertical Space
-_UI_GridLayoutData_verticalAlignment_feature = Vertical Alignment
-_UI_GridLayoutData_horizontalAlignment_feature = Horizontal Alignment
-_UI_GridLayoutData_verticalSpan_feature = Vertical Span
-_UI_GridLayoutData_horizontalSpan_feature = Horizontal Span
-_UI_GridLayoutData_horizontalIndent_feature = Horizontal Indent
-_UI_GridLayoutData_sizeHint_feature = Size Hint
-_UI_BorderLayoutData_alignment_feature = Alignment
-_UI_BorderLayoutData_vertical_feature = Vertical
-_UI_Layoutable_layoutData_feature = Layout Data
-_UI_Layoutable_layout_feature = Layout
-_UI_GridLayout_numColumns_feature = Num Columns
-_UI_GridLayout_equalWidth_feature = Equal Width
-_UI_GridLayout_margins_feature = Margins
-_UI_GridLayout_spacing_feature = Spacing
-_UI_BorderLayout_spacing_feature = Spacing
-_UI_FlowLayout_vertical_feature = Vertical
-_UI_FlowLayout_matchMinorSize_feature = Match Minor Size
-_UI_FlowLayout_forceSingleLine_feature = Force Single Line
-_UI_FlowLayout_majorAlignment_feature = Major Alignment
-_UI_FlowLayout_minorAlignment_feature = Minor Alignment
-_UI_FlowLayout_majorSpacing_feature = Major Spacing
-_UI_FlowLayout_minorSpacing_feature = Minor Spacing
-_UI_XYLayoutData_topLeft_feature = Top Left
-_UI_XYLayoutData_size_feature = Size
-_UI_Unknown_feature = Unspecified
-_UI_ColorConstants_white_literal = white
-_UI_ColorConstants_black_literal = black
-_UI_ColorConstants_lightGray_literal = lightGray
-_UI_ColorConstants_gray_literal = gray
-_UI_ColorConstants_darkGray_literal = darkGray
-_UI_ColorConstants_red_literal = red
-_UI_ColorConstants_orange_literal = orange
-_UI_ColorConstants_yellow_literal = yellow
-_UI_ColorConstants_green_literal = green
-_UI_ColorConstants_lightGreen_literal = lightGreen
-_UI_ColorConstants_darkGreen_literal = darkGreen
-_UI_ColorConstants_cyan_literal = cyan
-_UI_ColorConstants_lightBlue_literal = lightBlue
-_UI_ColorConstants_blue_literal = blue
-_UI_ColorConstants_darkBlue_literal = darkBlue
-_UI_FontStyle_NORMAL_literal = NORMAL
-_UI_FontStyle_BOLD_literal = BOLD
-_UI_FontStyle_ITALIC_literal = ITALIC
-_UI_Direction_NONE_literal = NONE
-_UI_Direction_NORTH_literal = NORTH
-_UI_Direction_SOUTH_literal = SOUTH
-_UI_Direction_WEST_literal = WEST
-_UI_Direction_EAST_literal = EAST
-_UI_Direction_NORTH_EAST_literal = NORTH_EAST
-_UI_Direction_NORTH_WEST_literal = NORTH_WEST
-_UI_Direction_SOUTH_EAST_literal = SOUTH_EAST
-_UI_Direction_SOUTH_WEST_literal = SOUTH_WEST
-_UI_Direction_NORTH_SOUTH_literal = NORTH_SOUTH
-_UI_Direction_EAST_WEST_literal = EAST_WEST
-_UI_Direction_NSEW_literal = NSEW
-_UI_LineKind_LINE_SOLID_literal = LINE_SOLID
-_UI_LineKind_LINE_DASH_literal = LINE_DASH
-_UI_LineKind_LINE_DOT_literal = LINE_DOT
-_UI_LineKind_LINE_DASHDOT_literal = LINE_DASHDOT
-_UI_LineKind_LINE_DASHDOTDOT_literal = LINE_DASHDOTDOT
-_UI_LineKind_LINE_CUSTOM_literal = LINE_CUSTOM
-_UI_Alignment_BEGINNING_literal = BEGINNING
-_UI_Alignment_CENTER_literal = CENTER
-_UI_Alignment_END_literal = END
-_UI_Alignment_FILL_literal = FILL
-_UI_GMFGraphEditor_menu = &GMFGraph Editor
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-_UI_SelectionPage_label = Selection
-_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-_UI_OpenEditorError_label = Open Editor
-_UI_Wizard_category = Example EMF Model Creation Wizards
-_UI_CreateModelError_message = Problems encountered in file "{0}"
-_UI_GMFGraphModelWizard_label = GMFGraph Model
-_UI_GMFGraphModelWizard_description = Create a new GMFGraph model
-_UI_GMFGraphEditor_label = GMFGraph Model Editor
-_UI_GMFGraphEditorFilenameExtension = gmfgraph
-_UI_Wizard_label = New
-_WARN_FilenameExtension = The file name must end in ".{0}"
-_UI_ModelObject = Model Object
-_UI_XMLEncoding = XML Encoding
-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
-_UI_Wizard_initial_object_description = Select a model object to create
-_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-_UI_AbstractNode_type = Abstract Node
-_UI_ChildAccess_type = Child Access
-_UI_AbstractFigure_type = Abstract Figure
-_UI_Node_contentPane_feature = Content Pane
-_UI_ChildAccess_accessor_feature = Accessor
-_UI_ChildAccess_figure_feature = Figure
-_UI_ChildAccess_owner_feature = Owner
-_UI_DiagramLabel_container_feature = Container
-_UI_DiagramLabel_external_feature = External
-_UI_DiagramLabel_accessor_feature = Accessor
-_UI_FigureDescriptor_type = Figure Descriptor
-_UI_FigureGallery_descriptors_feature = Descriptors
-_UI_Figure_descriptor_feature = Descriptor
-_UI_FigureDescriptor_actualFigure_feature = Actual Figure
-_UI_FigureDescriptor_accessors_feature = Accessors
-_UI_RealFigure_type = Real Figure
-_UI_Compartment_accessor_feature = Accessor
-_UI_RealFigure_name_feature = Name
-_UI_RealFigure_children_feature = Children
-pluginName = Papyrus GMFGraph Edit Support
-providerName = Eclipse Modeling Project
-_UI_BorderRef_type = Border Ref
-_UI_LayoutRef_type = Layout Ref
-_UI_FigureGallery_borders_feature = Borders
-_UI_FigureGallery_layouts_feature = Layouts
-_UI_BorderRef_actual_feature = Actual
-_UI_LayoutRef_actual_feature = Actual
-_UI_GMFGraphEditorFilenameExtensions = gmfgraph
-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
-_UI_SVGFigure_type = SVG Figure
-_UI_SVGProperty_type = SVG Property
-_UI_SVGFigure_documentURI_feature = Document URI
-_UI_SVGFigure_properties_feature = Properties
-_UI_SVGProperty_query_feature = Query
-_UI_SVGProperty_attribute_feature = Attribute
-_UI_SVGProperty_type_feature = Type
-_UI_SVGProperty_getter_feature = Getter
-_UI_SVGProperty_setter_feature = Setter
-_UI_SVGPropertyType_STRING_literal = STRING
-_UI_SVGPropertyType_COLOR_literal = COLOR
-_UI_SVGProperty_callSuper_feature = Call Super
-_UI_Rectangle2D_type = Rectangle2D
-_UI_SVGFigure_areaOfInterest_feature = Area Of Interest
-_UI_Rectangle2D_x_feature = X
-_UI_Rectangle2D_y_feature = Y
-_UI_Rectangle2D_width_feature = Width
-_UI_Rectangle2D_height_feature = Height
-_UI_SVGPropertyType_FLOAT_literal = FLOAT
-_UI_SVGFigure_noCanvasWidth_feature = No Canvas Width
-_UI_SVGFigure_noCanvasHeight_feature = No Canvas Height
-_UI_Pin_type = Pin
-_UI_CustomPin_type = Custom Pin
-_UI_ColorPin_type = Color Pin
-_UI_PinOwner_type = Pin Owner
-_UI_CustomPin_type_feature = Type
-_UI_CustomPin_name_feature = Name
-_UI_ColorPin_backgroundNotForeground_feature = Background Not Foreground
-_UI_PinOwner_pins_feature = Pins
-_UI_Pin_name_feature = Name
-_UI_CustomPin_customSetterType_feature = Custom Setter Type
-_UI_CustomPin_customSetterName_feature = Custom Setter Name
-_UI_CustomPin_customOperationName_feature = Custom Operation Name
-_UI_CustomPin_customOperationType_feature = Custom Operation Type
-_UI_VisibilityPin_type = Visibility Pin
-_UI_VisiblePin_type = Visible Pin
-_UI_InvisibleRectangle_type = Invisible Rectangle
-_UI_CustomAttributeOwner_type = Custom Attribute Owner
-_UI_CustomAttributeOwner_attributes_feature = Attributes
-_UI_CenterLayout_type = Center Layout
-_UI_VerticalLabel_type = Vertical Label
-_UI_VerticalLabel_text_feature = Text
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/plugin.xml
deleted file mode 100644
index b387d9c8615..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/plugin.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-  <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-    <factory 
-       uri = "http://www.eclipse.org/gmf/2005/GraphicalDefinition" 
-       class = "org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphItemProviderAdapterFactory"
-       supportedTypes = 
-         "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-          org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-          org.eclipse.emf.edit.provider.ITreeItemContentProvider
-          org.eclipse.emf.edit.provider.IItemLabelProvider
-          org.eclipse.emf.edit.provider.IItemPropertySource" />
-    <factory 
-       uri = "http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition" 
-       class = "org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphItemProviderAdapterFactory"
-       supportedTypes = 
-         "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-          org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-          org.eclipse.emf.edit.provider.ITreeItemContentProvider
-          org.eclipse.emf.edit.provider.IItemLabelProvider
-          org.eclipse.emf.edit.provider.IItemPropertySource" />
-  </extension>
-  
-
-  <extension
-    point = "org.eclipse.ui.newWizards">
-    <wizard
-      id = "org.eclipse.papyrus.gmf.gmfgraph.presentation.GMFGraphModelWizardID"
-      name = "%_UI_GMFGraphModelWizard_label"
-      class = "org.eclipse.papyrus.gmf.gmfgraph.presentation.GMFGraphModelWizard"
-      category = "org.eclipse.gmf.tooling.wizardCategory/org.eclipse.gmf.tooling.wizardsDefault"
-      icon = "icons/full/obj16/GMFGraphModelFile.gif">
-      <description>%_UI_GMFGraphModelWizard_description</description>
-      <selection class = "org.eclipse.core.resources.IResource" />
-    </wizard>
-  </extension>
-
-  <extension point = "org.eclipse.ui.editors">
-    <editor
-          class="org.eclipse.papyrus.gmf.gmfgraph.presentation.GMFGraphEditor"
-          contributorClass="org.eclipse.papyrus.gmf.gmfgraph.presentation.GMFGraphActionBarContributor"
-          default="true"
-          extensions="gmfgraph"
-          icon="icons/full/obj16/GMFGraphModelFile.gif"
-          id="org.eclipse.papyrus.gmf.gmfgraph.presentation.GMFGraphEditorID"
-          name="%_UI_GMFGraphEditor_label">
-    </editor>
-  </extension>    
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/pom.xml
deleted file mode 100644
index e7dedb32f1a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.graphdef.edit</artifactId>
-	<version>2.9.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphActionBarContributor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphActionBarContributor.java
deleted file mode 100644
index 299bbed252f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphActionBarContributor.java
+++ /dev/null
@@ -1,437 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.presentation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.ControlAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphEditPlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This is the action bar contributor for the GMFGraph model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFGraphActionBarContributor
-	extends EditingDomainActionBarContributor
-	implements ISelectionChangedListener {
-	/**
-	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IEditorPart activeEditorPart;
-
-	/**
-	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelectionProvider selectionProvider;
-
-	/**
-	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IAction showPropertiesViewAction =
-		new Action(GMFGraphEditPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
-			@Override
-			public void run() {
-				try {
-					getPage().showView("org.eclipse.ui.views.PropertySheet");
-				}
-				catch (PartInitException exception) {
-					GMFGraphEditPlugin.INSTANCE.log(exception);
-				}
-			}
-		};
-
-	/**
-	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IAction refreshViewerAction =
-		new Action(GMFGraphEditPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
-			@Override
-			public boolean isEnabled() {
-				return activeEditorPart instanceof IViewerProvider;
-			}
-
-			@Override
-			public void run() {
-				if (activeEditorPart instanceof IViewerProvider) {
-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
-					if (viewer != null) {
-						viewer.refresh();
-					}
-				}
-			}
-		};
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> createChildActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IMenuManager createChildMenuManager;
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> createSiblingActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IMenuManager createSiblingMenuManager;
-
-	/**
-	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphActionBarContributor() {
-		super(ADDITIONS_LAST_STYLE);
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new ValidateAction();
-		controlAction = new ControlAction();
-	}
-
-	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("gmfgraph-settings"));
-		toolBarManager.add(new Separator("gmfgraph-additions"));
-	}
-
-	/**
-	 * This adds to the menu bar a menu and some separators for editor additions,
-	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-
-		IMenuManager submenuManager = new MenuManager(GMFGraphEditPlugin.INSTANCE.getString("_UI_GMFGraphEditor_menu"), "org.eclipse.papyrus.gmf.gmfgraphMenuID");
-		menuManager.insertAfter("additions", submenuManager);
-		submenuManager.add(new Separator("settings"));
-		submenuManager.add(new Separator("actions"));
-		submenuManager.add(new Separator("additions"));
-		submenuManager.add(new Separator("additions-end"));
-
-		// Prepare for CreateChild item addition or removal.
-		//
-		createChildMenuManager = new MenuManager(GMFGraphEditPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		submenuManager.insertBefore("additions", createChildMenuManager);
-
-		// Prepare for CreateSibling item addition or removal.
-		//
-		createSiblingMenuManager = new MenuManager(GMFGraphEditPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		submenuManager.insertBefore("additions", createSiblingMenuManager);
-
-		// Force an update because Eclipse hides empty menus now.
-		//
-		submenuManager.addMenuListener
-			(new IMenuListener() {
-				 public void menuAboutToShow(IMenuManager menuManager) {
-					 menuManager.updateAll(true);
-				 }
-			 });
-
-		addGlobalActions(submenuManager);
-	}
-
-	/**
-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-		activeEditorPart = part;
-
-		// Switch to the new selection provider.
-		//
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		}
-		if (part == null) {
-			selectionProvider = null;
-		}
-		else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-
-			// Fake a selection changed event to update the menus.
-			//
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-			}
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-	 * that can be added to the selected object and updating the menus accordingly.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		//
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-
-		// Query the new selection for appropriate new child/sibling descriptors
-		//
-		Collection<?> newChildDescriptors = null;
-		Collection<?> newSiblingDescriptors = null;
-
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
-			Object object = ((IStructuredSelection)selection).getFirstElement();
-
-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
-
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-		}
-
-		// Generate actions for selection; populate and redraw the menus.
-		//
-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingActions, null);
-			createSiblingMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-	 * by inserting them before the specified contribution item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
-		if (actions != null) {
-			for (IAction action : actions) {
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				}
-				else {
-					manager.add(action);
-				}
-			}
-		}
-	}
-		
-	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				//
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
-				}
-
-				// Delete the ActionContributionItems with matching action.
-				//
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem)contributionItem).getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-		MenuManager submenuManager = null;
-
-		submenuManager = new MenuManager(GMFGraphEditPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-
-		submenuManager = new MenuManager(GMFGraphEditPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		populateManager(submenuManager, createSiblingActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-	}
-
-	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
-
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
-		menuManager.insertAfter("ui-actions", refreshViewerAction);
-
-		super.addGlobalActions(menuManager);
-	}
-
-	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean removeAllReferencesOnDelete() {
-		return true;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphEditor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphEditor.java
deleted file mode 100644
index 2e293b3672a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphEditor.java
+++ /dev/null
@@ -1,1568 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.presentation;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphEditPlugin;
-import org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphItemProviderAdapterFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-
-/**
- * This is an example of a GMFGraph model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFGraphEditor
-	extends MultiPageEditorPart
-	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
-	/**
-	 * This keeps track of the editing domain that is used to track all changes to the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AdapterFactoryEditingDomain editingDomain;
-
-	/**
-	 * This is the one adapter factory used for providing views of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory adapterFactory;
-
-	/**
-	 * This is the content outline page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IContentOutlinePage contentOutlinePage;
-
-	/**
-	 * This is a kludge...
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IStatusLineManager contentOutlineStatusLineManager;
-
-	/**
-	 * This is the content outline page's viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TreeViewer contentOutlineViewer;
-
-	/**
-	 * This is the property sheet page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PropertySheetPage propertySheetPage;
-
-	/**
-	 * This is the viewer that shadows the selection in the content outline.
-	 * The parent relation must be correctly defined for this to work.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TreeViewer selectionViewer;
-
-	/**
-	 * This keeps track of the active viewer pane, in the book.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ViewerPane currentViewerPane;
-
-	/**
-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Viewer currentViewer;
-
-	/**
-	 * This listens to which ever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelectionChangedListener selectionChangedListener;
-
-	/**
-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
-
-	/**
-	 * This keeps track of the selection of the editor as a whole.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelection editorSelection = StructuredSelection.EMPTY;
-
-	/**
-	 * The MarkerHelper is responsible for creating workspace resource markers presented
-	 * in Eclipse's Problems View.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
-
-	/**
-	 * This listens for when the outline becomes active
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IPartListener partListener =
-		new IPartListener() {
-			public void partActivated(IWorkbenchPart p) {
-				if (p instanceof ContentOutline) {
-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
-						getActionBarContributor().setActiveEditor(GMFGraphEditor.this);
-
-						setCurrentViewer(contentOutlineViewer);
-					}
-				}
-				else if (p instanceof PropertySheet) {
-					if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
-						getActionBarContributor().setActiveEditor(GMFGraphEditor.this);
-						handleActivate();
-					}
-				}
-				else if (p == GMFGraphEditor.this) {
-					handleActivate();
-				}
-			}
-			public void partBroughtToTop(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partClosed(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partDeactivated(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partOpened(IWorkbenchPart p) {
-				// Ignore.
-			}
-		};
-
-	/**
-	 * Resources that have been removed since last activation.
-	 * @generated
-	 */
-	protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been changed since last activation.
-	 * @generated
-	 */
-	protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been saved.
-	 * @generated
-	 */
-	protected Collection<Resource> savedResources = new ArrayList<Resource>();
-
-	/**
-	 * Map to store the diagnostic associated with a resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
-	
-	/**
-	 * Controls whether the problem indication should be updated.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected boolean updateProblemIndication = true;
-
-	/**
-	 * Adapter used to update the problem indication when resources are demanded loaded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected EContentAdapter problemIndicationAdapter = 
-		new EContentAdapter() {
-			@Override
-			public void notifyChanged(Notification notification) {
-				if (notification.getNotifier() instanceof Resource) {
-					switch (notification.getFeatureID(Resource.class)) {
-						case Resource.RESOURCE__IS_LOADED:
-						case Resource.RESOURCE__ERRORS:
-						case Resource.RESOURCE__WARNINGS: {
-							Resource resource = (Resource)notification.getNotifier();
-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-							if (diagnostic.getSeverity() != Diagnostic.OK) {
-								resourceToDiagnosticMap.put(resource, diagnostic);
-							}
-							else {
-								resourceToDiagnosticMap.remove(resource);
-							}
-
-							if (updateProblemIndication) {
-								getSite().getShell().getDisplay().asyncExec
-									(new Runnable() {
-										 public void run() {
-											 updateProblemIndication();
-										 }
-									 });
-							}
-							break;
-						}
-					}
-				}
-				else {
-					super.notifyChanged(notification);
-				}
-			}
-
-			@Override
-			protected void setTarget(Resource target) {
-				basicSetTarget(target);
-			}
-
-			@Override
-			protected void unsetTarget(Resource target) {
-				basicUnsetTarget(target);
-			}
-		};
-
-	/**
-	 * This listens for workspace changes.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IResourceChangeListener resourceChangeListener =
-		new IResourceChangeListener() {
-			public void resourceChanged(IResourceChangeEvent event) {
-				IResourceDelta delta = event.getDelta();
-				try {
-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-						protected ResourceSet resourceSet = editingDomain.getResourceSet();
-						protected Collection<Resource> changedResources = new ArrayList<Resource>();
-						protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-						public boolean visit(IResourceDelta delta) {
-							if (delta.getResource().getType() == IResource.FILE) {
-								if (delta.getKind() == IResourceDelta.REMOVED ||
-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
-									Resource resource = resourceSet.getResource(URI.createURI(delta.getFullPath().toString()), false);
-									if (resource != null) {
-										if (delta.getKind() == IResourceDelta.REMOVED) {
-											removedResources.add(resource);
-										}
-										else if (!savedResources.remove(resource)) {
-											changedResources.add(resource);
-										}
-									}
-								}
-							}
-
-							return true;
-						}
-
-						public Collection<Resource> getChangedResources() {
-							return changedResources;
-						}
-
-						public Collection<Resource> getRemovedResources() {
-							return removedResources;
-						}
-					}
-
-					ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-					delta.accept(visitor);
-
-					if (!visitor.getRemovedResources().isEmpty()) {
-						removedResources.addAll(visitor.getRemovedResources());
-						if (!isDirty()) {
-							getSite().getShell().getDisplay().asyncExec
-								(new Runnable() {
-									 public void run() {
-										 getSite().getPage().closeEditor(GMFGraphEditor.this, false);
-									 }
-								 });
-						}
-					}
-
-					if (!visitor.getChangedResources().isEmpty()) {
-						changedResources.addAll(visitor.getChangedResources());
-						if (getSite().getPage().getActiveEditor() == GMFGraphEditor.this) {
-							getSite().getShell().getDisplay().asyncExec
-								(new Runnable() {
-									 public void run() {
-										 handleActivate();
-									 }
-								 });
-						}
-					}
-				}
-				catch (CoreException exception) {
-					GMFGraphEditPlugin.INSTANCE.log(exception);
-				}
-			}
-		};
-
-	/**
-	 * Handles activation of the editor or it's associated views.
-	 * @generated
-	 */
-	protected void handleActivate() {
-		// Recompute the read only state.
-		//
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-		  editingDomain.getResourceToReadOnlyMap().clear();
-
-		  // Refresh any actions that may become enabled or disabled.
-		  //
-		  setSelection(getSelection());
-		}
-
-		if (!removedResources.isEmpty()) {
-			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(GMFGraphEditor.this, false);
-			}
-			else {
-				removedResources.clear();
-				changedResources.clear();
-				savedResources.clear();
-			}
-		}
-		else if (!changedResources.isEmpty()) {
-			changedResources.removeAll(savedResources);
-			handleChangedResources();
-			changedResources.clear();
-			savedResources.clear();
-		}
-	}
-
-	/**
-	 * Handles what to do with changed resources on activation.
-	 * @generated
-	 */
-	protected void handleChangedResources() {
-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
-			if (isDirty()) {
-				changedResources.addAll(editingDomain.getResourceSet().getResources());
-			}
-			editingDomain.getCommandStack().flush();
-
-			updateProblemIndication = false;
-			for (Resource resource : changedResources) {
-				if (resource.isLoaded()) {
-					resource.unload();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					}
-					catch (IOException exception) {
-						if (!resourceToDiagnosticMap.containsKey(resource)) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-					}
-				}
-			}
-
-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
-				setSelection(StructuredSelection.EMPTY);
-			}
-
-			updateProblemIndication = true;
-			updateProblemIndication();
-		}
-	}
-  
-	/**
-	 * Updates the problems indication with the information described in the specified diagnostic.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void updateProblemIndication() {
-		if (updateProblemIndication) {
-			BasicDiagnostic diagnostic =
-				new BasicDiagnostic
-					(Diagnostic.OK,
-					 "org.eclipse.papyrus.gmf.graphdef.edit",
-					 0,
-					 null,
-					 new Object [] { editingDomain.getResourceSet() });
-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
-					diagnostic.add(childDiagnostic);
-				}
-			}
-
-			int lastEditorPage = getPageCount() - 1;
-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					setActivePage(lastEditorPage);
-				}
-			}
-			else if (diagnostic.getSeverity() != Diagnostic.OK) {
-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
-				problemEditorPart.setDiagnostic(diagnostic);
-				problemEditorPart.setMarkerHelper(markerHelper);
-				try {
-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
-					setPageText(lastEditorPage, problemEditorPart.getPartName());
-					setActivePage(lastEditorPage);
-					showTabs();
-				}
-				catch (PartInitException exception) {
-					GMFGraphEditPlugin.INSTANCE.log(exception);
-				}
-			}
-
-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
-				markerHelper.deleteMarkers(editingDomain.getResourceSet());
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					try {
-						markerHelper.createMarkers(diagnostic);
-					}
-					catch (CoreException exception) {
-						GMFGraphEditPlugin.INSTANCE.log(exception);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * @generated
-	 */
-	protected boolean handleDirtyConflict() {
-		return
-			MessageDialog.openQuestion
-				(getSite().getShell(),
-				 getString("_UI_FileConflict_label"),
-				 getString("_WARN_FileConflict"));
-	}
-
-	/**
-	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphEditor() {
-		super();
-		initializeEditingDomain();
-	}
-
-	/**
-	 * This sets up the editing domain for the model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void initializeEditingDomain() {
-		// Create an adapter factory that yields item providers.
-		//
-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new GMFGraphItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
-		// Create the command stack that will notify this editor as commands are executed.
-		//
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener
-			(new CommandStackListener() {
-				 public void commandStackChanged(final EventObject event) {
-					 getContainer().getDisplay().asyncExec
-						 (new Runnable() {
-							  public void run() {
-								  firePropertyChange(IEditorPart.PROP_DIRTY);
-
-								  // Try to select the affected objects.
-								  //
-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
-								  if (mostRecentCommand != null) {
-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-								  }
-								  if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
-									  propertySheetPage.refresh();
-								  }
-							  }
-						  });
-				 }
-			 });
-
-		// Create the editing domain with a special command stack.
-		//
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
-	}
-
-	/**
-	 * This is here for the listener to be able to call it.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void firePropertyChange(int action) {
-		super.firePropertyChange(action);
-	}
-
-	/**
-	 * This sets the selection into whichever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSelectionToViewer(Collection<?> collection) {
-		final Collection<?> theSelection = collection;
-		// Make sure it's okay.
-		//
-		if (theSelection != null && !theSelection.isEmpty()) {
-			// I don't know if this should be run this deferred
-			// because we might have to give the editor a chance to process the viewer update events
-			// and hence to update the views first.
-			//
-			//
-			Runnable runnable =
-				new Runnable() {
-					public void run() {
-						// Try to select the items in the current content viewer of the editor.
-						//
-						if (currentViewer != null) {
-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-						}
-					}
-				};
-			runnable.run();
-		}
-	}
-
-	/**
-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-		}
-
-		public Object [] getElements(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		public Object [] getChildren(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		public boolean hasChildren(Object object) {
-			Object parent = super.getParent(object);
-			return parent != null;
-		}
-
-		public Object getParent(Object object) {
-			return null;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrentViewerPane(ViewerPane viewerPane) {
-		if (currentViewerPane != viewerPane) {
-			if (currentViewerPane != null) {
-				currentViewerPane.showFocus(false);
-			}
-			currentViewerPane = viewerPane;
-		}
-		setCurrentViewer(currentViewerPane.getViewer());
-	}
-
-	/**
-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
-	 * is the current one.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrentViewer(Viewer viewer) {
-		// If it is changing...
-		//
-		if (currentViewer != viewer) {
-			if (selectionChangedListener == null) {
-				// Create the listener on demand.
-				//
-				selectionChangedListener =
-					new ISelectionChangedListener() {
-						// This just notifies those things that are affected by the section.
-						//
-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
-							setSelection(selectionChangedEvent.getSelection());
-						}
-					};
-			}
-
-			// Stop listening to the old one.
-			//
-			if (currentViewer != null) {
-				currentViewer.removeSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Start listening to the new one.
-			//
-			if (viewer != null) {
-				viewer.addSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Remember it.
-			//
-			currentViewer = viewer;
-
-			// Set the editors selection based on the current viewer's selection.
-			//
-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
-		}
-	}
-
-	/**
-	 * This returns the viewer as required by the {@link IViewerProvider} interface.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Viewer getViewer() {
-		return currentViewer;
-	}
-
-	/**
-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createContextMenuFor(StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp");
-		contextMenu.add(new Separator("additions"));
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu= contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
-
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
-	}
-
-	public void createModel() {
-		if (getEditorInput() instanceof IFileEditorInput) {
-			createModelGen();
-		} else {
-			Exception exception = null;
-			Resource resource = null;
-			IStorageEditorInput storageEditorInput = (IStorageEditorInput)getEditorInput();
-			try
-			{
-				IStorage storage = storageEditorInput.getStorage();
-				resource = editingDomain.createResource("*.gmfgraph");
-				resource.setURI(URI.createURI(storage.getFullPath().toString()));
-				resource.load(storage.getContents(), null);
-			}
-			catch (Exception e)
-			{
-				exception = e;
-			}
-
-			Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-			if (diagnostic.getSeverity() != Diagnostic.OK)
-			{
-				resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
-			}
-			editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);  
-		}
-	}
-
-	/**
-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createModelGen() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
-		Exception exception = null;
-		Resource resource = null;
-		try {
-			// Load the resource through the editing domain.
-			//
-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-		}
-		catch (Exception e) {
-			exception = e;
-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
-		}
-
-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-		if (diagnostic.getSeverity() != Diagnostic.OK) {
-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
-		}
-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-	}
-
-	/**
-	 * Returns a diagnostic describing the errors and warnings listed in the resource
-	 * and the specified exception (if any).
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
-			BasicDiagnostic basicDiagnostic =
-				new BasicDiagnostic
-					(Diagnostic.ERROR,
-					 "org.eclipse.papyrus.gmf.graphdef.edit",
-					 0,
-					 getString("_UI_CreateModelError_message", resource.getURI()),
-					 new Object [] { exception == null ? (Object)resource : exception });
-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
-			return basicDiagnostic;
-		}
-		else if (exception != null) {
-			return
-				new BasicDiagnostic
-					(Diagnostic.ERROR,
-					 "org.eclipse.papyrus.gmf.graphdef.edit",
-					 0,
-					 getString("_UI_CreateModelError_message", resource.getURI()),
-					 new Object[] { exception });
-		}
-		else {
-			return Diagnostic.OK_INSTANCE;
-		}
-	}
-
-	/**
-	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void createPages() {
-		// Creates the model from the editor input
-		//
-		createModel();
-
-		// Only creates the other pages if there is something that can be edited
-		//
-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
-			// Create a page for the selection tree view.
-			//
-			{
-				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), GMFGraphEditor.this) {
-						@Override
-						public Viewer createViewer(Composite composite) {
-							Tree tree = new Tree(composite, SWT.MULTI);
-							TreeViewer newTreeViewer = new TreeViewer(tree);
-							return newTreeViewer;
-						}
-						@Override
-						public void requestActivation() {
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
-				viewerPane.createControl(getContainer());
-
-				selectionViewer = (TreeViewer)viewerPane.getViewer();
-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				selectionViewer.setInput(editingDomain.getResourceSet());
-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-				viewerPane.setTitle(editingDomain.getResourceSet());
-
-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(selectionViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));
-			}
-			
-			getSite().getShell().getDisplay().asyncExec
-				(new Runnable() {
-					 public void run() {
-						 setActivePage(0);
-					 }
-				 });
-		}
-
-		// Ensures that this editor will only display the page's tab
-		// area if there are more than one page
-		//
-		getContainer().addControlListener
-			(new ControlAdapter() {
-				boolean guard = false;
-				@Override
-				public void controlResized(ControlEvent event) {
-					if (!guard) {
-						guard = true;
-						hideTabs();
-						guard = false;
-					}
-				}
-			 });
-
-		getSite().getShell().getDisplay().asyncExec
-			(new Runnable() {
-				 public void run() {
-					 updateProblemIndication();
-				 }
-			 });
-	}
-
-	/**
-	 * If there is just one page in the multi-page editor part,
-	 * this hides the single tab at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void hideTabs() {
-		if (getPageCount() <= 1) {
-			setPageText(0, "");
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder)getContainer()).setTabHeight(1);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y + 6);
-			}
-		}
-	}
-
-	/**
-	 * If there is more than one page in the multi-page editor part,
-	 * this shows the tabs at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void showTabs() {
-		if (getPageCount() > 1) {
-			setPageText(0, getString("_UI_SelectionPage_label"));
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y - 6);
-			}
-		}
-	}
-
-	/**
-	 * This is used to track the active viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void pageChange(int pageIndex) {
-		super.pageChange(pageIndex);
-
-		if (contentOutlinePage != null) {
-			handleContentOutlineSelection(contentOutlinePage.getSelection());
-		}
-	}
-
-	/**
-	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public Object getAdapter(Class key) {
-		if (key.equals(IContentOutlinePage.class)) {
-			return showOutlineView() ? getContentOutlinePage() : null;
-		}
-		else if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheetPage();
-		}
-		else if (key.equals(IGotoMarker.class)) {
-			return this;
-		}
-		else {
-			return super.getAdapter(key);
-		}
-	}
-
-	/**
-	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IContentOutlinePage getContentOutlinePage() {
-		if (contentOutlinePage == null) {
-			// The content outline is just a tree.
-			//
-			class MyContentOutlinePage extends ContentOutlinePage {
-				@Override
-				public void createControl(Composite parent) {
-					super.createControl(parent);
-					contentOutlineViewer = getTreeViewer();
-					contentOutlineViewer.addSelectionChangedListener(this);
-
-					// Set up the tree viewer.
-					//
-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-					contentOutlineViewer.setInput(editingDomain.getResourceSet());
-
-					// Make sure our popups work.
-					//
-					createContextMenuFor(contentOutlineViewer);
-
-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
-					  // Select the root object in the view.
-					  //
-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-					}
-				}
-
-				@Override
-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-					super.makeContributions(menuManager, toolBarManager, statusLineManager);
-					contentOutlineStatusLineManager = statusLineManager;
-				}
-
-				@Override
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			}
-
-			contentOutlinePage = new MyContentOutlinePage();
-
-			// Listen to selection so that we can handle it is a special way.
-			//
-			contentOutlinePage.addSelectionChangedListener
-				(new ISelectionChangedListener() {
-					 // This ensures that we handle selections correctly.
-					 //
-					 public void selectionChanged(SelectionChangedEvent event) {
-						 handleContentOutlineSelection(event.getSelection());
-					 }
-				 });
-		}
-
-		return contentOutlinePage;
-	}
-
-	/**
-	 * This accesses a cached version of the property sheet.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage == null) {
-			propertySheetPage =
-				new ExtendedPropertySheetPage(editingDomain) {
-					@Override
-					public void setSelectionToViewer(List<?> selection) {
-						GMFGraphEditor.this.setSelectionToViewer(selection);
-						GMFGraphEditor.this.setFocus();
-					}
-
-					@Override
-					public void setActionBars(IActionBars actionBars) {
-						super.setActionBars(actionBars);
-						getActionBarContributor().shareGlobalActions(this, actionBars);
-					}
-				};
-			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
-		}
-
-		return propertySheetPage;
-	}
-
-	/**
-	 * This deals with how we want selection in the outliner to affect the other views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void handleContentOutlineSelection(ISelection selection) {
-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
-			if (selectedElements.hasNext()) {
-				// Get the first selected element.
-				//
-				Object selectedElement = selectedElements.next();
-
-				// If it's the selection viewer, then we want it to select the same selection as this selection.
-				//
-				if (currentViewerPane.getViewer() == selectionViewer) {
-					ArrayList<Object> selectionList = new ArrayList<Object>();
-					selectionList.add(selectedElement);
-					while (selectedElements.hasNext()) {
-						selectionList.add(selectedElements.next());
-					}
-
-					// Set the selection to the widget.
-					//
-					selectionViewer.setSelection(new StructuredSelection(selectionList));
-				}
-				else {
-					// Set the input to the widget.
-					//
-					if (currentViewerPane.getViewer().getInput() != selectedElement) {
-						currentViewerPane.getViewer().setInput(selectedElement);
-						currentViewerPane.setTitle(selectedElement);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// Save only resources that have actually changed.
-		//
-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-
-		// Do the work within an operation because this is a long running activity that modifies the workbench.
-		//
-		WorkspaceModifyOperation operation =
-			new WorkspaceModifyOperation() {
-				// This is the method that gets invoked when the operation runs.
-				//
-				@Override
-				public void execute(IProgressMonitor monitor) {
-					// Save the resources to the file system.
-					//
-					boolean first = true;
-					for (Resource resource : editingDomain.getResourceSet().getResources()) {
-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
-							try {
-								savedResources.add(resource);
-								resource.save(saveOptions);
-							}
-							catch (Exception exception) {
-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-							}
-							first = false;
-						}
-					}
-				}
-			};
-
-		updateProblemIndication = false;
-		try {
-			// This runs the options, and shows progress.
-			//
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-			// Refresh the necessary state.
-			//
-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-		}
-		catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			//
-			GMFGraphEditPlugin.INSTANCE.log(exception);
-		}
-		updateProblemIndication = true;
-		updateProblemIndication();
-	}
-
-	/**
-	 * This returns whether something has been persisted to the URI of the specified resource.
-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean isPersisted(Resource resource) {
-		boolean result = false;
-		try {
-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
-			if (stream != null) {
-				result = true;
-				stream.close();
-			}
-		}
-		catch (IOException e) {
-			// Ignore
-		}
-		return result;
-	}
-
-	/**
-	 * This always returns true because it is not currently supported.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * This also changes the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
-		saveAsDialog.open();
-		IPath path = saveAsDialog.getResult();
-		if (path != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (file != null) {
-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
-			}
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void doSaveAs(URI uri, IEditorInput editorInput) {
-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		IProgressMonitor progressMonitor =
-			getActionBars().getStatusLineManager() != null ?
-				getActionBars().getStatusLineManager().getProgressMonitor() :
-				new NullProgressMonitor();
-		doSave(progressMonitor);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		try {
-			if (marker.getType().equals(EValidator.MARKER)) {
-				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
-				if (uriAttribute != null) {
-					URI uri = URI.createURI(uriAttribute);
-					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
-					if (eObject != null) {
-					  setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
-					}
-				}
-			}
-		}
-		catch (CoreException exception) {
-			GMFGraphEditPlugin.INSTANCE.log(exception);
-		}
-	}
-
-	/**
-	 * This is called during startup.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput editorInput) {
-		setSite(site);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setFocus() {
-		if (currentViewerPane != null) {
-			currentViewerPane.setFocus();
-		}
-		else {
-			getControl(getActivePage()).setFocus();
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ISelection getSelection() {
-		return editorSelection;
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
-	 * Calling this result will notify the listeners.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSelection(ISelection selection) {
-		editorSelection = selection;
-
-		for (ISelectionChangedListener listener : selectionChangedListeners) {
-			listener.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-		setStatusLineManager(selection);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatusLineManager(ISelection selection) {
-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
-
-		if (statusLineManager != null) {
-			if (selection instanceof IStructuredSelection) {
-				Collection<?> collection = ((IStructuredSelection)selection).toList();
-				switch (collection.size()) {
-					case 0: {
-						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
-						break;
-					}
-					case 1: {
-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
-						break;
-					}
-					default: {
-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
-						break;
-					}
-				}
-			}
-			else {
-				statusLineManager.setMessage("");
-			}
-		}
-	}
-
-	/**
-	 * This looks up a string in the plugin's plugin.properties file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static String getString(String key) {
-		return GMFGraphEditPlugin.INSTANCE.getString(key);
-	}
-
-	/**
-	 * This looks up a string in plugin.properties, making a substitution.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static String getString(String key, Object s1) {
-		return GMFGraphEditPlugin.INSTANCE.getString(key, new Object [] { s1 });
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EditingDomainActionBarContributor getActionBarContributor() {
-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IActionBars getActionBars() {
-		return getActionBarContributor().getActionBars();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		updateProblemIndication = false;
-
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-
-		getSite().getPage().removePartListener(partListener);
-
-		adapterFactory.dispose();
-
-		if (getActionBarContributor().getActiveEditor() == this) {
-			getActionBarContributor().setActiveEditor(null);
-		}
-
-		if (propertySheetPage != null) {
-			propertySheetPage.dispose();
-		}
-
-		if (contentOutlinePage != null) {
-			contentOutlinePage.dispose();
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * Returns whether the outline view should be presented to the user.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean showOutlineView() {
-		return true;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphModelWizard.java
deleted file mode 100644
index ecbfd025e91..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/presentation/GMFGraphModelWizard.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.presentation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphEditPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-/**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
-public class GMFGraphModelWizard extends Wizard implements INewWizard {
-
-	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GMFGraphModelWizardNewFileCreationPage newFileCreationPage;
-
-	/**
-	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
-
-	/**
-	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IWorkbench workbench;
-
-	/**
-	 * This just records the information.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-		setWindowTitle(GMFGraphEditPlugin.INSTANCE.getString("_UI_Wizard_label"));
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(GMFGraphEditPlugin.INSTANCE.getImage("full/wizban/NewGMFGraph")));
-	}
-
-	/**
-	 * Create a new model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected EObject createInitialModel() {
-		return GMFGraphPackage.eINSTANCE.getGMFGraphFactory().createCanvas();
-	}
-
-	/**
-	 * Do the work after everything is specified.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public boolean performFinish() {
-		try {
-			final IFile modelFile = getModelFile();
-			createModelFile(modelFile);
-			return openEditor(modelFile);
-		}
-		catch (Exception exception) {
-			GMFGraphEditPlugin.INSTANCE.log(exception);
-			return false;
-		}
-	}
-
-	protected void createModelFile(final IFile modelFile) throws Exception {
-		WorkspaceModifyOperation operation =
-			new WorkspaceModifyOperation() {
-				protected void execute(IProgressMonitor progressMonitor) {
-					try {
-						// Create a resource set
-						//
-						ResourceSet resourceSet = new ResourceSetImpl();
-
-						// Get the URI of the model file.
-						//
-						URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
-						// Create a resource for this file.
-						//
-						Resource resource = resourceSet.createResource(fileURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-
-						// Add the initial model object to the contents.
-						//
-						EObject rootObject = createInitialModel();
-						if (rootObject != null) {
-							resource.getContents().add(rootObject);
-						}
-
-						// Save the contents of the resource to the file system.
-						//
-						Map<String, String> options = new HashMap<String, String>();
-						options.put(XMLResource.OPTION_ENCODING, "UTF-8");
-						resource.save(options);
-					}
-					catch (Exception exception) {
-						GMFGraphEditPlugin.INSTANCE.log(exception);
-					}
-					finally {
-						progressMonitor.done();
-					}
-				}
-			};
-
-		getContainer().run(false, false, operation);
-	}
-
-	protected boolean openEditor(IFile modelFile) {
-
-		// Select the new file resource in the current view.
-		//
-		IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-		IWorkbenchPage page = workbenchWindow.getActivePage();
-		final IWorkbenchPart activePart = page.getActivePart();
-		if (activePart instanceof ISetSelectionTarget) {
-			final ISelection targetSelection = new StructuredSelection(modelFile);
-			getShell().getDisplay().asyncExec
-				(new Runnable() {
-					 public void run() {
-						 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
-					 }
-				 });
-		}
-
-		// Open an editor on the new file.
-		//
-		try {
-			page.openEditor
-				(new FileEditorInput(modelFile),
-				 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-		}
-		catch (PartInitException exception) {
-			MessageDialog.openError(workbenchWindow.getShell(), GMFGraphEditPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public class GMFGraphModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
-		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public GMFGraphModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
-			super(pageId, selection);
-		}
-
-		/**
-		 * The framework calls this to see if the file is correct.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected boolean validatePage() {
-			if (super.validatePage()) {
-				// Make sure the file ends in ".gmfgraph".
-				//
-				String requiredExt = GMFGraphEditPlugin.INSTANCE.getString("_UI_GMFGraphEditorFilenameExtension");
-				String enteredExt = new Path(getFileName()).getFileExtension();
-				if (enteredExt == null || !enteredExt.equals(requiredExt)) {
-					setErrorMessage(GMFGraphEditPlugin.INSTANCE.getString("_WARN_FilenameExtension", new Object [] { requiredExt }));
-					return false;
-				}
-				else {
-					return true;
-				}
-			}
-			else {
-				return false;
-			}
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public IFile getModelFile() {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
-		}
-	}
-
-	/**
-	 * The framework calls this to create the contents of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void addPages() {
-		// Create a page, set the title, and the initial model file name.
-		//
-		newFileCreationPage = new GMFGraphModelWizardNewFileCreationPage("Whatever", selection);
-		newFileCreationPage.setTitle(GMFGraphEditPlugin.INSTANCE.getString("_UI_GMFGraphModelWizard_label"));
-		newFileCreationPage.setDescription(GMFGraphEditPlugin.INSTANCE.getString("_UI_GMFGraphModelWizard_description"));
-		newFileCreationPage.setFileName(GMFGraphEditPlugin.INSTANCE.getString("_UI_GMFGraphEditorFilenameDefaultBase") + "." + GMFGraphEditPlugin.INSTANCE.getString("_UI_GMFGraphEditorFilenameExtension"));
-		addPage(newFileCreationPage);
-
-		// Try and get the resource selection to determine a current directory for the file dialog.
-		//
-		if (selection != null && !selection.isEmpty()) {
-			// Get the resource...
-			//
-			Object selectedElement = selection.iterator().next();
-			if (selectedElement instanceof IResource) {
-				// Get the resource parent, if its a file.
-				//
-				IResource selectedResource = (IResource)selectedElement;
-				if (selectedResource.getType() == IResource.FILE) {
-					selectedResource = selectedResource.getParent();
-				}
-
-				// This gives us a directory...
-				//
-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
-					// Set this for the container.
-					//
-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
-
-					// Make up a unique new name here.
-					//
-					String defaultModelBaseFilename = GMFGraphEditPlugin.INSTANCE.getString("_UI_GMFGraphEditorFilenameDefaultBase");
-					String defaultModelFilenameExtension = GMFGraphEditPlugin.INSTANCE.getString("_UI_GMFGraphEditorFilenameExtension");
-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
-					}
-					newFileCreationPage.setFileName(modelFilename);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IFile getModelFile() {
-		return newFileCreationPage.getModelFile();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AbstractFigureItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AbstractFigureItemProvider.java
deleted file mode 100644
index 0f92514ae26..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AbstractFigureItemProvider.java
+++ /dev/null
@@ -1,380 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AbstractFigureItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractFigureItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDescriptorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Descriptor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescriptorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Figure_descriptor_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Figure_descriptor_feature", "_UI_Figure_type"),
-				 GMFGraphPackage.eINSTANCE.getFigure_Descriptor(),
-				 false,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getLayoutable_Layout());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_MaximumSize());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_MinimumSize());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_PreferredSize());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_Font());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_Insets());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_Border());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_Location());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigure_Size());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_AbstractFigure_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(AbstractFigure.class)) {
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA:
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT:
-			case GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR:
-			case GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR:
-			case GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE:
-			case GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE:
-			case GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE:
-			case GMFGraphPackage.ABSTRACT_FIGURE__FONT:
-			case GMFGraphPackage.ABSTRACT_FIGURE__INSETS:
-			case GMFGraphPackage.ABSTRACT_FIGURE__BORDER:
-			case GMFGraphPackage.ABSTRACT_FIGURE__LOCATION:
-			case GMFGraphPackage.ABSTRACT_FIGURE__SIZE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
-				 GMFGraphFactory.eINSTANCE.createCustomLayoutData()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
-				 GMFGraphFactory.eINSTANCE.createGridLayoutData()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
-				 GMFGraphFactory.eINSTANCE.createBorderLayoutData()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_LayoutData(),
-				 GMFGraphFactory.eINSTANCE.createXYLayoutData()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
-				 GMFGraphFactory.eINSTANCE.createLayoutRef()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
-				 GMFGraphFactory.eINSTANCE.createCustomLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
-				 GMFGraphFactory.eINSTANCE.createGridLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
-				 GMFGraphFactory.eINSTANCE.createBorderLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
-				 GMFGraphFactory.eINSTANCE.createFlowLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
-				 GMFGraphFactory.eINSTANCE.createXYLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
-				 GMFGraphFactory.eINSTANCE.createStackLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLayoutable_Layout(),
-				 GMFGraphFactory.eINSTANCE.createCenterLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor(),
-				 GMFGraphFactory.eINSTANCE.createRGBColor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor(),
-				 GMFGraphFactory.eINSTANCE.createConstantColor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor(),
-				 GMFGraphFactory.eINSTANCE.createRGBColor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor(),
-				 GMFGraphFactory.eINSTANCE.createConstantColor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_MaximumSize(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_MinimumSize(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_PreferredSize(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Font(),
-				 GMFGraphFactory.eINSTANCE.createBasicFont()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Insets(),
-				 GMFGraphFactory.eINSTANCE.createInsets()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Border(),
-				 GMFGraphFactory.eINSTANCE.createBorderRef()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Border(),
-				 GMFGraphFactory.eINSTANCE.createLineBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Border(),
-				 GMFGraphFactory.eINSTANCE.createMarginBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Border(),
-				 GMFGraphFactory.eINSTANCE.createCompoundBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Border(),
-				 GMFGraphFactory.eINSTANCE.createCustomBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Location(),
-				 GMFGraphFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigure_Size(),
-				 GMFGraphFactory.eINSTANCE.createPoint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AbstractNodeItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AbstractNodeItemProvider.java
deleted file mode 100644
index 97d36be1591..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AbstractNodeItemProvider.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractNode;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.AbstractNode} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AbstractNodeItemProvider
-	extends DiagramElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractNodeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AbstractNode)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AbstractNode_type") :
-			getString("_UI_AbstractNode_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AlignmentFacetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AlignmentFacetItemProvider.java
deleted file mode 100644
index 52cbf57ef91..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/AlignmentFacetItemProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AlignmentFacetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AlignmentFacetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAlignmentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Alignment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAlignmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AlignmentFacet_alignment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AlignmentFacet_alignment_feature", "_UI_AlignmentFacet_type"),
-				 GMFGraphPackage.eINSTANCE.getAlignmentFacet_Alignment(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns AlignmentFacet.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AlignmentFacet"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Alignment labelValue = ((AlignmentFacet)object).getAlignment();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AlignmentFacet_type") :
-			getString("_UI_AlignmentFacet_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(AlignmentFacet.class)) {
-			case GMFGraphPackage.ALIGNMENT_FACET__ALIGNMENT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BasicFontItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BasicFontItemProvider.java
deleted file mode 100644
index f1fe61f28d6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BasicFontItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.BasicFont;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BasicFontItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BasicFontItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFaceNamePropertyDescriptor(object);
-			addHeightPropertyDescriptor(object);
-			addStylePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Face Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFaceNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BasicFont_faceName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BasicFont_faceName_feature", "_UI_BasicFont_type"),
-				 GMFGraphPackage.eINSTANCE.getBasicFont_FaceName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Height feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BasicFont_height_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BasicFont_height_feature", "_UI_BasicFont_type"),
-				 GMFGraphPackage.eINSTANCE.getBasicFont_Height(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BasicFont_style_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BasicFont_style_feature", "_UI_BasicFont_type"),
-				 GMFGraphPackage.eINSTANCE.getBasicFont_Style(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns BasicFont.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BasicFont"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((BasicFont)object).getFaceName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_BasicFont_type") :
-			getString("_UI_BasicFont_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BasicFont.class)) {
-			case GMFGraphPackage.BASIC_FONT__FACE_NAME:
-			case GMFGraphPackage.BASIC_FONT__HEIGHT:
-			case GMFGraphPackage.BASIC_FONT__STYLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderLayoutDataItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderLayoutDataItemProvider.java
deleted file mode 100644
index 2bdcafbc192..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderLayoutDataItemProvider.java
+++ /dev/null
@@ -1,199 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BorderLayoutDataItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BorderLayoutDataItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAlignmentPropertyDescriptor(object);
-			addVerticalPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Alignment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAlignmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BorderLayoutData_alignment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BorderLayoutData_alignment_feature", "_UI_BorderLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getBorderLayoutData_Alignment(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Vertical feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVerticalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BorderLayoutData_vertical_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BorderLayoutData_vertical_feature", "_UI_BorderLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getBorderLayoutData_Vertical(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns BorderLayoutData.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderLayoutData"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Alignment labelValue = ((BorderLayoutData)object).getAlignment();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_BorderLayoutData_type") :
-			getString("_UI_BorderLayoutData_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BorderLayoutData.class)) {
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderLayoutItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderLayoutItemProvider.java
deleted file mode 100644
index d59eac2304b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderLayoutItemProvider.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayout} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BorderLayoutItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BorderLayoutItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getBorderLayout_Spacing());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns BorderLayout.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderLayout"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_BorderLayout_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BorderLayout.class)) {
-			case GMFGraphPackage.BORDER_LAYOUT__SPACING:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getBorderLayout_Spacing(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderRefItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderRefItemProvider.java
deleted file mode 100644
index 561733819df..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/BorderRefItemProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.BorderRef} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BorderRefItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BorderRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addActualPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Actual feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addActualPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_BorderRef_actual_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_BorderRef_actual_feature", "_UI_BorderRef_type"),
-				 GMFGraphPackage.eINSTANCE.getBorderRef_Actual(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns BorderRef.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BorderRef"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_BorderRef_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CanvasItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CanvasItemProvider.java
deleted file mode 100644
index 7d128ea7d92..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CanvasItemProvider.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.command.CommandParameter;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Canvas} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CanvasItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CanvasItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identity_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identity_name_feature", "_UI_Identity_type"),
-				 GMFGraphPackage.eINSTANCE.getIdentity_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCanvas_Figures());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCanvas_Nodes());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCanvas_Connections());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCanvas_Compartments());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCanvas_Labels());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Modifications for https://bugs.eclipse.org/bugs/show_bug.cgi?id=169310
-		if (object instanceof Canvas && child instanceof DiagramLabel) {
-			return GMFGraphPackage.eINSTANCE.getCanvas_Labels();
-		}
-		
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Canvas.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Canvas"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Canvas)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Canvas_type") :
-			getString("_UI_Canvas_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Canvas.class)) {
-			case GMFGraphPackage.CANVAS__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.CANVAS__FIGURES:
-			case GMFGraphPackage.CANVAS__NODES:
-			case GMFGraphPackage.CANVAS__CONNECTIONS:
-			case GMFGraphPackage.CANVAS__COMPARTMENTS:
-			case GMFGraphPackage.CANVAS__LABELS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void collectNewChildDescriptorsGen(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCanvas_Figures(),
-				 GMFGraphFactory.eINSTANCE.createFigureGallery()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCanvas_Nodes(),
-				 GMFGraphFactory.eINSTANCE.createNode()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCanvas_Nodes(),
-				 GMFGraphFactory.eINSTANCE.createDiagramLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCanvas_Connections(),
-				 GMFGraphFactory.eINSTANCE.createConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCanvas_Compartments(),
-				 GMFGraphFactory.eINSTANCE.createCompartment()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCanvas_Labels(),
-				 GMFGraphFactory.eINSTANCE.createDiagramLabel()));
-	}
-
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		LinkedList<Object> allGenerated = new LinkedList<Object>();
-		collectNewChildDescriptorsGen(allGenerated, object);
-		
-		CommandParameter toRemove = createChildParameter(
-				GMFGraphPackage.eINSTANCE.getCanvas_Nodes(),
-				GMFGraphFactory.eINSTANCE.createDiagramLabel());
-
-		for (Iterator<Object> generated = allGenerated.iterator(); generated.hasNext();){
-			final CommandParameter next = (CommandParameter) generated.next();
-			if (equalsChildParameters(toRemove, next)){
-				generated.remove();
-				break;
-			}
-		}
-		
-		newChildDescriptors.addAll(allGenerated);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getCanvas_Nodes() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getCanvas_Labels();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	private static boolean equalsChildParameters(CommandParameter first, CommandParameter second){
-		if (!first.getFeature().equals(second.getFeature())){
-			return false;
-		}
-		assert first.getValue() instanceof EObject;
-		assert second.getValue() instanceof EObject;
-		
-		EClass firstEClass = ((EObject)first.getValue()).eClass();
-		EClass secondEClass = ((EObject)second.getValue()).eClass();
-		
-		assert firstEClass.getEPackage().getNsURI().equals(secondEClass.getEPackage().getNsURI());
-		return firstEClass.getClassifierID() == secondEClass.getClassifierID(); 
-	}
-	
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CenterLayoutItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CenterLayoutItemProvider.java
deleted file mode 100644
index eb573115415..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CenterLayoutItemProvider.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CenterLayout} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CenterLayoutItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CenterLayoutItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns CenterLayout.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CenterLayout"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_CenterLayout_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ChildAccessItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ChildAccessItemProvider.java
deleted file mode 100644
index 8134bfb781a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ChildAccessItemProvider.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ChildAccessItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccessItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAccessorPropertyDescriptor(object);
-			addFigurePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Accessor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAccessorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ChildAccess_accessor_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ChildAccess_accessor_feature", "_UI_ChildAccess_type"),
-				 GMFGraphPackage.eINSTANCE.getChildAccess_Accessor(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Figure feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFigurePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ChildAccess_figure_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ChildAccess_figure_feature", "_UI_ChildAccess_type"),
-				 GMFGraphPackage.eINSTANCE.getChildAccess_Figure(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ChildAccess.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ChildAccess"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ChildAccess)object).getAccessor();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ChildAccess_type") :
-			getString("_UI_ChildAccess_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ChildAccess.class)) {
-			case GMFGraphPackage.CHILD_ACCESS__ACCESSOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ColorPinItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ColorPinItemProvider.java
deleted file mode 100644
index 9636f3d03f6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ColorPinItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorPin;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.ColorPin} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ColorPinItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ColorPinItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addBackgroundNotForegroundPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identity_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identity_name_feature", "_UI_Identity_type"),
-				 GMFGraphPackage.eINSTANCE.getIdentity_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Background Not Foreground feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBackgroundNotForegroundPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ColorPin_backgroundNotForeground_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ColorPin_backgroundNotForeground_feature", "_UI_ColorPin_type"),
-				 GMFGraphPackage.eINSTANCE.getColorPin_BackgroundNotForeground(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ColorPin.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ColorPin"));
-	}
-	
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ColorPin)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ColorPin_type") :
-			getString("_UI_ColorPin_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ColorPin.class)) {
-			case GMFGraphPackage.COLOR_PIN__NAME:
-			case GMFGraphPackage.COLOR_PIN__BACKGROUND_NOT_FOREGROUND:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CompartmentItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CompartmentItemProvider.java
deleted file mode 100644
index 79f9f88d478..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CompartmentItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Compartment} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompartmentItemProvider
-	extends DiagramElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompartmentItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCollapsiblePropertyDescriptor(object);
-			addNeedsTitlePropertyDescriptor(object);
-			addAccessorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Collapsible feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCollapsiblePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compartment_collapsible_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compartment_collapsible_feature", "_UI_Compartment_type"),
-				 GMFGraphPackage.eINSTANCE.getCompartment_Collapsible(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Needs Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNeedsTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compartment_needsTitle_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compartment_needsTitle_feature", "_UI_Compartment_type"),
-				 GMFGraphPackage.eINSTANCE.getCompartment_NeedsTitle(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Accessor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAccessorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Compartment_accessor_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Compartment_accessor_feature", "_UI_Compartment_type"),
-				 GMFGraphPackage.eINSTANCE.getCompartment_Accessor(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Compartment.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Compartment"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTextGen(Object object) {
-		String label = ((Compartment)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Compartment_type") :
-			getString("_UI_Compartment_type") + " " + label;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		String textGen = getTextGen(object);
-		FigureDescriptor figureDescriptor = ((Compartment)object).getFigure();
-		if (figureDescriptor != null && figureDescriptor.getName() != null) {
-			textGen += " (" + figureDescriptor.getName() + ")";
-		}
-		return textGen;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Compartment.class)) {
-			case GMFGraphPackage.COMPARTMENT__COLLAPSIBLE:
-			case GMFGraphPackage.COMPARTMENT__NEEDS_TITLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CompoundBorderItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CompoundBorderItemProvider.java
deleted file mode 100644
index 9fc3c369aaa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CompoundBorderItemProvider.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompoundBorderItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompoundBorderItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCompoundBorder_Outer());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCompoundBorder_Inner());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CompoundBorder.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompoundBorder"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_CompoundBorder_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CompoundBorder.class)) {
-			case GMFGraphPackage.COMPOUND_BORDER__OUTER:
-			case GMFGraphPackage.COMPOUND_BORDER__INNER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Outer(),
-				 GMFGraphFactory.eINSTANCE.createBorderRef()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Outer(),
-				 GMFGraphFactory.eINSTANCE.createLineBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Outer(),
-				 GMFGraphFactory.eINSTANCE.createMarginBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Outer(),
-				 GMFGraphFactory.eINSTANCE.createCompoundBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Outer(),
-				 GMFGraphFactory.eINSTANCE.createCustomBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Inner(),
-				 GMFGraphFactory.eINSTANCE.createBorderRef()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Inner(),
-				 GMFGraphFactory.eINSTANCE.createLineBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Inner(),
-				 GMFGraphFactory.eINSTANCE.createMarginBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Inner(),
-				 GMFGraphFactory.eINSTANCE.createCompoundBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCompoundBorder_Inner(),
-				 GMFGraphFactory.eINSTANCE.createCustomBorder()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getCompoundBorder_Outer() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getCompoundBorder_Inner();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ConnectionItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ConnectionItemProvider.java
deleted file mode 100644
index ccad93fd067..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ConnectionItemProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Connection} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConnectionItemProvider
-	extends DiagramElementItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConnectionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Connection.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Connection"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Connection)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Connection_type") :
-			getString("_UI_Connection_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ConstantColorItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ConstantColorItemProvider.java
deleted file mode 100644
index 9d96b290327..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ConstantColorItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.ConstantColor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.ConstantColor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConstantColorItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConstantColorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ConstantColor_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ConstantColor_value_feature", "_UI_ConstantColor_type"),
-				 GMFGraphPackage.eINSTANCE.getConstantColor_Value(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ConstantColor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ConstantColor"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		ConstantColor cColor = (ConstantColor)object;
-		return RGBColorItemProvider.getColourSemanticPrefix(cColor) +
-				String.valueOf(cColor.getValue());
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ConstantColor.class)) {
-			case GMFGraphPackage.CONSTANT_COLOR__VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomAttributeItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomAttributeItemProvider.java
deleted file mode 100644
index 7073cef2950..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomAttributeItemProvider.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomAttributeItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomAttributeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addValuePropertyDescriptor(object);
-			addDirectAccessPropertyDescriptor(object);
-			addMultiStatementValuePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomAttribute_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomAttribute_name_feature", "_UI_CustomAttribute_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomAttribute_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomAttribute_value_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomAttribute_value_feature", "_UI_CustomAttribute_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomAttribute_Value(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Direct Access feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDirectAccessPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomAttribute_directAccess_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomAttribute_directAccess_feature", "_UI_CustomAttribute_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomAttribute_DirectAccess(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Multi Statement Value feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMultiStatementValuePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomAttribute_multiStatementValue_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomAttribute_multiStatementValue_feature", "_UI_CustomAttribute_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomAttribute_MultiStatementValue(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns CustomAttribute.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomAttribute"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CustomAttribute)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CustomAttribute_type") :
-			getString("_UI_CustomAttribute_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CustomAttribute.class)) {
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomBorderItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomBorderItemProvider.java
deleted file mode 100644
index 6a8de48999d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomBorderItemProvider.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomBorder} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomBorderItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomBorderItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addQualifiedClassNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Qualified Class Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addQualifiedClassNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomClass_qualifiedClassName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomClass_qualifiedClassName_feature", "_UI_CustomClass_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomClass_QualifiedClassName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCustomAttributeOwner_Attributes());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CustomBorder.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomBorder"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CustomBorder)object).getQualifiedClassName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CustomBorder_type") :
-			getString("_UI_CustomBorder_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CustomBorder.class)) {
-			case GMFGraphPackage.CUSTOM_BORDER__QUALIFIED_CLASS_NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCustomAttributeOwner_Attributes(),
-				 GMFGraphFactory.eINSTANCE.createCustomAttribute()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomConnectionItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomConnectionItemProvider.java
deleted file mode 100644
index d7998cb7b3b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomConnectionItemProvider.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomConnection} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomConnectionItemProvider
-	extends CustomFigureItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomConnectionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns CustomConnection.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomConnection"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CustomConnection)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CustomConnection_type") :
-			getString("_UI_CustomConnection_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomDecorationItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomDecorationItemProvider.java
deleted file mode 100644
index 4e59658e4d0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomDecorationItemProvider.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomDecorationItemProvider
-	extends CustomFigureItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomDecorationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns CustomDecoration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomDecoration"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CustomDecoration)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CustomDecoration_type") :
-			getString("_UI_CustomDecoration_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomFigureItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomFigureItemProvider.java
deleted file mode 100644
index 5a96fad8bdb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomFigureItemProvider.java
+++ /dev/null
@@ -1,227 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomFigure} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomFigureItemProvider
-	extends RealFigureItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomFigureItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addQualifiedClassNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Qualified Class Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addQualifiedClassNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomClass_qualifiedClassName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomClass_qualifiedClassName_feature", "_UI_CustomClass_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomClass_QualifiedClassName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCustomFigure_CustomChildren());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CustomFigure.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomFigure"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CustomFigure)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CustomFigure_type") :
-			getString("_UI_CustomFigure_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CustomFigure.class)) {
-			case GMFGraphPackage.CUSTOM_FIGURE__QUALIFIED_CLASS_NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.CUSTOM_FIGURE__CUSTOM_CHILDREN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCustomFigure_CustomChildren(),
-				 GMFGraphFactory.eINSTANCE.createFigureAccessor()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomLayoutDataItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomLayoutDataItemProvider.java
deleted file mode 100644
index aa5c0de87ba..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomLayoutDataItemProvider.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomLayoutDataItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomLayoutDataItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addQualifiedClassNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Qualified Class Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addQualifiedClassNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomClass_qualifiedClassName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomClass_qualifiedClassName_feature", "_UI_CustomClass_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomClass_QualifiedClassName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCustomAttributeOwner_Attributes());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CustomLayoutData.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomLayoutData"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CustomLayoutData)object).getQualifiedClassName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CustomLayoutData_type") :
-			getString("_UI_CustomLayoutData_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CustomLayoutData.class)) {
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCustomAttributeOwner_Attributes(),
-				 GMFGraphFactory.eINSTANCE.createCustomAttribute()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomLayoutItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomLayoutItemProvider.java
deleted file mode 100644
index 97538d44dea..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomLayoutItemProvider.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayout} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomLayoutItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomLayoutItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addQualifiedClassNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Qualified Class Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addQualifiedClassNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomClass_qualifiedClassName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomClass_qualifiedClassName_feature", "_UI_CustomClass_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomClass_QualifiedClassName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCustomAttributeOwner_Attributes());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns CustomLayout.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomLayout"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CustomLayout)object).getQualifiedClassName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CustomLayout_type") :
-			getString("_UI_CustomLayout_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CustomLayout.class)) {
-			case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCustomAttributeOwner_Attributes(),
-				 GMFGraphFactory.eINSTANCE.createCustomAttribute()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomPinItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomPinItemProvider.java
deleted file mode 100644
index d5e00f99fa6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/CustomPinItemProvider.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomPin;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CustomPinItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomPinItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addCustomOperationNamePropertyDescriptor(object);
-			addCustomOperationTypePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identity_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identity_name_feature", "_UI_Identity_type"),
-				 GMFGraphPackage.eINSTANCE.getIdentity_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Custom Operation Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCustomOperationNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomPin_customOperationName_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomPin_customOperationName_feature", "_UI_CustomPin_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomPin_CustomOperationName(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Custom Operation Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCustomOperationTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CustomPin_customOperationType_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CustomPin_customOperationType_feature", "_UI_CustomPin_type"),
-				 GMFGraphPackage.eINSTANCE.getCustomPin_CustomOperationType(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns CustomPin.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CustomPin"));
-	}
-
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CustomPin)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_CustomPin_type") :
-			getString("_UI_CustomPin_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(CustomPin.class)) {
-			case GMFGraphPackage.CUSTOM_PIN__NAME:
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_NAME:
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_TYPE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DefaultSizeFacetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DefaultSizeFacetItemProvider.java
deleted file mode 100644
index 463a04df215..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DefaultSizeFacetItemProvider.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DefaultSizeFacetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DefaultSizeFacetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getDefaultSizeFacet_DefaultSize());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns DefaultSizeFacet.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DefaultSizeFacet"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_DefaultSizeFacet_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DefaultSizeFacet.class)) {
-			case GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getDefaultSizeFacet_DefaultSize(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DiagramElementItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DiagramElementItemProvider.java
deleted file mode 100644
index c01f140c0ab..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DiagramElementItemProvider.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.DiagramElement} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DiagramElementItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramElementItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addFigurePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identity_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identity_name_feature", "_UI_Identity_type"),
-				 GMFGraphPackage.eINSTANCE.getIdentity_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Figure feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFigurePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramElement_figure_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElement_figure_feature", "_UI_DiagramElement_type"),
-				 GMFGraphPackage.eINSTANCE.getDiagramElement_Figure(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getDiagramElement_Facets());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((DiagramElement)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DiagramElement_type") :
-			getString("_UI_DiagramElement_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DiagramElement.class)) {
-			case GMFGraphPackage.DIAGRAM_ELEMENT__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FACETS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getDiagramElement_Facets(),
-				 GMFGraphFactory.eINSTANCE.createGeneralFacet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getDiagramElement_Facets(),
-				 GMFGraphFactory.eINSTANCE.createAlignmentFacet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getDiagramElement_Facets(),
-				 GMFGraphFactory.eINSTANCE.createGradientFacet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getDiagramElement_Facets(),
-				 GMFGraphFactory.eINSTANCE.createLabelOffsetFacet()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getDiagramElement_Facets(),
-				 GMFGraphFactory.eINSTANCE.createDefaultSizeFacet()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DiagramLabelItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DiagramLabelItemProvider.java
deleted file mode 100644
index a8306320989..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DiagramLabelItemProvider.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DiagramLabelItemProvider
-	extends NodeItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramLabelItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addElementIconPropertyDescriptor(object);
-			addAccessorPropertyDescriptor(object);
-			addContainerPropertyDescriptor(object);
-			addExternalPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Element Icon feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addElementIconPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramLabel_elementIcon_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramLabel_elementIcon_feature", "_UI_DiagramLabel_type"),
-				 GMFGraphPackage.eINSTANCE.getDiagramLabel_ElementIcon(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Accessor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAccessorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramLabel_accessor_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramLabel_accessor_feature", "_UI_DiagramLabel_type"),
-				 GMFGraphPackage.eINSTANCE.getDiagramLabel_Accessor(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Container feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addContainerPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramLabel_container_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramLabel_container_feature", "_UI_DiagramLabel_type"),
-				 GMFGraphPackage.eINSTANCE.getDiagramLabel_Container(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the External feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addExternalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramLabel_external_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramLabel_external_feature", "_UI_DiagramLabel_type"),
-				 GMFGraphPackage.eINSTANCE.getDiagramLabel_External(),
-				 false,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns DiagramLabel.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramLabel"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((DiagramLabel)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_DiagramLabel_type") :
-			getString("_UI_DiagramLabel_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DiagramLabel.class)) {
-			case GMFGraphPackage.DIAGRAM_LABEL__ELEMENT_ICON:
-			case GMFGraphPackage.DIAGRAM_LABEL__EXTERNAL:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DimensionItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DimensionItemProvider.java
deleted file mode 100644
index cbae1fcc5ab..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/DimensionItemProvider.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Dimension} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DimensionItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DimensionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDxPropertyDescriptor(object);
-			addDyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Dx feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDxPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Dimension_dx_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Dimension_dx_feature", "_UI_Dimension_type"),
-				 GMFGraphPackage.eINSTANCE.getDimension_Dx(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Dy feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Dimension_dy_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Dimension_dy_feature", "_UI_Dimension_type"),
-				 GMFGraphPackage.eINSTANCE.getDimension_Dy(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Dimension.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Dimension"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		Dimension dimension = (Dimension)object;
-		String prefix = "";
-		if (dimension.eContainer() instanceof Figure) {
-			Figure f = (Figure) dimension.eContainer();
-			if (f.getMaximumSize() == dimension) {
-				prefix = "Maximum Size: ";
-			} else if (f.getMinimumSize() == dimension) {
-				prefix = "Minimum Size: ";
-			} else if (f.getPreferredSize() == dimension) {
-				prefix = "Preferred Size: ";
-			}
-		}
-		return prefix + '[' + dimension.getDx() + ',' + dimension.getDy() + ']';
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Dimension.class)) {
-			case GMFGraphPackage.DIMENSION__DX:
-			case GMFGraphPackage.DIMENSION__DY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/EllipseItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/EllipseItemProvider.java
deleted file mode 100644
index 60dc4266fcf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/EllipseItemProvider.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.Ellipse;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Ellipse} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class EllipseItemProvider
-	extends ShapeItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EllipseItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Ellipse.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Ellipse"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Ellipse)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Ellipse_type") :
-			getString("_UI_Ellipse_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureAccessorItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureAccessorItemProvider.java
deleted file mode 100644
index 55ba52dc964..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureAccessorItemProvider.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FigureAccessorItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureAccessorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAccessorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Accessor feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAccessorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FigureAccessor_accessor_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FigureAccessor_accessor_feature", "_UI_FigureAccessor_type"),
-				 GMFGraphPackage.eINSTANCE.getFigureAccessor_Accessor(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns FigureAccessor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FigureAccessor"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((FigureAccessor)object).getAccessor();
-		return label == null || label.length() == 0 ?
-			getString("_UI_FigureAccessor_type") :
-			getString("_UI_FigureAccessor_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FigureAccessor.class)) {
-			case GMFGraphPackage.FIGURE_ACCESSOR__ACCESSOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createLabeledContainer()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createVerticalLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createInvisibleRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createRoundedRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createScalablePolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolylineConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolylineDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolygonDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createCustomFigure()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createCustomDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createCustomConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureAccessor_TypedFigure(),
-				 GMFGraphFactory.eINSTANCE.createSVGFigure()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureDescriptorItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureDescriptorItemProvider.java
deleted file mode 100644
index 9b47410774e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureDescriptorItemProvider.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FigureDescriptorItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureDescriptorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identity_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identity_name_feature", "_UI_Identity_type"),
-				 GMFGraphPackage.eINSTANCE.getIdentity_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigureDescriptor_Accessors());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns FigureDescriptor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FigureDescriptor"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((FigureDescriptor)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_FigureDescriptor_type") :
-			getString("_UI_FigureDescriptor_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FigureDescriptor.class)) {
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE:
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createFigureRef()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createLabeledContainer()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createVerticalLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createInvisibleRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createRoundedRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createScalablePolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolylineConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolylineDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createPolygonDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createCustomFigure()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createCustomDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createCustomConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_ActualFigure(),
-				 GMFGraphFactory.eINSTANCE.createSVGFigure()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureDescriptor_Accessors(),
-				 GMFGraphFactory.eINSTANCE.createChildAccess()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureGalleryItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureGalleryItemProvider.java
deleted file mode 100644
index 0f070cd8d3c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureGalleryItemProvider.java
+++ /dev/null
@@ -1,393 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FigureGalleryItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureGalleryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addImplementationBundlePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identity_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identity_name_feature", "_UI_Identity_type"),
-				 GMFGraphPackage.eINSTANCE.getIdentity_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Implementation Bundle feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addImplementationBundlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FigureGallery_implementationBundle_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FigureGallery_implementationBundle_feature", "_UI_FigureGallery_type"),
-				 GMFGraphPackage.eINSTANCE.getFigureGallery_ImplementationBundle(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigureGallery_Descriptors());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigureGallery_Borders());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns FigureGallery.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FigureGallery"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((FigureGallery)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_FigureGallery_type") :
-			getString("_UI_FigureGallery_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FigureGallery.class)) {
-			case GMFGraphPackage.FIGURE_GALLERY__NAME:
-			case GMFGraphPackage.FIGURE_GALLERY__IMPLEMENTATION_BUNDLE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__FIGURES:
-			case GMFGraphPackage.FIGURE_GALLERY__DESCRIPTORS:
-			case GMFGraphPackage.FIGURE_GALLERY__BORDERS:
-			case GMFGraphPackage.FIGURE_GALLERY__LAYOUTS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createLabeledContainer()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createVerticalLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createInvisibleRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createRoundedRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createScalablePolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createPolylineConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createPolylineDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createPolygonDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createCustomFigure()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createCustomDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createCustomConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Figures(),
-				 GMFGraphFactory.eINSTANCE.createSVGFigure()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Descriptors(),
-				 GMFGraphFactory.eINSTANCE.createFigureDescriptor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Borders(),
-				 GMFGraphFactory.eINSTANCE.createBorderRef()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Borders(),
-				 GMFGraphFactory.eINSTANCE.createLineBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Borders(),
-				 GMFGraphFactory.eINSTANCE.createMarginBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Borders(),
-				 GMFGraphFactory.eINSTANCE.createCompoundBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Borders(),
-				 GMFGraphFactory.eINSTANCE.createCustomBorder()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts(),
-				 GMFGraphFactory.eINSTANCE.createLayoutRef()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts(),
-				 GMFGraphFactory.eINSTANCE.createCustomLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts(),
-				 GMFGraphFactory.eINSTANCE.createGridLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts(),
-				 GMFGraphFactory.eINSTANCE.createBorderLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts(),
-				 GMFGraphFactory.eINSTANCE.createFlowLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts(),
-				 GMFGraphFactory.eINSTANCE.createXYLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts(),
-				 GMFGraphFactory.eINSTANCE.createStackLayout()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getFigureGallery_Layouts(),
-				 GMFGraphFactory.eINSTANCE.createCenterLayout()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureRefItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureRefItemProvider.java
deleted file mode 100644
index 82218dd0643..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FigureRefItemProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FigureRef} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FigureRefItemProvider
-	extends AbstractFigureItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFigurePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Figure feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFigurePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FigureRef_figure_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FigureRef_figure_feature", "_UI_FigureRef_type"),
-				 GMFGraphPackage.eINSTANCE.getFigureRef_Figure(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns FigureRef.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FigureRef"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_FigureRef_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FlowLayoutItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FlowLayoutItemProvider.java
deleted file mode 100644
index cf3a222b4dd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/FlowLayoutItemProvider.java
+++ /dev/null
@@ -1,315 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FlowLayoutItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FlowLayoutItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addVerticalPropertyDescriptor(object);
-			addMatchMinorSizePropertyDescriptor(object);
-			addForceSingleLinePropertyDescriptor(object);
-			addMajorAlignmentPropertyDescriptor(object);
-			addMinorAlignmentPropertyDescriptor(object);
-			addMajorSpacingPropertyDescriptor(object);
-			addMinorSpacingPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Vertical feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVerticalPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FlowLayout_vertical_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_vertical_feature", "_UI_FlowLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getFlowLayout_Vertical(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Match Minor Size feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMatchMinorSizePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FlowLayout_matchMinorSize_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_matchMinorSize_feature", "_UI_FlowLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getFlowLayout_MatchMinorSize(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Force Single Line feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addForceSingleLinePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FlowLayout_forceSingleLine_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_forceSingleLine_feature", "_UI_FlowLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getFlowLayout_ForceSingleLine(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Major Alignment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMajorAlignmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FlowLayout_majorAlignment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_majorAlignment_feature", "_UI_FlowLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getFlowLayout_MajorAlignment(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Minor Alignment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMinorAlignmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FlowLayout_minorAlignment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_minorAlignment_feature", "_UI_FlowLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getFlowLayout_MinorAlignment(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Major Spacing feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMajorSpacingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FlowLayout_majorSpacing_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_majorSpacing_feature", "_UI_FlowLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getFlowLayout_MajorSpacing(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Minor Spacing feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMinorSpacingPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FlowLayout_minorSpacing_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FlowLayout_minorSpacing_feature", "_UI_FlowLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getFlowLayout_MinorSpacing(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns FlowLayout.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FlowLayout"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		FlowLayout flowLayout = (FlowLayout)object;
-		return getString("_UI_FlowLayout_type") + " " + flowLayout.isVertical();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FlowLayout.class)) {
-			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
-			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
-			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GMFGraphEditPlugin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GMFGraphEditPlugin.java
deleted file mode 100644
index 35abb356566..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GMFGraphEditPlugin.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the GMFGraph editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class GMFGraphEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final GMFGraphEditPlugin INSTANCE = new GMFGraphEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphEditPlugin() {
-		super
-			(new ResourceLocator [] {
-			});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Implementation extends EclipseUIPlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-	
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GMFGraphItemProviderAdapterFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GMFGraphItemProviderAdapterFactory.java
deleted file mode 100644
index c65777b49da..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GMFGraphItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,1696 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ChildCreationExtenderManager;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.util.GMFGraphAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFGraphItemProviderAdapterFactory extends GMFGraphAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable, IChildCreationExtender {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This helps manage the child creation extenders.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChildCreationExtenderManager childCreationExtenderManager = new ChildCreationExtenderManager(GMFGraphEditPlugin.INSTANCE, GMFGraphPackage.eNS_URI);
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Canvas} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CanvasItemProvider canvasItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Canvas}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCanvasAdapter() {
-		if (canvasItemProvider == null) {
-			canvasItemProvider = new CanvasItemProvider(this);
-		}
-
-		return canvasItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FigureGalleryItemProvider figureGalleryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFigureGalleryAdapter() {
-		if (figureGalleryItemProvider == null) {
-			figureGalleryItemProvider = new FigureGalleryItemProvider(this);
-		}
-
-		return figureGalleryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Node} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NodeItemProvider nodeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Node}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createNodeAdapter() {
-		if (nodeItemProvider == null) {
-			nodeItemProvider = new NodeItemProvider(this);
-		}
-
-		return nodeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChildAccessItemProvider childAccessItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createChildAccessAdapter() {
-		if (childAccessItemProvider == null) {
-			childAccessItemProvider = new ChildAccessItemProvider(this);
-		}
-
-		return childAccessItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Connection} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConnectionItemProvider connectionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Connection}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createConnectionAdapter() {
-		if (connectionItemProvider == null) {
-			connectionItemProvider = new ConnectionItemProvider(this);
-		}
-
-		return connectionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Compartment} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompartmentItemProvider compartmentItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Compartment}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompartmentAdapter() {
-		if (compartmentItemProvider == null) {
-			compartmentItemProvider = new CompartmentItemProvider(this);
-		}
-
-		return compartmentItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramLabelItemProvider diagramLabelItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDiagramLabelAdapter() {
-		if (diagramLabelItemProvider == null) {
-			diagramLabelItemProvider = new DiagramLabelItemProvider(this);
-		}
-
-		return diagramLabelItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GeneralFacetItemProvider generalFacetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createGeneralFacetAdapter() {
-		if (generalFacetItemProvider == null) {
-			generalFacetItemProvider = new GeneralFacetItemProvider(this);
-		}
-
-		return generalFacetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AlignmentFacetItemProvider alignmentFacetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAlignmentFacetAdapter() {
-		if (alignmentFacetItemProvider == null) {
-			alignmentFacetItemProvider = new AlignmentFacetItemProvider(this);
-		}
-
-		return alignmentFacetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.GradientFacet} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GradientFacetItemProvider gradientFacetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.GradientFacet}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createGradientFacetAdapter() {
-		if (gradientFacetItemProvider == null) {
-			gradientFacetItemProvider = new GradientFacetItemProvider(this);
-		}
-
-		return gradientFacetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabelOffsetFacetItemProvider labelOffsetFacetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLabelOffsetFacetAdapter() {
-		if (labelOffsetFacetItemProvider == null) {
-			labelOffsetFacetItemProvider = new LabelOffsetFacetItemProvider(this);
-		}
-
-		return labelOffsetFacetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefaultSizeFacetItemProvider defaultSizeFacetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDefaultSizeFacetAdapter() {
-		if (defaultSizeFacetItemProvider == null) {
-			defaultSizeFacetItemProvider = new DefaultSizeFacetItemProvider(this);
-		}
-
-		return defaultSizeFacetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FigureDescriptorItemProvider figureDescriptorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFigureDescriptorAdapter() {
-		if (figureDescriptorItemProvider == null) {
-			figureDescriptorItemProvider = new FigureDescriptorItemProvider(this);
-		}
-
-		return figureDescriptorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.FigureRef} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FigureRefItemProvider figureRefItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FigureRef}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFigureRefAdapter() {
-		if (figureRefItemProvider == null) {
-			figureRefItemProvider = new FigureRefItemProvider(this);
-		}
-
-		return figureRefItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Label} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabelItemProvider labelItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Label}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLabelAdapter() {
-		if (labelItemProvider == null) {
-			labelItemProvider = new LabelItemProvider(this);
-		}
-
-		return labelItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabeledContainerItemProvider labeledContainerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLabeledContainerAdapter() {
-		if (labeledContainerItemProvider == null) {
-			labeledContainerItemProvider = new LabeledContainerItemProvider(this);
-		}
-
-		return labeledContainerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VerticalLabelItemProvider verticalLabelItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createVerticalLabelAdapter() {
-		if (verticalLabelItemProvider == null) {
-			verticalLabelItemProvider = new VerticalLabelItemProvider(this);
-		}
-
-		return verticalLabelItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RectangleItemProvider rectangleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRectangleAdapter() {
-		if (rectangleItemProvider == null) {
-			rectangleItemProvider = new RectangleItemProvider(this);
-		}
-
-		return rectangleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InvisibleRectangleItemProvider invisibleRectangleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createInvisibleRectangleAdapter() {
-		if (invisibleRectangleItemProvider == null) {
-			invisibleRectangleItemProvider = new InvisibleRectangleItemProvider(this);
-		}
-
-		return invisibleRectangleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoundedRectangleItemProvider roundedRectangleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRoundedRectangleAdapter() {
-		if (roundedRectangleItemProvider == null) {
-			roundedRectangleItemProvider = new RoundedRectangleItemProvider(this);
-		}
-
-		return roundedRectangleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Ellipse} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EllipseItemProvider ellipseItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Ellipse}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createEllipseAdapter() {
-		if (ellipseItemProvider == null) {
-			ellipseItemProvider = new EllipseItemProvider(this);
-		}
-
-		return ellipseItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Polyline} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolylineItemProvider polylineItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Polyline}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPolylineAdapter() {
-		if (polylineItemProvider == null) {
-			polylineItemProvider = new PolylineItemProvider(this);
-		}
-
-		return polylineItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Polygon} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolygonItemProvider polygonItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Polygon}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPolygonAdapter() {
-		if (polygonItemProvider == null) {
-			polygonItemProvider = new PolygonItemProvider(this);
-		}
-
-		return polygonItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ScalablePolygonItemProvider scalablePolygonItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createScalablePolygonAdapter() {
-		if (scalablePolygonItemProvider == null) {
-			scalablePolygonItemProvider = new ScalablePolygonItemProvider(this);
-		}
-
-		return scalablePolygonItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolylineConnectionItemProvider polylineConnectionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPolylineConnectionAdapter() {
-		if (polylineConnectionItemProvider == null) {
-			polylineConnectionItemProvider = new PolylineConnectionItemProvider(this);
-		}
-
-		return polylineConnectionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolylineDecorationItemProvider polylineDecorationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPolylineDecorationAdapter() {
-		if (polylineDecorationItemProvider == null) {
-			polylineDecorationItemProvider = new PolylineDecorationItemProvider(this);
-		}
-
-		return polylineDecorationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolygonDecorationItemProvider polygonDecorationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPolygonDecorationAdapter() {
-		if (polygonDecorationItemProvider == null) {
-			polygonDecorationItemProvider = new PolygonDecorationItemProvider(this);
-		}
-
-		return polygonDecorationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CustomFigure} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomFigureItemProvider customFigureItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomFigure}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCustomFigureAdapter() {
-		if (customFigureItemProvider == null) {
-			customFigureItemProvider = new CustomFigureItemProvider(this);
-		}
-
-		return customFigureItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomDecorationItemProvider customDecorationItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCustomDecorationAdapter() {
-		if (customDecorationItemProvider == null) {
-			customDecorationItemProvider = new CustomDecorationItemProvider(this);
-		}
-
-		return customDecorationItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CustomConnection} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomConnectionItemProvider customConnectionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomConnection}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCustomConnectionAdapter() {
-		if (customConnectionItemProvider == null) {
-			customConnectionItemProvider = new CustomConnectionItemProvider(this);
-		}
-
-		return customConnectionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RGBColorItemProvider rgbColorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRGBColorAdapter() {
-		if (rgbColorItemProvider == null) {
-			rgbColorItemProvider = new RGBColorItemProvider(this);
-		}
-
-		return rgbColorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.ConstantColor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConstantColorItemProvider constantColorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.ConstantColor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createConstantColorAdapter() {
-		if (constantColorItemProvider == null) {
-			constantColorItemProvider = new ConstantColorItemProvider(this);
-		}
-
-		return constantColorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BasicFontItemProvider basicFontItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBasicFontAdapter() {
-		if (basicFontItemProvider == null) {
-			basicFontItemProvider = new BasicFontItemProvider(this);
-		}
-
-		return basicFontItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Point} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PointItemProvider pointItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Point}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPointAdapter() {
-		if (pointItemProvider == null) {
-			pointItemProvider = new PointItemProvider(this);
-		}
-
-		return pointItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Dimension} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DimensionItemProvider dimensionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Dimension}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDimensionAdapter() {
-		if (dimensionItemProvider == null) {
-			dimensionItemProvider = new DimensionItemProvider(this);
-		}
-
-		return dimensionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Insets} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InsetsItemProvider insetsItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Insets}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createInsetsAdapter() {
-		if (insetsItemProvider == null) {
-			insetsItemProvider = new InsetsItemProvider(this);
-		}
-
-		return insetsItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.BorderRef} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BorderRefItemProvider borderRefItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.BorderRef}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBorderRefAdapter() {
-		if (borderRefItemProvider == null) {
-			borderRefItemProvider = new BorderRefItemProvider(this);
-		}
-
-		return borderRefItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LineBorderItemProvider lineBorderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLineBorderAdapter() {
-		if (lineBorderItemProvider == null) {
-			lineBorderItemProvider = new LineBorderItemProvider(this);
-		}
-
-		return lineBorderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.MarginBorder} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MarginBorderItemProvider marginBorderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.MarginBorder}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createMarginBorderAdapter() {
-		if (marginBorderItemProvider == null) {
-			marginBorderItemProvider = new MarginBorderItemProvider(this);
-		}
-
-		return marginBorderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompoundBorderItemProvider compoundBorderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompoundBorderAdapter() {
-		if (compoundBorderItemProvider == null) {
-			compoundBorderItemProvider = new CompoundBorderItemProvider(this);
-		}
-
-		return compoundBorderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CustomBorder} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomBorderItemProvider customBorderItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomBorder}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCustomBorderAdapter() {
-		if (customBorderItemProvider == null) {
-			customBorderItemProvider = new CustomBorderItemProvider(this);
-		}
-
-		return customBorderItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomLayoutDataItemProvider customLayoutDataItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCustomLayoutDataAdapter() {
-		if (customLayoutDataItemProvider == null) {
-			customLayoutDataItemProvider = new CustomLayoutDataItemProvider(this);
-		}
-
-		return customLayoutDataItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GridLayoutDataItemProvider gridLayoutDataItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createGridLayoutDataAdapter() {
-		if (gridLayoutDataItemProvider == null) {
-			gridLayoutDataItemProvider = new GridLayoutDataItemProvider(this);
-		}
-
-		return gridLayoutDataItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BorderLayoutDataItemProvider borderLayoutDataItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBorderLayoutDataAdapter() {
-		if (borderLayoutDataItemProvider == null) {
-			borderLayoutDataItemProvider = new BorderLayoutDataItemProvider(this);
-		}
-
-		return borderLayoutDataItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.LayoutRef} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LayoutRefItemProvider layoutRefItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.LayoutRef}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLayoutRefAdapter() {
-		if (layoutRefItemProvider == null) {
-			layoutRefItemProvider = new LayoutRefItemProvider(this);
-		}
-
-		return layoutRefItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayout} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomLayoutItemProvider customLayoutItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayout}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCustomLayoutAdapter() {
-		if (customLayoutItemProvider == null) {
-			customLayoutItemProvider = new CustomLayoutItemProvider(this);
-		}
-
-		return customLayoutItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GridLayoutItemProvider gridLayoutItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createGridLayoutAdapter() {
-		if (gridLayoutItemProvider == null) {
-			gridLayoutItemProvider = new GridLayoutItemProvider(this);
-		}
-
-		return gridLayoutItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayout} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BorderLayoutItemProvider borderLayoutItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayout}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBorderLayoutAdapter() {
-		if (borderLayoutItemProvider == null) {
-			borderLayoutItemProvider = new BorderLayoutItemProvider(this);
-		}
-
-		return borderLayoutItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomAttributeItemProvider customAttributeItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCustomAttributeAdapter() {
-		if (customAttributeItemProvider == null) {
-			customAttributeItemProvider = new CustomAttributeItemProvider(this);
-		}
-
-		return customAttributeItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FigureAccessorItemProvider figureAccessorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFigureAccessorAdapter() {
-		if (figureAccessorItemProvider == null) {
-			figureAccessorItemProvider = new FigureAccessorItemProvider(this);
-		}
-
-		return figureAccessorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FlowLayoutItemProvider flowLayoutItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFlowLayoutAdapter() {
-		if (flowLayoutItemProvider == null) {
-			flowLayoutItemProvider = new FlowLayoutItemProvider(this);
-		}
-
-		return flowLayoutItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.XYLayout} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XYLayoutItemProvider xyLayoutItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.XYLayout}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createXYLayoutAdapter() {
-		if (xyLayoutItemProvider == null) {
-			xyLayoutItemProvider = new XYLayoutItemProvider(this);
-		}
-
-		return xyLayoutItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XYLayoutDataItemProvider xyLayoutDataItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createXYLayoutDataAdapter() {
-		if (xyLayoutDataItemProvider == null) {
-			xyLayoutDataItemProvider = new XYLayoutDataItemProvider(this);
-		}
-
-		return xyLayoutDataItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.StackLayout} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StackLayoutItemProvider stackLayoutItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.StackLayout}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createStackLayoutAdapter() {
-		if (stackLayoutItemProvider == null) {
-			stackLayoutItemProvider = new StackLayoutItemProvider(this);
-		}
-
-		return stackLayoutItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CenterLayout} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CenterLayoutItemProvider centerLayoutItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CenterLayout}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCenterLayoutAdapter() {
-		if (centerLayoutItemProvider == null) {
-			centerLayoutItemProvider = new CenterLayoutItemProvider(this);
-		}
-
-		return centerLayoutItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SVGFigureItemProvider svgFigureItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createSVGFigureAdapter() {
-		if (svgFigureItemProvider == null) {
-			svgFigureItemProvider = new SVGFigureItemProvider(this);
-		}
-
-		return svgFigureItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SVGPropertyItemProvider svgPropertyItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createSVGPropertyAdapter() {
-		if (svgPropertyItemProvider == null) {
-			svgPropertyItemProvider = new SVGPropertyItemProvider(this);
-		}
-
-		return svgPropertyItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Rectangle2DItemProvider rectangle2DItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createRectangle2DAdapter() {
-		if (rectangle2DItemProvider == null) {
-			rectangle2DItemProvider = new Rectangle2DItemProvider(this);
-		}
-
-		return rectangle2DItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomPinItemProvider customPinItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCustomPinAdapter() {
-		if (customPinItemProvider == null) {
-			customPinItemProvider = new CustomPinItemProvider(this);
-		}
-
-		return customPinItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.ColorPin} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ColorPinItemProvider colorPinItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.ColorPin}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createColorPinAdapter() {
-		if (colorPinItemProvider == null) {
-			colorPinItemProvider = new ColorPinItemProvider(this);
-		}
-
-		return colorPinItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.gmfgraph.VisiblePin} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VisiblePinItemProvider visiblePinItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.VisiblePin}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createVisiblePinAdapter() {
-		if (visiblePinItemProvider == null) {
-			visiblePinItemProvider = new VisiblePinItemProvider(this);
-		}
-
-		return visiblePinItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public List<IChildCreationExtender> getChildCreationExtenders() {
-		return childCreationExtenderManager.getChildCreationExtenders();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Collection<?> getNewChildDescriptors(Object object, EditingDomain editingDomain) {
-		return childCreationExtenderManager.getNewChildDescriptors(object, editingDomain);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ResourceLocator getResourceLocator() {
-		return childCreationExtenderManager;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (canvasItemProvider != null) canvasItemProvider.dispose();
-		if (figureGalleryItemProvider != null) figureGalleryItemProvider.dispose();
-		if (nodeItemProvider != null) nodeItemProvider.dispose();
-		if (connectionItemProvider != null) connectionItemProvider.dispose();
-		if (compartmentItemProvider != null) compartmentItemProvider.dispose();
-		if (diagramLabelItemProvider != null) diagramLabelItemProvider.dispose();
-		if (generalFacetItemProvider != null) generalFacetItemProvider.dispose();
-		if (alignmentFacetItemProvider != null) alignmentFacetItemProvider.dispose();
-		if (gradientFacetItemProvider != null) gradientFacetItemProvider.dispose();
-		if (labelOffsetFacetItemProvider != null) labelOffsetFacetItemProvider.dispose();
-		if (defaultSizeFacetItemProvider != null) defaultSizeFacetItemProvider.dispose();
-		if (figureDescriptorItemProvider != null) figureDescriptorItemProvider.dispose();
-		if (childAccessItemProvider != null) childAccessItemProvider.dispose();
-		if (figureRefItemProvider != null) figureRefItemProvider.dispose();
-		if (labelItemProvider != null) labelItemProvider.dispose();
-		if (labeledContainerItemProvider != null) labeledContainerItemProvider.dispose();
-		if (verticalLabelItemProvider != null) verticalLabelItemProvider.dispose();
-		if (rectangleItemProvider != null) rectangleItemProvider.dispose();
-		if (invisibleRectangleItemProvider != null) invisibleRectangleItemProvider.dispose();
-		if (roundedRectangleItemProvider != null) roundedRectangleItemProvider.dispose();
-		if (ellipseItemProvider != null) ellipseItemProvider.dispose();
-		if (polylineItemProvider != null) polylineItemProvider.dispose();
-		if (polygonItemProvider != null) polygonItemProvider.dispose();
-		if (scalablePolygonItemProvider != null) scalablePolygonItemProvider.dispose();
-		if (polylineConnectionItemProvider != null) polylineConnectionItemProvider.dispose();
-		if (polylineDecorationItemProvider != null) polylineDecorationItemProvider.dispose();
-		if (polygonDecorationItemProvider != null) polygonDecorationItemProvider.dispose();
-		if (customAttributeItemProvider != null) customAttributeItemProvider.dispose();
-		if (figureAccessorItemProvider != null) figureAccessorItemProvider.dispose();
-		if (customFigureItemProvider != null) customFigureItemProvider.dispose();
-		if (customDecorationItemProvider != null) customDecorationItemProvider.dispose();
-		if (customConnectionItemProvider != null) customConnectionItemProvider.dispose();
-		if (rgbColorItemProvider != null) rgbColorItemProvider.dispose();
-		if (constantColorItemProvider != null) constantColorItemProvider.dispose();
-		if (basicFontItemProvider != null) basicFontItemProvider.dispose();
-		if (pointItemProvider != null) pointItemProvider.dispose();
-		if (dimensionItemProvider != null) dimensionItemProvider.dispose();
-		if (insetsItemProvider != null) insetsItemProvider.dispose();
-		if (borderRefItemProvider != null) borderRefItemProvider.dispose();
-		if (lineBorderItemProvider != null) lineBorderItemProvider.dispose();
-		if (marginBorderItemProvider != null) marginBorderItemProvider.dispose();
-		if (compoundBorderItemProvider != null) compoundBorderItemProvider.dispose();
-		if (customBorderItemProvider != null) customBorderItemProvider.dispose();
-		if (customLayoutDataItemProvider != null) customLayoutDataItemProvider.dispose();
-		if (gridLayoutDataItemProvider != null) gridLayoutDataItemProvider.dispose();
-		if (borderLayoutDataItemProvider != null) borderLayoutDataItemProvider.dispose();
-		if (layoutRefItemProvider != null) layoutRefItemProvider.dispose();
-		if (customLayoutItemProvider != null) customLayoutItemProvider.dispose();
-		if (gridLayoutItemProvider != null) gridLayoutItemProvider.dispose();
-		if (borderLayoutItemProvider != null) borderLayoutItemProvider.dispose();
-		if (flowLayoutItemProvider != null) flowLayoutItemProvider.dispose();
-		if (xyLayoutItemProvider != null) xyLayoutItemProvider.dispose();
-		if (xyLayoutDataItemProvider != null) xyLayoutDataItemProvider.dispose();
-		if (stackLayoutItemProvider != null) stackLayoutItemProvider.dispose();
-		if (centerLayoutItemProvider != null) centerLayoutItemProvider.dispose();
-		if (svgFigureItemProvider != null) svgFigureItemProvider.dispose();
-		if (svgPropertyItemProvider != null) svgPropertyItemProvider.dispose();
-		if (rectangle2DItemProvider != null) rectangle2DItemProvider.dispose();
-		if (customPinItemProvider != null) customPinItemProvider.dispose();
-		if (colorPinItemProvider != null) colorPinItemProvider.dispose();
-		if (visiblePinItemProvider != null) visiblePinItemProvider.dispose();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GeneralFacetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GeneralFacetItemProvider.java
deleted file mode 100644
index 8d669423264..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GeneralFacetItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GeneralFacetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GeneralFacetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdentifierPropertyDescriptor(object);
-			addDataPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Identifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GeneralFacet_identifier_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GeneralFacet_identifier_feature", "_UI_GeneralFacet_type"),
-				 GMFGraphPackage.eINSTANCE.getGeneralFacet_Identifier(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Data feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDataPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GeneralFacet_data_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GeneralFacet_data_feature", "_UI_GeneralFacet_type"),
-				 GMFGraphPackage.eINSTANCE.getGeneralFacet_Data(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns GeneralFacet.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/GeneralFacet"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((GeneralFacet)object).getIdentifier();
-		return label == null || label.length() == 0 ?
-			getString("_UI_GeneralFacet_type") :
-			getString("_UI_GeneralFacet_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GeneralFacet.class)) {
-			case GMFGraphPackage.GENERAL_FACET__IDENTIFIER:
-			case GMFGraphPackage.GENERAL_FACET__DATA:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GradientFacetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GradientFacetItemProvider.java
deleted file mode 100644
index cf2227b8f2f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GradientFacetItemProvider.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.Direction;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GradientFacet;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.GradientFacet} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GradientFacetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GradientFacetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDirectionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Direction feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDirectionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GradientFacet_direction_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GradientFacet_direction_feature", "_UI_GradientFacet_type"),
-				 GMFGraphPackage.eINSTANCE.getGradientFacet_Direction(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns GradientFacet.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/GradientFacet"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Direction labelValue = ((GradientFacet)object).getDirection();
-		String label = labelValue == null ? null : labelValue.toString();
-		return label == null || label.length() == 0 ?
-			getString("_UI_GradientFacet_type") :
-			getString("_UI_GradientFacet_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GradientFacet.class)) {
-			case GMFGraphPackage.GRADIENT_FACET__DIRECTION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GridLayoutDataItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GridLayoutDataItemProvider.java
deleted file mode 100644
index dc0cf308f61..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GridLayoutDataItemProvider.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GridLayoutDataItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GridLayoutDataItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addGrabExcessHorizontalSpacePropertyDescriptor(object);
-			addGrabExcessVerticalSpacePropertyDescriptor(object);
-			addVerticalAlignmentPropertyDescriptor(object);
-			addHorizontalAlignmentPropertyDescriptor(object);
-			addVerticalSpanPropertyDescriptor(object);
-			addHorizontalSpanPropertyDescriptor(object);
-			addHorizontalIndentPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Grab Excess Horizontal Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGrabExcessHorizontalSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayoutData_grabExcessHorizontalSpace_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayoutData_grabExcessHorizontalSpace_feature", "_UI_GridLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayoutData_GrabExcessHorizontalSpace(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Grab Excess Vertical Space feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGrabExcessVerticalSpacePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayoutData_grabExcessVerticalSpace_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayoutData_grabExcessVerticalSpace_feature", "_UI_GridLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayoutData_GrabExcessVerticalSpace(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Vertical Alignment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVerticalAlignmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayoutData_verticalAlignment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayoutData_verticalAlignment_feature", "_UI_GridLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayoutData_VerticalAlignment(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Horizontal Alignment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHorizontalAlignmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayoutData_horizontalAlignment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayoutData_horizontalAlignment_feature", "_UI_GridLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayoutData_HorizontalAlignment(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Vertical Span feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addVerticalSpanPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayoutData_verticalSpan_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayoutData_verticalSpan_feature", "_UI_GridLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayoutData_VerticalSpan(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Horizontal Span feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHorizontalSpanPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayoutData_horizontalSpan_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayoutData_horizontalSpan_feature", "_UI_GridLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayoutData_HorizontalSpan(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Horizontal Indent feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHorizontalIndentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayoutData_horizontalIndent_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayoutData_horizontalIndent_feature", "_UI_GridLayoutData_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayoutData_HorizontalIndent(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getGridLayoutData_SizeHint());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns GridLayoutData.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/GridLayoutData"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		GridLayoutData gridLayoutData = (GridLayoutData)object;
-		return getString("_UI_GridLayoutData_type") + " " + gridLayoutData.isGrabExcessHorizontalSpace();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GridLayoutData.class)) {
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getGridLayoutData_SizeHint(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GridLayoutItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GridLayoutItemProvider.java
deleted file mode 100644
index 280def98c0a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/GridLayoutItemProvider.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayout;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GridLayoutItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GridLayoutItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNumColumnsPropertyDescriptor(object);
-			addEqualWidthPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Num Columns feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNumColumnsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayout_numColumns_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayout_numColumns_feature", "_UI_GridLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayout_NumColumns(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Equal Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEqualWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_GridLayout_equalWidth_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_GridLayout_equalWidth_feature", "_UI_GridLayout_type"),
-				 GMFGraphPackage.eINSTANCE.getGridLayout_EqualWidth(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getGridLayout_Margins());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getGridLayout_Spacing());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns GridLayout.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/GridLayout"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		GridLayout gridLayout = (GridLayout)object;
-		return getString("_UI_GridLayout_type") + " " + gridLayout.getNumColumns();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GridLayout.class)) {
-			case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
-			case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.GRID_LAYOUT__MARGINS:
-			case GMFGraphPackage.GRID_LAYOUT__SPACING:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getGridLayout_Margins(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getGridLayout_Spacing(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getGridLayout_Margins() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getGridLayout_Spacing();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/InsetsItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/InsetsItemProvider.java
deleted file mode 100644
index b7c4ffff35f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/InsetsItemProvider.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Insets;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Insets} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InsetsItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InsetsItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTopPropertyDescriptor(object);
-			addLeftPropertyDescriptor(object);
-			addBottomPropertyDescriptor(object);
-			addRightPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Top feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTopPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Insets_top_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Insets_top_feature", "_UI_Insets_type"),
-				 GMFGraphPackage.eINSTANCE.getInsets_Top(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Left feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLeftPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Insets_left_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Insets_left_feature", "_UI_Insets_type"),
-				 GMFGraphPackage.eINSTANCE.getInsets_Left(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Bottom feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBottomPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Insets_bottom_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Insets_bottom_feature", "_UI_Insets_type"),
-				 GMFGraphPackage.eINSTANCE.getInsets_Bottom(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Right feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Insets_right_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Insets_right_feature", "_UI_Insets_type"),
-				 GMFGraphPackage.eINSTANCE.getInsets_Right(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Insets.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Insets"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public String getText(Object object) {
-		Insets insets = (Insets)object;
-		return getString("_UI_Insets_toStringPattern", new Object[] {
-			insets.getTop(), insets.getBottom(), insets.getLeft(), insets.getRight(), //	
-		});
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Insets.class)) {
-			case GMFGraphPackage.INSETS__TOP:
-			case GMFGraphPackage.INSETS__LEFT:
-			case GMFGraphPackage.INSETS__BOTTOM:
-			case GMFGraphPackage.INSETS__RIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/InvisibleRectangleItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/InvisibleRectangleItemProvider.java
deleted file mode 100644
index 8f599bd7620..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/InvisibleRectangleItemProvider.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class InvisibleRectangleItemProvider
-	extends RealFigureItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InvisibleRectangleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns InvisibleRectangle.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/InvisibleRectangle"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((InvisibleRectangle)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_InvisibleRectangle_type") :
-			getString("_UI_InvisibleRectangle_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabelItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabelItemProvider.java
deleted file mode 100644
index f099ff69af0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabelItemProvider.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Label;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Label} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LabelItemProvider
-	extends RealFigureItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTextPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Text feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Label_text_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Label_text_feature", "_UI_Label_type"),
-				 GMFGraphPackage.eINSTANCE.getLabel_Text(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Label.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Label"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Label)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Label_type") :
-			getString("_UI_Label_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Label.class)) {
-			case GMFGraphPackage.LABEL__TEXT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabelOffsetFacetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabelOffsetFacetItemProvider.java
deleted file mode 100644
index 0174fbe87f1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabelOffsetFacetItemProvider.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LabelOffsetFacetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelOffsetFacetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addXPropertyDescriptor(object);
-			addYPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the X feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelOffsetFacet_x_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelOffsetFacet_x_feature", "_UI_LabelOffsetFacet_type"),
-				 GMFGraphPackage.eINSTANCE.getLabelOffsetFacet_X(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Y feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelOffsetFacet_y_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelOffsetFacet_y_feature", "_UI_LabelOffsetFacet_type"),
-				 GMFGraphPackage.eINSTANCE.getLabelOffsetFacet_Y(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns LabelOffsetFacet.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelOffsetFacet"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		LabelOffsetFacet labelOffsetFacet = (LabelOffsetFacet)object;
-		return getString("_UI_LabelOffsetFacet_type") + " " + labelOffsetFacet.getX();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(LabelOffsetFacet.class)) {
-			case GMFGraphPackage.LABEL_OFFSET_FACET__X:
-			case GMFGraphPackage.LABEL_OFFSET_FACET__Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabeledContainerItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabeledContainerItemProvider.java
deleted file mode 100644
index 397f622430f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LabeledContainerItemProvider.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LabeledContainerItemProvider
-	extends RealFigureItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabeledContainerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns LabeledContainer.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LabeledContainer"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((LabeledContainer)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_LabeledContainer_type") :
-			getString("_UI_LabeledContainer_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LayoutRefItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LayoutRefItemProvider.java
deleted file mode 100644
index b9f2acdacf6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LayoutRefItemProvider.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.LayoutRef} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LayoutRefItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LayoutRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addActualPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Actual feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addActualPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LayoutRef_actual_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LayoutRef_actual_feature", "_UI_LayoutRef_type"),
-				 GMFGraphPackage.eINSTANCE.getLayoutRef_Actual(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns LayoutRef.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LayoutRef"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_LayoutRef_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LineBorderItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LineBorderItemProvider.java
deleted file mode 100644
index a369e730a13..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/LineBorderItemProvider.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.LineBorder;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LineBorderItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LineBorderItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addWidthPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LineBorder_width_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LineBorder_width_feature", "_UI_LineBorder_type"),
-				 GMFGraphPackage.eINSTANCE.getLineBorder_Width(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getLineBorder_Color());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns LineBorder.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LineBorder"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		LineBorder lineBorder = (LineBorder)object;
-		return getString("_UI_LineBorder_type") + " " + lineBorder.getWidth();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(LineBorder.class)) {
-			case GMFGraphPackage.LINE_BORDER__WIDTH:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.LINE_BORDER__COLOR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLineBorder_Color(),
-				 GMFGraphFactory.eINSTANCE.createRGBColor()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getLineBorder_Color(),
-				 GMFGraphFactory.eINSTANCE.createConstantColor()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/MarginBorderItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/MarginBorderItemProvider.java
deleted file mode 100644
index e923887032c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/MarginBorderItemProvider.java
+++ /dev/null
@@ -1,182 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.MarginBorder;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.MarginBorder} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MarginBorderItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MarginBorderItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getMarginBorder_Insets());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns MarginBorder.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/MarginBorder"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_MarginBorder_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MarginBorder.class)) {
-			case GMFGraphPackage.MARGIN_BORDER__INSETS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getMarginBorder_Insets(),
-				 GMFGraphFactory.eINSTANCE.createInsets()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/NodeItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/NodeItemProvider.java
deleted file mode 100644
index 12d0a261729..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/NodeItemProvider.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Node} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class NodeItemProvider
-	extends AbstractNodeItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addResizeConstraintPropertyDescriptor(object);
-			addAffixedParentSidePropertyDescriptor(object);
-			addContentPanePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Resize Constraint feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addResizeConstraintPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Node_resizeConstraint_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Node_resizeConstraint_feature", "_UI_Node_type"),
-				 GMFGraphPackage.eINSTANCE.getNode_ResizeConstraint(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Affixed Parent Side feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAffixedParentSidePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Node_affixedParentSide_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Node_affixedParentSide_feature", "_UI_Node_type"),
-				 GMFGraphPackage.eINSTANCE.getNode_AffixedParentSide(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Content Pane feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addContentPanePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Node_contentPane_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Node_contentPane_feature", "_UI_Node_type"),
-				 GMFGraphPackage.eINSTANCE.getNode_ContentPane(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Node.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Node"));
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getTextGen(Object object) {
-		String label = ((Node)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Node_type") :
-			getString("_UI_Node_type") + " " + label;
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public String getText(Object object) {
-		FigureDescriptor fd = ((Node) object).getFigure();
-		if (fd != null && fd.getName() != null) {
-			return getTextGen(object) + ' ' + '(' + fd.getName() + ')';
-		}
-		return getTextGen(object);
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Node.class)) {
-			case GMFGraphPackage.NODE__RESIZE_CONSTRAINT:
-			case GMFGraphPackage.NODE__AFFIXED_PARENT_SIDE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PointItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PointItemProvider.java
deleted file mode 100644
index bdf799244fe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PointItemProvider.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Point} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PointItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PointItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addXPropertyDescriptor(object);
-			addYPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the X feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Point_x_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Point_x_feature", "_UI_Point_type"),
-				 GMFGraphPackage.eINSTANCE.getPoint_X(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Y feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Point_y_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Point_y_feature", "_UI_Point_type"),
-				 GMFGraphPackage.eINSTANCE.getPoint_Y(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Point.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Point"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		Point point = (Point)object;
-		String prefix = "";
-		if (point.eContainer() instanceof Figure) {
-			Figure f = (Figure) point.eContainer();
-			if (f.getSize() == point) {
-				prefix = "Size: ";
-			} else if (f.getLocation() == point) {
-				prefix = "Location: ";
-			}
-		}
-		return prefix + '(' + point.getX() + ',' + point.getY() + ')';
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Point.class)) {
-			case GMFGraphPackage.POINT__X:
-			case GMFGraphPackage.POINT__Y:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolygonDecorationItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolygonDecorationItemProvider.java
deleted file mode 100644
index 5f13c6e2fc0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolygonDecorationItemProvider.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PolygonDecorationItemProvider
-	extends PolygonItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolygonDecorationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns PolygonDecoration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PolygonDecoration"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PolygonDecoration)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_PolygonDecoration_type") :
-			getString("_UI_PolygonDecoration_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getPolyline_Template();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolygonItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolygonItemProvider.java
deleted file mode 100644
index 1661999ed45..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolygonItemProvider.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Polygon;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Polygon} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PolygonItemProvider
-	extends PolylineItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolygonItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Polygon.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Polygon"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Polygon)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Polygon_type") :
-			getString("_UI_Polygon_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getPolyline_Template();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineConnectionItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineConnectionItemProvider.java
deleted file mode 100644
index 3a4f4099d79..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineConnectionItemProvider.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PolylineConnectionItemProvider
-	extends PolylineItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolylineConnectionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addSourceDecorationPropertyDescriptor(object);
-			addTargetDecorationPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Source Decoration feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSourceDecorationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PolylineConnection_sourceDecoration_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PolylineConnection_sourceDecoration_feature", "_UI_PolylineConnection_type"),
-				 GMFGraphPackage.eINSTANCE.getPolylineConnection_SourceDecoration(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Target Decoration feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTargetDecorationPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_PolylineConnection_targetDecoration_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_PolylineConnection_targetDecoration_feature", "_UI_PolylineConnection_type"),
-				 GMFGraphPackage.eINSTANCE.getPolylineConnection_TargetDecoration(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns PolylineConnection.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PolylineConnection"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PolylineConnection)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_PolylineConnection_type") :
-			getString("_UI_PolylineConnection_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getPolyline_Template();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineDecorationItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineDecorationItemProvider.java
deleted file mode 100644
index 781265a0b9c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineDecorationItemProvider.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PolylineDecorationItemProvider
-	extends PolylineItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolylineDecorationItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns PolylineDecoration.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PolylineDecoration"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PolylineDecoration)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_PolylineDecoration_type") :
-			getString("_UI_PolylineDecoration_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getPolyline_Template();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineItemProvider.java
deleted file mode 100644
index 912dda35d5c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/PolylineItemProvider.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Polyline} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PolylineItemProvider
-	extends ShapeItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolylineItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getPolyline_Template());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Polyline.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Polyline"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Polyline)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Polyline_type") :
-			getString("_UI_Polyline_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Polyline.class)) {
-			case GMFGraphPackage.POLYLINE__TEMPLATE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getPolyline_Template(),
-				 GMFGraphFactory.eINSTANCE.createPoint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getPolyline_Template();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RGBColorItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RGBColorItemProvider.java
deleted file mode 100644
index b675e2d1764..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RGBColorItemProvider.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.Color;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RGBColor;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RGBColorItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RGBColorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addRedPropertyDescriptor(object);
-			addGreenPropertyDescriptor(object);
-			addBluePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Red feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRedPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RGBColor_red_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RGBColor_red_feature", "_UI_RGBColor_type"),
-				 GMFGraphPackage.eINSTANCE.getRGBColor_Red(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Green feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGreenPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RGBColor_green_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RGBColor_green_feature", "_UI_RGBColor_type"),
-				 GMFGraphPackage.eINSTANCE.getRGBColor_Green(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Blue feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBluePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RGBColor_blue_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RGBColor_blue_feature", "_UI_RGBColor_type"),
-				 GMFGraphPackage.eINSTANCE.getRGBColor_Blue(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns RGBColor.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RGBColor"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		RGBColor rgbColor = (RGBColor)object;
-		return getColourSemanticPrefix(rgbColor) +
-				'{' + rgbColor.getRed() + ',' + rgbColor.getGreen() + ',' + rgbColor.getBlue() + '}';
-	}
-
-	static String getColourSemanticPrefix(Color c) {
-		String prefix = "Color: ";
-		if (c.eContainer() instanceof Figure) {
-			Figure f = (Figure) c.eContainer();
-			if (f.getForegroundColor() == c) {
-				prefix = "Foreground: ";
-			} else if (f.getBackgroundColor() == c) {
-				prefix = "Background: ";
-			}
-		}
-		return prefix;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(RGBColor.class)) {
-			case GMFGraphPackage.RGB_COLOR__RED:
-			case GMFGraphPackage.RGB_COLOR__GREEN:
-			case GMFGraphPackage.RGB_COLOR__BLUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RealFigureItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RealFigureItemProvider.java
deleted file mode 100644
index 7ab1dda1d58..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RealFigureItemProvider.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RealFigureItemProvider
-	extends AbstractFigureItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RealFigureItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RealFigure_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RealFigure_name_feature", "_UI_RealFigure_type"),
-				 GMFGraphPackage.eINSTANCE.getRealFigure_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getPinOwner_Pins());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getCustomAttributeOwner_Attributes());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getRealFigure_Children());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((RealFigure)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RealFigure_type") :
-			getString("_UI_RealFigure_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(RealFigure.class)) {
-			case GMFGraphPackage.REAL_FIGURE__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.REAL_FIGURE__PINS:
-			case GMFGraphPackage.REAL_FIGURE__ATTRIBUTES:
-			case GMFGraphPackage.REAL_FIGURE__CHILDREN:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getPinOwner_Pins(),
-				 GMFGraphFactory.eINSTANCE.createCustomPin()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getPinOwner_Pins(),
-				 GMFGraphFactory.eINSTANCE.createColorPin()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getPinOwner_Pins(),
-				 GMFGraphFactory.eINSTANCE.createVisiblePin()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getCustomAttributeOwner_Attributes(),
-				 GMFGraphFactory.eINSTANCE.createCustomAttribute()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createFigureRef()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createLabeledContainer()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createVerticalLabel()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createInvisibleRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createRoundedRectangle()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createEllipse()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createPolyline()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createPolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createScalablePolygon()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createPolylineConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createPolylineDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createPolygonDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createCustomFigure()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createCustomDecoration()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createCustomConnection()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getRealFigure_Children(),
-				 GMFGraphFactory.eINSTANCE.createSVGFigure()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/Rectangle2DItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/Rectangle2DItemProvider.java
deleted file mode 100644
index de91cd2f947..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/Rectangle2DItemProvider.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Rectangle2DItemProvider.java,v 1.1 2008/08/05 12:41:53 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class Rectangle2DItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rectangle2DItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addXPropertyDescriptor(object);
-			addYPropertyDescriptor(object);
-			addWidthPropertyDescriptor(object);
-			addHeightPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the X feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addXPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Rectangle2D_x_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Rectangle2D_x_feature", "_UI_Rectangle2D_type"),
-				 GMFGraphPackage.eINSTANCE.getRectangle2D_X(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Y feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addYPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Rectangle2D_y_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Rectangle2D_y_feature", "_UI_Rectangle2D_type"),
-				 GMFGraphPackage.eINSTANCE.getRectangle2D_Y(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Rectangle2D_width_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Rectangle2D_width_feature", "_UI_Rectangle2D_type"),
-				 GMFGraphPackage.eINSTANCE.getRectangle2D_Width(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Height feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Rectangle2D_height_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Rectangle2D_height_feature", "_UI_Rectangle2D_type"),
-				 GMFGraphPackage.eINSTANCE.getRectangle2D_Height(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.REAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns Rectangle2D.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Rectangle2D"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		Rectangle2D rectangle2D = (Rectangle2D)object;
-		return getString("_UI_Rectangle2D_type") + " " + rectangle2D.getX();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Rectangle2D.class)) {
-			case GMFGraphPackage.RECTANGLE2_D__X:
-			case GMFGraphPackage.RECTANGLE2_D__Y:
-			case GMFGraphPackage.RECTANGLE2_D__WIDTH:
-			case GMFGraphPackage.RECTANGLE2_D__HEIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RectangleItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RectangleItemProvider.java
deleted file mode 100644
index 8873d739b23..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RectangleItemProvider.java
+++ /dev/null
@@ -1,155 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RectangleItemProvider
-	extends ShapeItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RectangleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Rectangle.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Rectangle"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Rectangle)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Rectangle_type") :
-			getString("_UI_Rectangle_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RoundedRectangleItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RoundedRectangleItemProvider.java
deleted file mode 100644
index 19c2bffbb51..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/RoundedRectangleItemProvider.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class RoundedRectangleItemProvider
-	extends ShapeItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoundedRectangleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCornerWidthPropertyDescriptor(object);
-			addCornerHeightPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Corner Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCornerWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RoundedRectangle_cornerWidth_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RoundedRectangle_cornerWidth_feature", "_UI_RoundedRectangle_type"),
-				 GMFGraphPackage.eINSTANCE.getRoundedRectangle_CornerWidth(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Corner Height feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCornerHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RoundedRectangle_cornerHeight_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RoundedRectangle_cornerHeight_feature", "_UI_RoundedRectangle_type"),
-				 GMFGraphPackage.eINSTANCE.getRoundedRectangle_CornerHeight(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns RoundedRectangle.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/RoundedRectangle"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((RoundedRectangle)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_RoundedRectangle_type") :
-			getString("_UI_RoundedRectangle_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(RoundedRectangle.class)) {
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_WIDTH:
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_HEIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/SVGFigureItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/SVGFigureItemProvider.java
deleted file mode 100644
index 4020935cf61..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/SVGFigureItemProvider.java
+++ /dev/null
@@ -1,282 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SVGFigureItemProvider.java,v 1.5 2008/08/12 13:56:46 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SVGFigureItemProvider
-	extends RealFigureItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SVGFigureItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDocumentURIPropertyDescriptor(object);
-			addNoCanvasWidthPropertyDescriptor(object);
-			addNoCanvasHeightPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Document URI feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDocumentURIPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGFigure_documentURI_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGFigure_documentURI_feature", "_UI_SVGFigure_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGFigure_DocumentURI(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the No Canvas Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNoCanvasWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGFigure_noCanvasWidth_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGFigure_noCanvasWidth_feature", "_UI_SVGFigure_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGFigure_NoCanvasWidth(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the No Canvas Height feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNoCanvasHeightPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGFigure_noCanvasHeight_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGFigure_noCanvasHeight_feature", "_UI_SVGFigure_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGFigure_NoCanvasHeight(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getSVGFigure_Properties());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getSVGFigure_AreaOfInterest());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns SVGFigure.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SVGFigure"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((SVGFigure)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SVGFigure_type") :
-			getString("_UI_SVGFigure_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SVGFigure.class)) {
-			case GMFGraphPackage.SVG_FIGURE__DOCUMENT_URI:
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_WIDTH:
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_HEIGHT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFGraphPackage.SVG_FIGURE__PROPERTIES:
-			case GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getSVGFigure_Properties(),
-				 GMFGraphFactory.eINSTANCE.createSVGProperty()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getSVGFigure_AreaOfInterest(),
-				 GMFGraphFactory.eINSTANCE.createRectangle2D()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/SVGPropertyItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/SVGPropertyItemProvider.java
deleted file mode 100644
index c3e1a58ee88..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/SVGPropertyItemProvider.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SVGPropertyItemProvider.java,v 1.1 2008/07/31 12:14:54 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SVGPropertyItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SVGPropertyItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addQueryPropertyDescriptor(object);
-			addAttributePropertyDescriptor(object);
-			addTypePropertyDescriptor(object);
-			addGetterPropertyDescriptor(object);
-			addSetterPropertyDescriptor(object);
-			addCallSuperPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Query feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addQueryPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGProperty_query_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGProperty_query_feature", "_UI_SVGProperty_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGProperty_Query(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Attribute feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAttributePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGProperty_attribute_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGProperty_attribute_feature", "_UI_SVGProperty_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGProperty_Attribute(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Type feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTypePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGProperty_type_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGProperty_type_feature", "_UI_SVGProperty_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGProperty_Type(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Getter feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addGetterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGProperty_getter_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGProperty_getter_feature", "_UI_SVGProperty_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGProperty_Getter(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Setter feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSetterPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGProperty_setter_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGProperty_setter_feature", "_UI_SVGProperty_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGProperty_Setter(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Call Super feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCallSuperPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_SVGProperty_callSuper_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_SVGProperty_callSuper_feature", "_UI_SVGProperty_type"),
-				 GMFGraphPackage.eINSTANCE.getSVGProperty_CallSuper(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns SVGProperty.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/SVGProperty"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((SVGProperty)object).getQuery();
-		return label == null || label.length() == 0 ?
-			getString("_UI_SVGProperty_type") :
-			getString("_UI_SVGProperty_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(SVGProperty.class)) {
-			case GMFGraphPackage.SVG_PROPERTY__QUERY:
-			case GMFGraphPackage.SVG_PROPERTY__ATTRIBUTE:
-			case GMFGraphPackage.SVG_PROPERTY__TYPE:
-			case GMFGraphPackage.SVG_PROPERTY__GETTER:
-			case GMFGraphPackage.SVG_PROPERTY__SETTER:
-			case GMFGraphPackage.SVG_PROPERTY__CALL_SUPER:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ScalablePolygonItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ScalablePolygonItemProvider.java
deleted file mode 100644
index c727ebca3e6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ScalablePolygonItemProvider.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ScalablePolygonItemProvider
-	extends PolygonItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ScalablePolygonItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns ScalablePolygon.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ScalablePolygon"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ScalablePolygon)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_ScalablePolygon_type") :
-			getString("_UI_ScalablePolygon_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getPolyline_Template();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ShapeItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ShapeItemProvider.java
deleted file mode 100644
index e4a8ebb7e96..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/ShapeItemProvider.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Shape;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.Shape} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ShapeItemProvider
-	extends RealFigureItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ShapeItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addOutlinePropertyDescriptor(object);
-			addFillPropertyDescriptor(object);
-			addLineWidthPropertyDescriptor(object);
-			addLineKindPropertyDescriptor(object);
-			addXorFillPropertyDescriptor(object);
-			addXorOutlinePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Outline feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOutlinePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Shape_outline_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Shape_outline_feature", "_UI_Shape_type"),
-				 GMFGraphPackage.eINSTANCE.getShape_Outline(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Fill feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFillPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Shape_fill_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Shape_fill_feature", "_UI_Shape_type"),
-				 GMFGraphPackage.eINSTANCE.getShape_Fill(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Line Width feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLineWidthPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Shape_lineWidth_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Shape_lineWidth_feature", "_UI_Shape_type"),
-				 GMFGraphPackage.eINSTANCE.getShape_LineWidth(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.INTEGRAL_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Line Kind feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLineKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Shape_lineKind_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Shape_lineKind_feature", "_UI_Shape_type"),
-				 GMFGraphPackage.eINSTANCE.getShape_LineKind(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Xor Fill feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addXorFillPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Shape_xorFill_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Shape_xorFill_feature", "_UI_Shape_type"),
-				 GMFGraphPackage.eINSTANCE.getShape_XorFill(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Xor Outline feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addXorOutlinePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Shape_xorOutline_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Shape_xorOutline_feature", "_UI_Shape_type"),
-				 GMFGraphPackage.eINSTANCE.getShape_XorOutline(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Shape)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_Shape_type") :
-			getString("_UI_Shape_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Shape.class)) {
-			case GMFGraphPackage.SHAPE__OUTLINE:
-			case GMFGraphPackage.SHAPE__FILL:
-			case GMFGraphPackage.SHAPE__LINE_WIDTH:
-			case GMFGraphPackage.SHAPE__LINE_KIND:
-			case GMFGraphPackage.SHAPE__XOR_FILL:
-			case GMFGraphPackage.SHAPE__XOR_OUTLINE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/StackLayoutItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/StackLayoutItemProvider.java
deleted file mode 100644
index dd02778d41c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/StackLayoutItemProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.StackLayout} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class StackLayoutItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StackLayoutItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns StackLayout.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StackLayout"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_StackLayout_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/VerticalLabelItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/VerticalLabelItemProvider.java
deleted file mode 100644
index 0a7547ffecc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/VerticalLabelItemProvider.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class VerticalLabelItemProvider
-	extends RealFigureItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VerticalLabelItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTextPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Text feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTextPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_VerticalLabel_text_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_VerticalLabel_text_feature", "_UI_VerticalLabel_type"),
-				 GMFGraphPackage.eINSTANCE.getVerticalLabel_Text(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns VerticalLabel.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VerticalLabel"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((VerticalLabel)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_VerticalLabel_type") :
-			getString("_UI_VerticalLabel_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(VerticalLabel.class)) {
-			case GMFGraphPackage.VERTICAL_LABEL__TEXT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_ForegroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_BackgroundColor() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MaximumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_MinimumSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_PreferredSize() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Location() ||
-			childFeature == GMFGraphPackage.eINSTANCE.getFigure_Size();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/VisiblePinItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/VisiblePinItemProvider.java
deleted file mode 100644
index 6d57887a2ec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/VisiblePinItemProvider.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.VisiblePin;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.VisiblePin} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class VisiblePinItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VisiblePinItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_Identity_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_Identity_name_feature", "_UI_Identity_type"),
-				 GMFGraphPackage.eINSTANCE.getIdentity_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns VisiblePin.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VisiblePin"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((VisiblePin)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_VisiblePin_type") :
-			getString("_UI_VisiblePin_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(VisiblePin.class)) {
-			case GMFGraphPackage.VISIBLE_PIN__NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/XYLayoutDataItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/XYLayoutDataItemProvider.java
deleted file mode 100644
index 39b67617dea..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/XYLayoutDataItemProvider.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class XYLayoutDataItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XYLayoutDataItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getXYLayoutData_TopLeft());
-			childrenFeatures.add(GMFGraphPackage.eINSTANCE.getXYLayoutData_Size());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns XYLayoutData.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XYLayoutData"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_XYLayoutData_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(XYLayoutData.class)) {
-			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
-			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getXYLayoutData_TopLeft(),
-				 GMFGraphFactory.eINSTANCE.createPoint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFGraphPackage.eINSTANCE.getXYLayoutData_Size(),
-				 GMFGraphFactory.eINSTANCE.createDimension()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/XYLayoutItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/XYLayoutItemProvider.java
deleted file mode 100644
index 477068d6bb6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef.edit/src/org/eclipse/papyrus/gmf/gmfgraph/provider/XYLayoutItemProvider.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IChildCreationExtender;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.gmfgraph.XYLayout} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class XYLayoutItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XYLayoutItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns XYLayout.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/XYLayout"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_XYLayout_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return ((IChildCreationExtender)adapterFactory).getResourceLocator();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.project
deleted file mode 100644
index 84243789e4c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.project
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.graphdef</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.papyrus.gmf.xpand.xpandBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.settings/org.eclipse.gmf.xpand.build.ignore-all-local-metamodels.txt b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.settings/org.eclipse.gmf.xpand.build.ignore-all-local-metamodels.txt
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.settings/org.eclipse.gmf.xpand.build.ignore-all-local-metamodels.txt
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/META-INF/MANIFEST.MF
deleted file mode 100644
index 52e88f15d01..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.graphdef; singleton:=true
-Bundle-Version: 2.9.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)",
- org.eclipse.emf.codegen;bundle-version="[2.3.0,3.0.0)",
- org.eclipse.papyrus.gmf.common;bundle-version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.papyrus.gmf.gmfgraph,
- org.eclipse.papyrus.gmf.gmfgraph.impl;x-friends:="org.eclipse.papyrus.gmf.map",
- org.eclipse.papyrus.gmf.gmfgraph.util,
- org.eclipse.papyrus.gmf.internal.graphdef.util;x-internal:=true
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/build.properties
deleted file mode 100644
index 7a3235d7e0e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.properties,\
-               plugin.xml,\
-               models/,\
-               about.html
-javacWarnings.. = -unchecked
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/basic.gmfgraph b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/basic.gmfgraph
deleted file mode 100644
index 335ffccc47f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/basic.gmfgraph
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gmfgraph:Canvas xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:gmfgraph="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition" name="Surface">
-  <figures
-      name="GenericDiagramFigures">
-   <descriptors name="NodeRectangle">
-    <actualFigure
-        xsi:type="gmfgraph:Rectangle">
-      <layout
-          xsi:type="gmfgraph:FlowLayout"
-          vertical="true"
-          matchMinorSize="true"
-          forceSingleLine="true"
-          majorAlignment="CENTER"
-          minorAlignment="CENTER"
-          majorSpacing="0"
-          minorSpacing="0"/>
-    </actualFigure>
-   </descriptors>
-   <descriptors name="ConnectionLine">
-    <actualFigure
-        xsi:type="gmfgraph:PolylineConnection"/>
-   </descriptors>
-   <descriptors name="ContainerFigure">
-    <actualFigure
-        xsi:type="gmfgraph:LabeledContainer"/>
-   </descriptors>
-   <descriptors name="LabelFigure">
-    <actualFigure
-        xsi:type="gmfgraph:Label"/>
-   </descriptors>
-   <descriptors name="NamedNodeRectangle">
-    <actualFigure
-        xsi:type="gmfgraph:Rectangle">
-      <layout
-          xsi:type="gmfgraph:FlowLayout"
-          vertical="true"
-          matchMinorSize="true"
-          forceSingleLine="true"
-          majorAlignment="CENTER"
-          minorAlignment="CENTER"
-          majorSpacing="0"
-          minorSpacing="0"/>
-      <children
-          xsi:type="gmfgraph:Label"/>
-    </actualFigure>
-    <accessors figure="//@figures.0/@descriptors.4/@actualFigure/@children.0" accessor="Name"/>
-   </descriptors>
-  </figures>
-  <nodes
-      name="Node"
-      figure="NodeRectangle"/>
-  <nodes
-      name="NamedNode"
-      figure="NamedNodeRectangle"/>
-  <connections
-      name="Link"
-      figure="ConnectionLine"/>
-  <compartments
-      name="Compartment"
-      figure="ContainerFigure"
-      collapsible="true"
-      needsTitle="true"/>
-  <labels
-      name="NamedNode_Name"
-      figure="NamedNodeRectangle" accessor="//@figures.0/@descriptors.4/@accessors.0"/>
-  <labels
-      name="Label"
-      figure="LabelFigure"/>
-  <labels
-      name="LabelWOIcon"
-      figure="LabelFigure"
-      elementIcon="false"/>
-</gmfgraph:Canvas>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/classDiagram.gmfgraph b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/classDiagram.gmfgraph
deleted file mode 100644
index e2c1a670067..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/classDiagram.gmfgraph
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gmfgraph:Canvas xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:gmfgraph="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition" name="ClassDiagram Canvas">
-  <figures name="ClassDiagram Figure Gallery">
-    <figures xsi:type="gmfgraph:PolygonDecoration" name="FilledRhomb">
-      <template x="-1" y="1"/>
-      <template/>
-      <template x="-1" y="-1"/>
-      <template x="-2"/>
-      <template x="-1" y="1"/>
-    </figures>
-    <figures xsi:type="gmfgraph:PolygonDecoration" name="ClosedArrow">
-      <backgroundColor xsi:type="gmfgraph:ConstantColor"/>
-      <template/>
-      <template x="-2" y="2"/>
-      <template x="-2" y="-2"/>
-      <template/>
-    </figures>
-    <figures xsi:type="gmfgraph:PolylineDecoration" name="Arrow">
-      <template x="-1" y="1"/>
-      <template/>
-      <template x="-1" y="-1"/>
-    </figures>
-    <descriptors name="SolidLineWSrcDiamond">
-      <actualFigure xsi:type="gmfgraph:PolylineConnection" sourceDecoration="//@figures.0/@figures[name='FilledRhomb']"/>
-    </descriptors>
-    <descriptors name="DashedLineConnection">
-      <actualFigure xsi:type="gmfgraph:PolylineConnection" lineKind="LINE_DASH"/>
-    </descriptors>
-    <descriptors name="SolidLineWDstClosedArrow">
-      <actualFigure xsi:type="gmfgraph:PolylineConnection" targetDecoration="//@figures.0/@figures[name='ClosedArrow']"/>
-    </descriptors>
-    <descriptors name="SolidLineWDstArrow">
-      <actualFigure xsi:type="gmfgraph:PolylineConnection" targetDecoration="//@figures.0/@figures[name='Arrow']"/>
-    </descriptors>
-  </figures>
-  <connections name="SolidConnectionWSrcDiamond" figure="SolidLineWSrcDiamond"/>
-  <connections name="DashedConnection" figure="DashedLineConnection"/>
-  <connections name="SolidConnectionWDstClosedArrow" figure="SolidLineWDstClosedArrow"/>
-  <connections name="SolidConnectionWDstArrow" figure="SolidLineWDstArrow"/>
-</gmfgraph:Canvas>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore
deleted file mode 100644
index 6d4557cc310..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore
+++ /dev/null
@@ -1,574 +0,0 @@
-<?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="gmfgraph" nsURI="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition"
-    nsPrefix="gmfgraph">
-  <eClassifiers xsi:type="ecore:EClass" name="Canvas" eSuperTypes="#//Identity">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figures" upperBound="-1"
-        eType="#//FigureGallery" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="containment here doesn't restrict nodes/connection from using figure galeries defined elsewhere. No assumption should be made whether or not node/connection figure is defined in the galery beloning to this canvas"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
-        eType="#//Node" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1"
-        eType="#//Connection" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
-        eType="#//Compartment" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="labels" upperBound="-1"
-        eType="#//DiagramLabel" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureGallery" eSuperTypes="#//Identity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Kind of explicit figure library notion. Bundle of figures. Allows to specify plugin id (allows importing it later from gmfgen code) in addition to figures"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figures" upperBound="-1"
-        eType="#//RealFigure" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptors" upperBound="-1"
-        eType="#//FigureDescriptor" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="borders" upperBound="-1"
-        eType="#//Border" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Borders for reuse"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="layouts" upperBound="-1"
-        eType="#//Layout" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Layouts for reuse"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementationBundle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Identity" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Easy and readable way to reference element of the model from another one"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        iD="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramElement" abstract="true" eSuperTypes="#//Identity">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figure" lowerBound="1"
-        eType="#//FigureDescriptor"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="facets" upperBound="-1"
-        eType="#//VisualFacet" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="anything to further specify constraint or any other aspect of the element"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractNode" abstract="true" eSuperTypes="#//DiagramElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//AbstractNode">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resizeConstraint" eType="#//Direction"
-        defaultValueLiteral="NSEW"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="affixedParentSide" eType="#//Direction"
-        defaultValueLiteral="NONE"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contentPane" eType="#//ChildAccess"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Connection" eSuperTypes="#//DiagramElement"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Compartment" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="needsTitle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="accessor" eType="#//ChildAccess"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramLabel" eSuperTypes="#//Node">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="accessor" eType="#//ChildAccess"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" eType="#//ChildAccess"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="external" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        changeable="false" volatile="true" transient="true" derived="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VisualFacet" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GeneralFacet" eSuperTypes="#//VisualFacet">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="provide means to attach arbitrary data to your diagram element definition. It's up to you (template author) to process it somehow."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        iD="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AlignmentFacet" eSuperTypes="#//VisualFacet">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Makes sense for DiagramLabels of Links only (now). Constants from {@link org.eclipse.draw2d.ConnectionLocator} are: MIDDLE = Alignment.CENTER, TARGET = Alignment.END, SOURCE = Alignment.BEGINNING"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="#//Alignment"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GradientFacet" eSuperTypes="#//VisualFacet">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="#//Direction"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LabelOffsetFacet" eSuperTypes="#//VisualFacet">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DefaultSizeFacet" eSuperTypes="#//VisualFacet">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultSize" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Figure" abstract="true" interface="true"
-      eSuperTypes="#//Layoutable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Anything you could combine visual representation from. Ordinary GEF figures, custom-defined or references to defined elsewhere. org.eclipse.draw2d.Figure"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="descriptor" eType="#//FigureDescriptor"
-        changeable="false" volatile="true" transient="true" derived="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="foregroundColor" eType="#//Color"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="backgroundColor" eType="#//Color"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="maximumSize" eType="#//Dimension"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="minimumSize" eType="#//Dimension"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="preferredSize" eType="#//Dimension"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="font" eType="#//Font" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="insets" eType="#//Insets"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="border" eType="#//Border"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="location" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="size" eType="#//Point"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractFigure" abstract="true" eSuperTypes="#//Figure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is merely an implementation artifact to get only one base implementation of Figure attributes"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureDescriptor" eSuperTypes="#//Identity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="The thing describes structure of a figure"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actualFigure" lowerBound="1"
-        eType="#//Figure" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="accessors" upperBound="-1"
-        eType="#//ChildAccess" containment="true" eOpposite="#//ChildAccess/owner"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ChildAccess">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//FigureDescriptor"
-        changeable="false" resolveProxies="false" eOpposite="#//FigureDescriptor/accessors"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessor" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figure" lowerBound="1"
-        eType="#//Figure">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This may also point to RealFigure from FigureAccessor#typedFigure"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RealFigure" abstract="true" eSuperTypes="#//AbstractFigure #//PinOwner #//CustomAttributeOwner">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="This is exact/specific/concrete figure, unlike proxy/reference-nature FigureRef"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//Figure" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureRef" eSuperTypes="#//AbstractFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Need this to facilitate reuse of figures while keeping (so nice looking) containment relationship in the Figure class"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figure" lowerBound="1"
-        eType="#//RealFigure">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="not just Figure because don't want to reference figure references."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConnectionFigure" abstract="true" interface="true"
-      eSuperTypes="#//RealFigure"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DecorationFigure" abstract="true" interface="true"
-      eSuperTypes="#//RealFigure"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Shape" abstract="true" eSuperTypes="#//RealFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Shape"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="outline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fill" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineKind" eType="#//LineKind"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xorFill" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xorOutline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resolvedChildren" upperBound="-1"
-        eType="#//Figure" changeable="false" volatile="true" transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Same as children, but resolves child FigureRefs, if any, to Figures"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Label" eSuperTypes="#//RealFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LabeledContainer" eSuperTypes="#//RealFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.LabeledContainer"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VerticalLabel" eSuperTypes="#//RealFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.gmf.tooling.runtime.draw2d.labels.VerticalLabel"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rectangle" eSuperTypes="#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.RectangleFigure"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InvisibleRectangle" eSuperTypes="#//RealFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.RectangleFigure #opaque=false, #outline=false, #fill=false"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoundedRectangle" eSuperTypes="#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.RoundedRectangle"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="8"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="8"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Ellipse"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Polyline" eSuperTypes="#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Polyline"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="template" upperBound="-1"
-        eType="#//Point" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Polygon" eSuperTypes="#//Polyline">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Polygon"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ScalablePolygon" eSuperTypes="#//Polygon">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Marker interface to denote polygons with ability to autoscale to fit all available bounds. Separate class is needed instead of property in the Polygon class because of generalization PolygonDecoration extends Polygon"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PolylineConnection" eSuperTypes="#//Polyline #//ConnectionFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.PolylineConnection"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceDecoration" eType="#//DecorationFigure"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="targetDecoration" eType="#//DecorationFigure"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PolylineDecoration" eSuperTypes="#//Polyline #//DecorationFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.PolylineDecoration"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PolygonDecoration" eSuperTypes="#//Polygon #//DecorationFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.PolygonDecoration"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomAttributeOwner" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
-        eType="#//CustomAttribute" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomClass" abstract="true" interface="true"
-      eSuperTypes="#//CustomAttributeOwner">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomAttribute">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="null"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="directAccess" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiStatementValue" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureAccessor">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessor" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typedFigure" lowerBound="1"
-        eType="#//RealFigure" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomFigure" eSuperTypes="#//RealFigure #//CustomClass">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Any figure class provided by some bundle"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="customChildren" upperBound="-1"
-        eType="#//FigureAccessor" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Childrent enumerated with this feature are mere 'access points' to actual structure of the CustomFigure. They are not created, unlike those contained in regular Figure#children"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomDecoration" eSuperTypes="#//CustomFigure #//DecorationFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Same as CustomFigure, but for Decorations"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomConnection" eSuperTypes="#//CustomFigure #//ConnectionFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Same as CustomFigure, but for Connections"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Color" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="RGBColor" eSuperTypes="#//Color">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="red" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="green" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="blue" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConstantColor" eSuperTypes="#//Color">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="#//ColorConstants"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ColorConstants">
-    <eLiterals name="white"/>
-    <eLiterals name="black" value="1"/>
-    <eLiterals name="lightGray" value="2"/>
-    <eLiterals name="gray" value="3"/>
-    <eLiterals name="darkGray" value="4"/>
-    <eLiterals name="red" value="5"/>
-    <eLiterals name="orange" value="6"/>
-    <eLiterals name="yellow" value="7"/>
-    <eLiterals name="green" value="8"/>
-    <eLiterals name="lightGreen" value="9"/>
-    <eLiterals name="darkGreen" value="10"/>
-    <eLiterals name="cyan" value="11"/>
-    <eLiterals name="lightBlue" value="12"/>
-    <eLiterals name="blue" value="13"/>
-    <eLiterals name="darkBlue" value="14"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Font" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="BasicFont" eSuperTypes="#//Font">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="faceName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="9"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="#//FontStyle"
-        defaultValueLiteral="NORMAL"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="FontStyle">
-    <eLiterals name="NORMAL"/>
-    <eLiterals name="BOLD" value="1"/>
-    <eLiterals name="ITALIC" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Point">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Dimension">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dx" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Insets">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="top" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="left" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bottom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="right" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Border" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="BorderRef" eSuperTypes="#//Border">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Border reuse mechanism"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actual" lowerBound="1"
-        eType="#//Border">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="constraint: actual should not be another BorderRef"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LineBorder" eSuperTypes="#//Border">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="color" eType="#//Color"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MarginBorder" eSuperTypes="#//Border">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="insets" eType="#//Insets"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompoundBorder" eSuperTypes="#//Border">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outer" eType="#//Border"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inner" eType="#//Border"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomBorder" eSuperTypes="#//Border #//CustomClass"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="Direction">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Geographical bit constants from org.eclipse.draw2d.PositionConstants"/>
-    </eAnnotations>
-    <eLiterals name="NONE"/>
-    <eLiterals name="NORTH" value="1"/>
-    <eLiterals name="SOUTH" value="4"/>
-    <eLiterals name="WEST" value="8"/>
-    <eLiterals name="EAST" value="16"/>
-    <eLiterals name="NORTH_EAST" value="17"/>
-    <eLiterals name="NORTH_WEST" value="9"/>
-    <eLiterals name="SOUTH_EAST" value="20"/>
-    <eLiterals name="SOUTH_WEST" value="12"/>
-    <eLiterals name="NORTH_SOUTH" value="5"/>
-    <eLiterals name="EAST_WEST" value="24"/>
-    <eLiterals name="NSEW" value="29"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="LineKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Graphics.LINE_* (== org.eclipse.swt.SWT.LINE_*. Values are same as SWT constants"/>
-    </eAnnotations>
-    <eLiterals name="LINE_SOLID" value="1"/>
-    <eLiterals name="LINE_DASH" value="2"/>
-    <eLiterals name="LINE_DOT" value="3"/>
-    <eLiterals name="LINE_DASHDOT" value="4"/>
-    <eLiterals name="LINE_DASHDOTDOT" value="5"/>
-    <eLiterals name="LINE_CUSTOM" value="6"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LayoutData" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//Layoutable"
-        eOpposite="#//Layoutable/layoutData"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomLayoutData" eSuperTypes="#//LayoutData #//CustomClass"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GridLayoutData" eSuperTypes="#//LayoutData">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="grabExcessHorizontalSpace"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="grabExcessVerticalSpace"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalAlignment" lowerBound="1"
-        eType="#//Alignment" defaultValueLiteral="CENTER"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalAlignment" lowerBound="1"
-        eType="#//Alignment" defaultValueLiteral="CENTER"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalSpan" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalSpan" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalIndent" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sizeHint" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BorderLayoutData" eSuperTypes="#//LayoutData">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" lowerBound="1"
-        eType="#//Alignment" defaultValueLiteral="CENTER"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vertical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Alignment">
-    <eLiterals name="BEGINNING"/>
-    <eLiterals name="CENTER" value="1"/>
-    <eLiterals name="END" value="2"/>
-    <eLiterals name="FILL" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Layoutable" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="layoutData" eType="#//LayoutData"
-        containment="true" eOpposite="#//LayoutData/owner"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="layout" eType="#//Layout"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Layout" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="LayoutRef" eSuperTypes="#//Layout">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Layout reuse mechanism"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="actual" lowerBound="1"
-        eType="#//Layout">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="constraint: actual should not be another LayoutRef"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomLayout" eSuperTypes="#//Layout #//CustomClass"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GridLayout" eSuperTypes="#//Layout">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="numColumns" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="equalWidth" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="margins" eType="#//Dimension"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="spacing" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BorderLayout" eSuperTypes="#//Layout">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="spacing" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FlowLayout" eSuperTypes="#//Layout">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vertical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matchMinorSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="forceSingleLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="majorAlignment" eType="#//Alignment"
-        defaultValueLiteral="BEGINNING"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minorAlignment" eType="#//Alignment"
-        defaultValueLiteral="BEGINNING"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="majorSpacing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="5"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minorSpacing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="5"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XYLayout" eSuperTypes="#//Layout"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XYLayoutData" eSuperTypes="#//LayoutData">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="topLeft" lowerBound="1"
-        eType="#//Point" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="size" lowerBound="1" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StackLayout" eSuperTypes="#//Layout"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CenterLayout" eSuperTypes="#//Layout"/>
-  <eClassifiers xsi:type="ecore:EClass" name="SVGFigure" eSuperTypes="#//RealFigure">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="documentURI" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="properties" upperBound="-1"
-        eType="#//SVGProperty" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="areaOfInterest" eType="#//Rectangle2D"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="noCanvasWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="noCanvasHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="SVGProperty">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="query" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="attribute" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="#//SVGPropertyType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="getter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="setter" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="callSuper" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="SVGPropertyType">
-    <eLiterals name="STRING"/>
-    <eLiterals name="COLOR" value="1"/>
-    <eLiterals name="FLOAT" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rectangle2D">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Pin" abstract="true" interface="true"
-      eSuperTypes="#//Identity">
-    <eOperations name="getOperationName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="getOperationType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomPin" eSuperTypes="#//Pin">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customOperationName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="customOperationType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ColorPin" eSuperTypes="#//Pin">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="backgroundNotForeground"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VisiblePin" eSuperTypes="#//Pin"/>
-  <eClassifiers xsi:type="ecore:EClass" name="PinOwner" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="pins" upperBound="-1" eType="#//Pin"
-        containment="true"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.emf b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.emf
deleted file mode 100644
index d39c012c75c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.emf
+++ /dev/null
@@ -1,534 +0,0 @@
-@namespace(uri="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition", prefix="gmfgraph")
-package gmfgraph; // TODO rename to graphdef. Sic!
-
-class Canvas extends Identity {
-	@genmodel(documentation="containment here doesn't restrict nodes/connection from using figure galeries defined elsewhere. No assumption should be made whether or not node/connection figure is defined in the galery beloning to this canvas")
-	val FigureGallery[*] figures;
-	val Node[*] nodes;
-	val Connection[*] connections;
-	val Compartment[*] compartments;
-	val DiagramLabel[*] labels;
-}
-
-@genmodel(documentation="Kind of explicit figure library notion. Bundle of figures. Allows to specify plugin id (allows importing it later from gmfgen code) in addition to figures")
-class FigureGallery extends Identity {
-	val RealFigure[*] figures;
-	val FigureDescriptor[*] descriptors;
-	@genmodel(documentation="Borders for reuse")
-	val Border[*] borders;
-	@genmodel(documentation="Layouts for reuse")
-	val Layout[*] layouts;
-	attr String implementationBundle;
-}
-
-@genmodel(documentation="Easy and readable way to reference element of the model from another one")
-abstract interface Identity {
-	id attr String[1] name;
-}
-
-abstract class DiagramElement extends Identity {
-	ref FigureDescriptor[1] figure;
-	@genmodel(documentation="anything to further specify constraint or any other aspect of the element")
-	val VisualFacet[*] facets;
-}
-
-abstract class AbstractNode extends DiagramElement {
-}
-
-class Node extends AbstractNode {
-	attr Direction resizeConstraint = "NSEW"; // #114061. As a facet, perhaps?
-	attr Direction affixedParentSide = "NONE";
-	// TODO map connection-anchor
-	//
-	ref ChildAccess[?] contentPane; // constaint: accessors.contain(contentPane)
-}
-
-class Connection extends DiagramElement {
-// constraint: super.figure instanceof ConnectionFigure
-	// boolean bendable?
-}
-class Compartment extends DiagramElement { // XXX AbstractNode?
-	attr boolean collapsible;
-	attr boolean needsTitle;
-	ref ChildAccess[?] accessor; // move to AbstractNode to share with DiagramLabel?
-}
-
-class DiagramLabel extends Node { // XXX still Node as it's a distinct endeavour to get gmfmap fixed
-	attr boolean elementIcon = true;
-	ref ChildAccess[?] accessor; // can do 2 choices here: either require super.figure to be not set or to treat this as accessor to exact label within super.figure?
-	ref ChildAccess[?] container;
-	transient volatile derived readonly attr boolean external;
-}
-
-abstract interface VisualFacet {
-}
-
-@genmodel(documentation="provide means to attach arbitrary data to your diagram element definition. It's up to you (template author) to process it somehow.")
-class GeneralFacet extends VisualFacet {
-	id attr String[?] identifier;
-	attr String data;
-}
-
-@genmodel(documentation="Makes sense for DiagramLabels of Links only (now). Constants from {@link org.eclipse.draw2d.ConnectionLocator} are: MIDDLE = Alignment.CENTER, TARGET = Alignment.END, SOURCE = Alignment.BEGINNING")
-class AlignmentFacet extends VisualFacet {
-	attr Alignment alignment;
-}
-
-class GradientFacet extends VisualFacet {
-	attr Direction direction;
-}
-
-class LabelOffsetFacet extends VisualFacet {
-	attr int x;
-	attr int y;
-}
-
-class DefaultSizeFacet extends VisualFacet {
-	val Dimension defaultSize;
-}
-
-// LayoutConstraint as VisualFacet?
-
-// TODO placeholders
-
-
-@genmodel(documentation="Anything you could combine visual representation from. Ordinary GEF figures, custom-defined or references to defined elsewhere. org.eclipse.draw2d.Figure")
-abstract interface Figure extends Layoutable {
-	readonly transient volatile derived !resolve ref FigureDescriptor[?] descriptor; 
-	val Color foregroundColor;
-	val Color backgroundColor;
-	val Dimension maximumSize;
-	val Dimension minimumSize;
-	val Dimension preferredSize;
-	val Font font;
-	val Insets insets;
-	val Border border;
-	val Point[?] location; // relative to parent figure
-	val Point[?] size;
-}
-
-@genmodel(documentation="This is merely an implementation artifact to get only one base implementation of Figure attributes")
-abstract class AbstractFigure extends Figure {
-}
-
-@genmodel(documentation="The thing describes structure of a figure")
-class FigureDescriptor extends Identity {
-	val Figure[1] actualFigure; // could be figureRef as well
-	val ChildAccess[*]#owner accessors;
-}
-
-class ChildAccess {
-	readonly !resolve ref FigureDescriptor[1]#accessors owner;
-	// XXX add getter and setter, use accessor as field name
-	attr String[?] accessor;
-	@genmodel(documentation="This may also point to RealFigure from FigureAccessor#typedFigure")
-	ref Figure[1] figure; // constraint owner.actualFigure.collectAllChildren().contains(this.figure)
-	// XXX perhaps, RealFigure, not just Figure?
-}
-
-@genmodel(documentation="This is exact/specific/concrete figure, unlike proxy/reference-nature FigureRef")
-abstract class RealFigure extends AbstractFigure, PinOwner, CustomAttributeOwner {
-	attr String[?] name; // unlike identity, do not require this attribute (and not necessarily unique)
-	ordered val Figure[*] children;
-}
-
-@genmodel(documentation="Need this to facilitate reuse of figures while keeping (so nice looking) containment relationship in the Figure class")
-class FigureRef extends AbstractFigure {
-	@genmodel(documentation="not just Figure because don't want to reference figure references.")
-	ref RealFigure[1] figure;
-}
-
-// ShapeRef extends FigureRef implements Shape?
-
-abstract interface ConnectionFigure extends RealFigure {
-// typedef connectionRouter?
-}
-abstract interface DecorationFigure extends RealFigure {
-}
-
-@genmodel(documentation="org.eclipse.draw2d.Shape")
-abstract class Shape extends RealFigure {
-	attr boolean outline = true;
-	attr boolean fill = true;
-	attr int lineWidth = 1;
-	attr LineKind lineKind;
-	attr boolean xorFill;
-	attr boolean xorOutline;
-	@genmodel(documentation="Same as children, but resolves child FigureRefs, if any, to Figures")
-	readonly derived transient volatile ref Figure[*] resolvedChildren;
-}
-
-
-// well-known, predefined Figures
-
-@genmodel(documentation="org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel")
-class Label extends RealFigure {
-	attr String text;
-}
-
-@genmodel(documentation="org.eclipse.draw2d.LabeledContainer")
-class LabeledContainer extends RealFigure {
-}
-// ImageFigure?
-// Layer?
-// Panel?
-// ScrollPane?
-
-@genmodel(documentation="org.eclipse.gmf.tooling.runtime.draw2d.labels.VerticalLabel")
-class VerticalLabel extends RealFigure {
-	attr String text;
-}
-
-// well-known, predefined shapes
-
-@genmodel(documentation="org.eclipse.draw2d.RectangleFigure")
-class Rectangle extends Shape {
-}
-
-@genmodel(documentation="org.eclipse.draw2d.RectangleFigure #opaque=false, #outline=false, #fill=false")
-class InvisibleRectangle extends RealFigure {
-   //
-}
-
-@genmodel(documentation="org.eclipse.draw2d.RoundedRectangle")
-class RoundedRectangle extends Shape {
-	// FIXME dimension instead of two separate ints?
-	attr int cornerWidth = 8; // defaults from implementation code
-	attr int cornerHeight = 8;
-}
-
-@genmodel(documentation="org.eclipse.draw2d.Ellipse")
-class Ellipse extends Shape {
-}
-
-@genmodel(documentation="org.eclipse.draw2d.Polyline")
-class Polyline extends Shape {
-	val Point[*] template;
-}
-
-@genmodel(documentation="org.eclipse.draw2d.Polygon")
-class Polygon extends Polyline {
-}
-
-@genmodel(documentation="Marker interface to denote polygons with ability to autoscale to fit all available bounds. Separate class is needed instead of property in the Polygon class because of generalization PolygonDecoration extends Polygon")
-class ScalablePolygon extends Polygon {
-}
-
-// predefined connections
-
-// DOES IT MAKE SENSE to extend Polyline - is there usecase for Polyline.template (i.e. predefined connection shape?)?
-@genmodel(documentation="org.eclipse.draw2d.PolylineConnection")
-class PolylineConnection extends Polyline, ConnectionFigure {
-	ref DecorationFigure sourceDecoration;
-	ref DecorationFigure targetDecoration;
-}
-
-// predefined decorations
-
-@genmodel(documentation="org.eclipse.draw2d.PolylineDecoration")
-class PolylineDecoration extends Polyline, DecorationFigure {
-//	val Point scale?;
-}
-
-@genmodel(documentation="org.eclipse.draw2d.PolygonDecoration")
-class PolygonDecoration extends Polygon, DecorationFigure {
-//	val Point scale?;
-
-}
-
-// custom figures 
-
-abstract interface CustomAttributeOwner {
-	val CustomAttribute[*] attributes;   
-}
-
-abstract interface CustomClass extends CustomAttributeOwner {
-	attr String qualifiedClassName;
-}
-
-class CustomAttribute {
-	attr String[1] name;
-	attr String[1] value = "null";
-	attr boolean[1] directAccess = false;
-	attr boolean[1] multiStatementValue = false;
-}
-
-class FigureAccessor {
-	attr String[1] accessor;
-	// val, not ref as Accessor is supposed to describe some part of CustomFigure, which part doesn't seem worth being described separately
-	// RealFigure, not CustomFigure because we might want to use predefined figures to specify type
-	val RealFigure[1] typedFigure;
-}
-
-@genmodel(documentation="Any figure class provided by some bundle")
-class CustomFigure extends RealFigure, CustomClass {
-	@genmodel(documentation="Childrent enumerated with this feature are mere 'access points' to actual structure of the CustomFigure. They are not created, unlike those contained in regular Figure#children")
-	val FigureAccessor[*] customChildren;
-}
-// XXX CustomShape extends Shape, CustomClass?
-
-@genmodel(documentation="Same as CustomFigure, but for Decorations")
-class CustomDecoration extends CustomFigure, DecorationFigure {
-}
-
-@genmodel(documentation="Same as CustomFigure, but for Connections")
-class CustomConnection extends CustomFigure, ConnectionFigure {
-}
-
-// Misc
-
-abstract interface Color {
-}
-
-class RGBColor extends Color {
-  attr int[1] red;
-  attr int[1] green;
-  attr int[1] blue;
-}
-
-class ConstantColor extends Color {
-  attr ColorConstants[1] value;
-}
-
-enum ColorConstants {
-// TODO capitalize and use mixed-case values as literals
-  white;
-  black;
-  lightGray;
-  gray;
-  darkGray;
-  red;
-  orange;
-  yellow;
-  green;
-  lightGreen;
-  darkGreen;
-  cyan;
-  lightBlue;
-  blue;
-  darkBlue;
-}
-
-abstract interface Font {
-}
-
-class BasicFont extends Font {
-	attr String faceName;
-	attr int height = 9;
-	attr FontStyle style = "NORMAL";
-}
-
-enum FontStyle {
-	NORMAL;
-	BOLD;
-	ITALIC;
-//	UNDERLINE;
-}
-
-class Point {
-	attr int x;
-	attr int y;
-}
-
-class Dimension {
-	attr int dx;
-	attr int dy;
-}
-
-class Insets {
-	attr int top;
-	attr int left;
-	attr int bottom;
-	attr int right;
-}
-
-abstract interface Border {
-}
-
-// XXX perhaps, makes sense to have common Ref marker interface to easily tell use of [Figure|Border|Layout]Ref?
-@genmodel(documentation="Border reuse mechanism")
-class BorderRef extends Border {
-	@genmodel(documentation="constraint: actual should not be another BorderRef")
-	ref Border[1] actual;
-}
-
-class LineBorder extends Border {
-	val Color color;
-	attr int width = 1;
-}
-
-class MarginBorder extends Border {
-	val Insets insets;
-}
-
-class CompoundBorder extends Border {
-	val Border outer;
-	val Border inner;
-}
-
-class CustomBorder extends Border, CustomClass {
-}
-
-@genmodel(documentation="Geographical bit constants from org.eclipse.draw2d.PositionConstants")
-enum Direction {
-	NONE = 0; // host can't be resized; see 'directions' attribute in ResizableEditPolicy
-	NORTH = 1;
-	SOUTH = 4;
-	WEST = 8;
-	EAST = 16;
-	NORTH_EAST = 17;
-	NORTH_WEST = 9;
-	SOUTH_EAST = 20;
-	SOUTH_WEST = 12;
-	NORTH_SOUTH = 5;
-	EAST_WEST = 24;
-	NSEW = 29;
-}
-
-@genmodel(documentation="org.eclipse.draw2d.Graphics.LINE_* (== org.eclipse.swt.SWT.LINE_*. Values are same as SWT constants")
-enum LineKind {
-	LINE_SOLID = 1;
-	LINE_DASH = 2;
-	LINE_DOT = 3;
-	LINE_DASHDOT = 4;
-	LINE_DASHDOTDOT = 5;
-	LINE_CUSTOM = 6;
-}
-
-abstract interface LayoutData {
-  ref Layoutable[1]#layoutData owner;
-}
-
-class CustomLayoutData extends LayoutData, CustomClass {
-}
-
-class GridLayoutData extends LayoutData {
-  attr boolean[1] grabExcessHorizontalSpace = false;
-  attr boolean[1] grabExcessVerticalSpace = false;
-  attr Alignment[1] verticalAlignment = "CENTER";
-  attr Alignment[1] horizontalAlignment = "CENTER";
-  attr int[1] verticalSpan = 1;
-  attr int[1] horizontalSpan = 1;
-  attr int[1] horizontalIndent;
-  val Dimension[?] sizeHint;
-}
-
-class BorderLayoutData extends LayoutData {
-  attr Alignment[1] alignment = "CENTER";
-  attr boolean[?] vertical = false;
-}
-
-enum Alignment {
-  BEGINNING = 0;
-  CENTER = 1;
-  END = 2;
-  FILL = 3;
-}
-
-abstract interface Layoutable {
-  val LayoutData#owner layoutData;
-  val Layout layout;
-}
-
-abstract interface Layout {
-}
-
-@genmodel(documentation="Layout reuse mechanism")
-class LayoutRef extends Layout {
-	@genmodel(documentation="constraint: actual should not be another LayoutRef")
-	ref Layout[1] actual;
-}
-
-class CustomLayout extends Layout, CustomClass {
-}
-
-class GridLayout extends Layout {
-  attr int[1] numColumns = 1;
-  attr boolean[1] equalWidth = true;
-  val Dimension[?] margins;
-  val Dimension[?] spacing;
-}
-
-class BorderLayout extends Layout {
-  val Dimension spacing;
-}
-
-class FlowLayout extends Layout {
-	attr boolean vertical = false;
-	attr boolean matchMinorSize = false;
-	attr boolean forceSingleLine = false;
-	attr Alignment majorAlignment = "BEGINNING";
-	attr Alignment minorAlignment = "BEGINNING";
-	attr int majorSpacing = 5;
-	attr int minorSpacing = 5;
-}
-
-class XYLayout extends Layout {
-}
-
-class XYLayoutData extends LayoutData {
-	val Point[1] topLeft;
-	val Dimension[1] size;
-}
-
-class StackLayout extends Layout {
-}
-
-class CenterLayout extends Layout {
-}
-
-class SVGFigure extends RealFigure {
-	attr String documentURI;
-	val SVGProperty[*] properties;
-	val Rectangle2D[?] areaOfInterest;
-	attr boolean noCanvasWidth;
-	attr boolean noCanvasHeight;
-}
-
-class SVGProperty {
-	attr String query;
-	attr String attribute;
-	attr SVGPropertyType type;
-	attr String getter;
-	attr String setter;
-	attr boolean callSuper;
-}
-
-enum SVGPropertyType {
-	STRING = 0;
-	COLOR = 1;
-	FLOAT = 2;
-}
-
-class Rectangle2D {
-	attr float x;
-	attr float y;
-	attr float width;
-	attr float height;
-}
-
-abstract interface Pin extends Identity {
-
-	op String getOperationName();
-	op String getOperationType();   
-}
-
-class CustomPin extends Pin {
-
-	attr String customOperationName; 
-	attr String customOperationType;	  
-}
-
-class ColorPin extends Pin {
-	
-	attr boolean backgroundNotForeground;
-}
-
-class VisiblePin extends Pin {
-   
-}
-
-abstract interface PinOwner {
- 	
- 	val Pin[*] pins;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.genmodel b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.genmodel
deleted file mode 100644
index 1dccd8f663a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.genmodel
+++ /dev/null
@@ -1,342 +0,0 @@
-<?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" modelDirectory="/org.eclipse.papyrus.gmf.graphdef/src" editorDirectory="/org.eclipse.papyrus.gmf.graphdef.edit/src"
-    modelPluginID="org.eclipse.papyrus.gmf.graphdef" redirection="" modelName="GMFGraph" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0">
-  <foreignModel>gmfgraph.ecore</foreignModel>
-  <genPackages prefix="GMFGraph" basePackage="org.eclipse.gmf" disposableProviderFactory="true"
-      literalsInterface="false" extensibleProviderFactory="true" ecorePackage="gmfgraph.ecore#/">
-    <genEnums ecoreEnum="gmfgraph.ecore#//ColorConstants">
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/white"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/black"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/lightGray"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/gray"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/darkGray"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/red"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/orange"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/yellow"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/green"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/lightGreen"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/darkGreen"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/cyan"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/lightBlue"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/blue"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//ColorConstants/darkBlue"/>
-    </genEnums>
-    <genEnums ecoreEnum="gmfgraph.ecore#//FontStyle">
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//FontStyle/NORMAL"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//FontStyle/BOLD"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//FontStyle/ITALIC"/>
-    </genEnums>
-    <genEnums ecoreEnum="gmfgraph.ecore#//Direction">
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/NONE"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/NORTH"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/SOUTH"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/WEST"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/EAST"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/NORTH_EAST"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/NORTH_WEST"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/SOUTH_EAST"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/SOUTH_WEST"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/NORTH_SOUTH"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/EAST_WEST"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Direction/NSEW"/>
-    </genEnums>
-    <genEnums ecoreEnum="gmfgraph.ecore#//LineKind">
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//LineKind/LINE_SOLID"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//LineKind/LINE_DASH"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//LineKind/LINE_DOT"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//LineKind/LINE_DASHDOT"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//LineKind/LINE_DASHDOTDOT"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//LineKind/LINE_CUSTOM"/>
-    </genEnums>
-    <genEnums ecoreEnum="gmfgraph.ecore#//Alignment">
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Alignment/BEGINNING"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Alignment/CENTER"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Alignment/END"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//Alignment/FILL"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="gmfgraph.ecore#//SVGPropertyType">
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//SVGPropertyType/STRING"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//SVGPropertyType/COLOR"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfgraph.ecore#//SVGPropertyType/FLOAT"/>
-    </genEnums>
-    <genClasses ecoreClass="gmfgraph.ecore#//Canvas">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Canvas/figures"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Canvas/nodes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Canvas/connections"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Canvas/compartments"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Canvas/labels"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//FigureGallery">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//FigureGallery/figures"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//FigureGallery/descriptors"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//FigureGallery/borders"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//FigureGallery/layouts"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FigureGallery/implementationBundle"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Identity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Identity/name"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="gmfgraph.ecore#//DiagramElement">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgraph.ecore#//DiagramElement/figure"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//DiagramElement/facets"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="gmfgraph.ecore#//AbstractNode"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//Node">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Node/resizeConstraint"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Node/affixedParentSide"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Node/contentPane"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Connection"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//Compartment">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Compartment/collapsible"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Compartment/needsTitle"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Compartment/accessor"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//DiagramLabel">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//DiagramLabel/elementIcon"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//DiagramLabel/accessor"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//DiagramLabel/container"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//DiagramLabel/external"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//VisualFacet"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//GeneralFacet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GeneralFacet/identifier"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GeneralFacet/data"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//AlignmentFacet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//AlignmentFacet/alignment"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//GradientFacet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GradientFacet/direction"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//LabelOffsetFacet">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//LabelOffsetFacet/x"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//LabelOffsetFacet/y"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//DefaultSizeFacet">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//DefaultSizeFacet/defaultSize"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Figure">
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/descriptor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/foregroundColor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/backgroundColor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/maximumSize"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/minimumSize"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/preferredSize"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/font"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/insets"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/border"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/location"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Figure/size"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="gmfgraph.ecore#//AbstractFigure"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//FigureDescriptor">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//FigureDescriptor/actualFigure"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//FigureDescriptor/accessors"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//ChildAccess">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgraph.ecore#//ChildAccess/owner"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//ChildAccess/accessor"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//ChildAccess/figure"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="gmfgraph.ecore#//RealFigure">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//RealFigure/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//RealFigure/children"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//FigureRef">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgraph.ecore#//FigureRef/figure"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//ConnectionFigure"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//DecorationFigure"/>
-    <genClasses image="false" ecoreClass="gmfgraph.ecore#//Shape">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Shape/outline"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Shape/fill"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Shape/lineWidth"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Shape/lineKind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Shape/xorFill"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Shape/xorOutline"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgraph.ecore#//Shape/resolvedChildren"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Label">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Label/text"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//LabeledContainer"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//VerticalLabel">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//VerticalLabel/text"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Rectangle"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//InvisibleRectangle"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//RoundedRectangle">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//RoundedRectangle/cornerWidth"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//RoundedRectangle/cornerHeight"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Ellipse"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//Polyline">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Polyline/template"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Polygon"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//ScalablePolygon"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//PolylineConnection">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgraph.ecore#//PolylineConnection/sourceDecoration"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgraph.ecore#//PolylineConnection/targetDecoration"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//PolylineDecoration"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//PolygonDecoration"/>
-    <genClasses image="false" ecoreClass="gmfgraph.ecore#//CustomAttributeOwner">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//CustomAttributeOwner/attributes"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomClass">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//CustomClass/qualifiedClassName"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomAttribute">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//CustomAttribute/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//CustomAttribute/value"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//CustomAttribute/directAccess"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//CustomAttribute/multiStatementValue"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//FigureAccessor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FigureAccessor/accessor"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//FigureAccessor/typedFigure"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomFigure">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//CustomFigure/customChildren"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomDecoration"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomConnection"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//Color"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//RGBColor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//RGBColor/red"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//RGBColor/green"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//RGBColor/blue"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//ConstantColor">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//ConstantColor/value"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Font"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//BasicFont">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//BasicFont/faceName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//BasicFont/height"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//BasicFont/style"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Point">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Point/x"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Point/y"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Dimension">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Dimension/dx"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Dimension/dy"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Insets">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Insets/top"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Insets/left"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Insets/bottom"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Insets/right"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Border"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//BorderRef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//BorderRef/actual"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//LineBorder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//LineBorder/color"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//LineBorder/width"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//MarginBorder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//MarginBorder/insets"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CompoundBorder">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//CompoundBorder/outer"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//CompoundBorder/inner"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomBorder"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//LayoutData">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfgraph.ecore#//LayoutData/owner"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomLayoutData"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//GridLayoutData">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayoutData/grabExcessHorizontalSpace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayoutData/grabExcessVerticalSpace"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayoutData/verticalAlignment"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayoutData/horizontalAlignment"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayoutData/verticalSpan"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayoutData/horizontalSpan"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayoutData/horizontalIndent"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//GridLayoutData/sizeHint"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//BorderLayoutData">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//BorderLayoutData/alignment"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//BorderLayoutData/vertical"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Layoutable">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Layoutable/layoutData"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//Layoutable/layout"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Layout"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//LayoutRef">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//LayoutRef/actual"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomLayout"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//GridLayout">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayout/numColumns"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//GridLayout/equalWidth"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//GridLayout/margins"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//GridLayout/spacing"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//BorderLayout">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//BorderLayout/spacing"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//FlowLayout">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FlowLayout/vertical"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FlowLayout/matchMinorSize"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FlowLayout/forceSingleLine"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FlowLayout/majorAlignment"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FlowLayout/minorAlignment"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FlowLayout/majorSpacing"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//FlowLayout/minorSpacing"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//XYLayout"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//XYLayoutData">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//XYLayoutData/topLeft"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//XYLayoutData/size"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//StackLayout"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//CenterLayout"/>
-    <genClasses ecoreClass="gmfgraph.ecore#//SVGFigure">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGFigure/documentURI"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//SVGFigure/properties"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//SVGFigure/areaOfInterest"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGFigure/noCanvasWidth"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGFigure/noCanvasHeight"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//SVGProperty">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGProperty/query"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGProperty/attribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGProperty/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGProperty/getter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGProperty/setter"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//SVGProperty/callSuper"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//Rectangle2D">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Rectangle2D/x"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Rectangle2D/y"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Rectangle2D/width"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//Rectangle2D/height"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="gmfgraph.ecore#//Pin">
-      <genOperations ecoreOperation="gmfgraph.ecore#//Pin/getOperationName"/>
-      <genOperations ecoreOperation="gmfgraph.ecore#//Pin/getOperationType"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//CustomPin">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//CustomPin/customOperationName"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//CustomPin/customOperationType"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//ColorPin">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgraph.ecore#//ColorPin/backgroundNotForeground"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfgraph.ecore#//VisiblePin"/>
-    <genClasses image="false" ecoreClass="gmfgraph.ecore#//PinOwner">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfgraph.ecore#//PinOwner/pins"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph_2006.ecore b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph_2006.ecore
deleted file mode 100644
index c43f456bf96..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph_2006.ecore
+++ /dev/null
@@ -1,469 +0,0 @@
-<?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="gmfgraph"
-    nsURI="http://www.eclipse.org/gmf/2005/GraphicalDefinition" nsPrefix="gmfgraph">
-  <eClassifiers xsi:type="ecore:EClass" name="Canvas" eSuperTypes="#//Identity">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figures" upperBound="-1"
-        eType="#//FigureGallery" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="containment here doesn't restrict nodes/connection from using figure galeries defined elsewhere. No assumption should be made whether or not node/connection figure is defined in the galery beloning to this canvas"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
-        eType="#//Node" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="connections" upperBound="-1"
-        eType="#//Connection" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
-        eType="#//Compartment" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="labels" upperBound="-1"
-        eType="#//DiagramLabel" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureGallery" eSuperTypes="#//Identity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Kind of explicit figure library notion. Bundle of figures. Allows to specify plugin id (allows importing it later from gmfgen code) in addition to figures"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figures" upperBound="-1"
-        eType="#//Figure" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="implementationBundle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Identity" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Easy and readable way to reference element of the model from another one"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        iD="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramElement" abstract="true" eSuperTypes="#//Identity">
-    <eOperations name="find" eType="#//VisualFacet">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="utility operation to get first visual facet assignable (in Java terms, {@link Class#isAssignableFrom(Class)}) to variables of designated class. Argument can't be null"/>
-      </eAnnotations>
-      <eParameters name="facetClass" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaClass"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figure" lowerBound="1"
-        eType="#//FigureHandle" eOpposite="#//FigureHandle/referencingElements"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="facets" upperBound="-1"
-        eType="#//VisualFacet" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="anything to further specify constraint or any other aspect of the element"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Node" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodeFigure" lowerBound="1"
-        eType="#//Figure" changeable="false" volatile="true" transient="true" derived="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specializes DiagramElement.figure"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="resizeConstraint" eType="#//Direction"
-        defaultValueLiteral="NSEW"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="affixedParentSide" eType="#//Direction"
-        defaultValueLiteral="NONE"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Connection" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="connectionFigure" lowerBound="1"
-        eType="#//Figure" changeable="false" volatile="true" transient="true" derived="true"
-        resolveProxies="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specializes DiagramElement.figure"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Compartment" eSuperTypes="#//DiagramElement">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="needsTitle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramLabel" eSuperTypes="#//Node">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="elementIcon" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VisualFacet" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GeneralFacet" eSuperTypes="#//VisualFacet">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="provide means to attach arbitrary data to your diagram element definition. It's up to you (template author) to process it somehow."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        iD="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="data" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AlignmentFacet" eSuperTypes="#//VisualFacet">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Makes sense for DiagramLabels of Links only (now). Constants from {@link org.eclipse.draw2d.ConnectionLocator} are: MIDDLE = Alignment.CENTER, TARGET = Alignment.END, SOURCE = Alignment.BEGINNING"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" eType="#//Alignment"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GradientFacet" eSuperTypes="#//VisualFacet">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="direction" eType="#//Direction"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LabelOffsetFacet" eSuperTypes="#//VisualFacet">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DefaultSizeFacet" eSuperTypes="#//VisualFacet">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="defaultSize" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureMarker" abstract="true" interface="true"
-      eSuperTypes="#//Layoutable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Anything you could combine visual representation from. Ordinary GEF figures, custom-defined or references to defined elsewhere."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parent" eType="#//Figure"
-        changeable="false" resolveProxies="false" eOpposite="#//Figure/children"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureHandle" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Entry in the figure's hierarchy to reference from diagram element"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencingElements" upperBound="-1"
-        eType="#//DiagramElement" eOpposite="#//DiagramElement/figure"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Figure" abstract="true" interface="true"
-      eSuperTypes="#//FigureMarker #//FigureHandle #//Identity">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Figure"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//FigureMarker" containment="true" eOpposite="#//FigureMarker/parent"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="foregroundColor" eType="#//Color"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="backgroundColor" eType="#//Color"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="maximumSize" eType="#//Dimension"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="minimumSize" eType="#//Dimension"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="preferredSize" eType="#//Dimension"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="font" eType="#//Font" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="insets" eType="#//Insets"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="border" eType="#//Border"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="location" eType="#//Point"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="size" eType="#//Point"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureRef" eSuperTypes="#//FigureMarker">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Need this to facilitate reuse of figures while keeping (so nice looking) containment relationship in the Figure class"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="figure" lowerBound="1"
-        eType="#//Figure">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="not FigureMarker because don't want to reference figure references."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConnectionFigure" abstract="true" interface="true"
-      eSuperTypes="#//Figure"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DecorationFigure" abstract="true" interface="true"
-      eSuperTypes="#//Figure"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Shape" abstract="true" eSuperTypes="#//Figure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Shape"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="outline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fill" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lineKind" eType="#//LineKind"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xorFill" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="xorOutline" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="resolvedChildren" upperBound="-1"
-        eType="#//Figure" changeable="false" volatile="true" transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Same as children, but resolves child FigureRefs, if any, to Figures"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Label" eSuperTypes="#//Figure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Label"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LabeledContainer" eSuperTypes="#//Figure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.LabeledContainer"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Rectangle" eSuperTypes="#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.RectangleFigure"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RoundedRectangle" eSuperTypes="#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.RoundedRectangle"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerWidth" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="8"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="cornerHeight" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="8"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Ellipse" eSuperTypes="#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Ellipse"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Polyline" eSuperTypes="#//Shape">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Polyline"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="template" upperBound="-1"
-        eType="#//Point" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Polygon" eSuperTypes="#//Polyline">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Polygon"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ScalablePolygon" eSuperTypes="#//Polygon">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Marker interface to denote polygons with ability to autoscale to fit all available bounds. Separate class is needed instead of property in the Polygon class because of generalization PolygonDecoration extends Polygon"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PolylineConnection" eSuperTypes="#//Polyline #//ConnectionFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.PolylineConnection"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceDecoration" eType="#//DecorationFigure"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="targetDecoration" eType="#//DecorationFigure"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PolylineDecoration" eSuperTypes="#//Polyline #//DecorationFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.PolylineDecoration"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PolygonDecoration" eSuperTypes="#//Polygon #//DecorationFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.PolygonDecoration"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomClass" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundleName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" upperBound="-1"
-        eType="#//CustomAttribute" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomAttribute">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="null"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="directAccess" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="multiStatementValue" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FigureAccessor" eSuperTypes="#//FigureHandle">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="accessor" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typedFigure" eType="#//CustomFigure"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomFigure" eSuperTypes="#//Figure #//CustomClass">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Any figure class provided by some bundle"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="customChildren" upperBound="-1"
-        eType="#//FigureAccessor" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomDecoration" eSuperTypes="#//CustomFigure #//DecorationFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Same as CustomFigure, but for Decorations"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomConnection" eSuperTypes="#//CustomFigure #//ConnectionFigure">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Same as CustomFigure, but for Connections"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Color" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="RGBColor" eSuperTypes="#//Color">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="red" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="green" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="blue" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ConstantColor" eSuperTypes="#//Color">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" lowerBound="1" eType="#//ColorConstants"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ColorConstants">
-    <eLiterals name="white"/>
-    <eLiterals name="black" value="1"/>
-    <eLiterals name="lightGray" value="2"/>
-    <eLiterals name="gray" value="3"/>
-    <eLiterals name="darkGray" value="4"/>
-    <eLiterals name="red" value="5"/>
-    <eLiterals name="orange" value="6"/>
-    <eLiterals name="yellow" value="7"/>
-    <eLiterals name="green" value="8"/>
-    <eLiterals name="lightGreen" value="9"/>
-    <eLiterals name="darkGreen" value="10"/>
-    <eLiterals name="cyan" value="11"/>
-    <eLiterals name="lightBlue" value="12"/>
-    <eLiterals name="blue" value="13"/>
-    <eLiterals name="darkBlue" value="14"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Font" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="BasicFont" eSuperTypes="#//Font">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="faceName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="9"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="#//FontStyle"
-        defaultValueLiteral="NORMAL"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="FontStyle">
-    <eLiterals name="NORMAL"/>
-    <eLiterals name="BOLD" value="1"/>
-    <eLiterals name="ITALIC" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Point">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="x" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="y" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Dimension">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dx" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="dy" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Insets">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="top" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="left" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bottom" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="right" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Border" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="LineBorder" eSuperTypes="#//Border">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="color" eType="#//Color"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="width" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="1"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MarginBorder" eSuperTypes="#//Border">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="insets" eType="#//Insets"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompoundBorder" eSuperTypes="#//Border">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="outer" eType="#//Border"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="inner" eType="#//Border"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomBorder" eSuperTypes="#//Border #//CustomClass"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="Direction">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Geographical bit constants from org.eclipse.draw2d.PositionConstants"/>
-    </eAnnotations>
-    <eLiterals name="NONE"/>
-    <eLiterals name="NORTH" value="1"/>
-    <eLiterals name="SOUTH" value="4"/>
-    <eLiterals name="WEST" value="8"/>
-    <eLiterals name="EAST" value="16"/>
-    <eLiterals name="NORTH_EAST" value="17"/>
-    <eLiterals name="NORTH_WEST" value="9"/>
-    <eLiterals name="SOUTH_EAST" value="20"/>
-    <eLiterals name="SOUTH_WEST" value="12"/>
-    <eLiterals name="NORTH_SOUTH" value="5"/>
-    <eLiterals name="EAST_WEST" value="24"/>
-    <eLiterals name="NSEW" value="29"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="LineKind">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="org.eclipse.draw2d.Graphics.LINE_* (== org.eclipse.swt.SWT.LINE_*. Values are same as SWT constants"/>
-    </eAnnotations>
-    <eLiterals name="LINE_SOLID" value="1"/>
-    <eLiterals name="LINE_DASH" value="2"/>
-    <eLiterals name="LINE_DOT" value="3"/>
-    <eLiterals name="LINE_DASHDOT" value="4"/>
-    <eLiterals name="LINE_DASHDOTDOT" value="5"/>
-    <eLiterals name="LINE_CUSTOM" value="6"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LayoutData" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="owner" lowerBound="1" eType="#//Layoutable"
-        eOpposite="#//Layoutable/layoutData"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomLayoutData" eSuperTypes="#//LayoutData #//CustomClass"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GridLayoutData" eSuperTypes="#//LayoutData">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="grabExcessHorizontalSpace"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="grabExcessVerticalSpace"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalAlignment" lowerBound="1"
-        eType="#//Alignment" defaultValueLiteral="CENTER"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalAlignment" lowerBound="1"
-        eType="#//Alignment" defaultValueLiteral="CENTER"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="verticalSpan" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalSpan" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="horizontalIndent" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sizeHint" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BorderLayoutData" eSuperTypes="#//LayoutData">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="alignment" lowerBound="1"
-        eType="#//Alignment" defaultValueLiteral="CENTER"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vertical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Alignment">
-    <eLiterals name="BEGINNING"/>
-    <eLiterals name="CENTER" value="1"/>
-    <eLiterals name="END" value="2"/>
-    <eLiterals name="FILL" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Layoutable" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="layoutData" eType="#//LayoutData"
-        containment="true" eOpposite="#//LayoutData/owner"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="layout" eType="#//Layout"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Layout" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="CustomLayout" eSuperTypes="#//Layout #//CustomClass"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GridLayout" eSuperTypes="#//Layout">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="numColumns" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" defaultValueLiteral="1"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="equalWidth" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" defaultValueLiteral="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="margins" eType="#//Dimension"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="spacing" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BorderLayout" eSuperTypes="#//Layout">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="spacing" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FlowLayout" eSuperTypes="#//Layout">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="vertical" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="matchMinorSize" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="forceSingleLine" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="majorAlignment" eType="#//Alignment"
-        defaultValueLiteral="BEGINNING"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minorAlignment" eType="#//Alignment"
-        defaultValueLiteral="BEGINNING"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="majorSpacing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="5"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="minorSpacing" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"
-        defaultValueLiteral="5"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="XYLayout" eSuperTypes="#//Layout"/>
-  <eClassifiers xsi:type="ecore:EClass" name="XYLayoutData" eSuperTypes="#//LayoutData">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="topLeft" lowerBound="1"
-        eType="#//Point" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="size" lowerBound="1" eType="#//Dimension"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StackLayout" eSuperTypes="#//Layout"/>
-</ecore:EPackage>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/stateDiagram.gmfgraph b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/stateDiagram.gmfgraph
deleted file mode 100644
index 827058e0cf8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/models/stateDiagram.gmfgraph
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gmfgraph:Canvas xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:gmfgraph="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition" name="StateDiagram Canvas">
-  <figures
-      name="ClassDiagram Figure Gallery">
-    <figures
-        xsi:type="gmfgraph:PolylineDecoration"
-        name="ArrowDecoration">
-      <template
-          x="-1"
-          y="1"/>
-      <template/>
-      <template
-          x="-1"
-          y="-1"/>
-    </figures>
-    <descriptors
-        name="RoundedRectangle">
-      <actualFigure
-          xsi:type="gmfgraph:RoundedRectangle"
-          cornerWidth="25"
-          cornerHeight="25">
-        <layout
-            xsi:type="gmfgraph:XYLayout"/>
-        <children
-            xsi:type="gmfgraph:Label"
-            name="RoundedRectangle_NameLabel"/>
-      </actualFigure>
-      <accessors
-          accessor="Name"
-          figure="//@figures.0/@descriptors.0/@actualFigure/@children.0"/>
-    </descriptors>
-    <descriptors
-        name="SimpleRectangle">
-      <actualFigure
-          xsi:type="gmfgraph:Rectangle"
-          lineKind="LINE_DASH">
-        <layout
-            xsi:type="gmfgraph:XYLayout"/>
-        <foregroundColor
-            xsi:type="gmfgraph:ConstantColor"
-            value="black"/>
-        <children
-            xsi:type="gmfgraph:Label"
-            name="SimpleRectangle_NameLabel"/>
-      </actualFigure>
-      <accessors
-          accessor="Name"
-          figure="//@figures.0/@descriptors.1/@actualFigure/@children.0"/>
-    </descriptors>
-    <descriptors
-        name="SolidLineWDstArrowFigure">
-      <actualFigure
-          xsi:type="gmfgraph:PolylineConnection"
-          targetDecoration="//@figures.0/@figures.0"/>
-    </descriptors>
-  </figures>
-  <nodes
-      name="StateMachine_Node"
-      figure="RoundedRectangle"/>
-  <nodes
-      name="Region"
-      figure="SimpleRectangle"/>
-  <nodes
-      name="State"
-      figure="RoundedRectangle"/>
-  <connections
-      name="SolidLineWDstArrow"
-      figure="SolidLineWDstArrowFigure"/>
-  <labels
-      name="StateMachine_Name"
-      figure="RoundedRectangle"
-      accessor="//@figures.0/@descriptors.0/@accessors.0"/>
-  <labels
-      name="Region_Name"
-      figure="SimpleRectangle"
-      accessor="//@figures.0/@descriptors.1/@accessors.0"/>
-  <labels
-      name="State_Name"
-      figure="RoundedRectangle"
-      accessor="//@figures.0/@descriptors.0/@accessors.0"/>
-</gmfgraph:Canvas>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/plugin.properties
deleted file mode 100644
index eff3382a8c4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/plugin.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-
-pluginName = Papyrus GMF Graphical Definition
-providerName = Eclipse Modeling Project
-
-contenttype.graph10=GMFGraph file (GMF 1.0)
-contenttype.graph=GMFGraph file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/plugin.xml
deleted file mode 100644
index 90ec3f44bf6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/plugin.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition" 
-       class = "org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage"
-       genModel = "models/gmfgraph.genmodel" /> 
-  </extension>
-
-  <extension
-        point="org.eclipse.emf.ecore.dynamic_package">
-     <resource
-           location="models/gmfgraph_2006.ecore"
-           uri="http://www.eclipse.org/gmf/2005/GraphicalDefinition">
-     </resource>
-  </extension>
-
-  <extension point="org.eclipse.team.core.fileTypes">
-    <fileTypes extension="gmfgraph" type="text" />
-  </extension>
-
-  <extension
-        point="org.eclipse.emf.ecore.content_parser">
-     <parser
-           class="org.eclipse.papyrus.gmf.internal.common.ToolingResourceFactory"
-           contentTypeIdentifier="org.eclipse.gmf.graph">
-     </parser>
-     <parser
-           class="org.eclipse.papyrus.gmf.internal.graphdef.util.MigrateFactory2005"
-           contentTypeIdentifier="org.eclipse.gmf.graph_1_0">
-     </parser>
-  </extension>
-
-  <extension
-        point="org.eclipse.core.contenttype.contentTypes">
-     <content-type
-           base-type="org.eclipse.emf.ecore.xmi"
-           file-extensions="gmfgraph"
-           id="org.eclipse.gmf.graph"
-           name="%contenttype.graph"
-           priority="normal">
-        <describer
-              class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-           <parameter
-                 name="namespace"
-                 value="http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition">
-           </parameter>
-           <parameter
-                 name="kind"
-                 value="xmi">
-           </parameter>
-        </describer>
-     </content-type>
-     <content-type
-           base-type="org.eclipse.emf.ecore.xmi"
-           file-extensions="gmfgraph"
-           id="org.eclipse.gmf.graph_1_0"
-           name="%contenttype.graph10"
-           priority="normal">
-        <describer
-              class="org.eclipse.emf.ecore.xmi.impl.RootXMLContentHandlerImpl$Describer">
-           <parameter
-                 name="namespace"
-                 value="http://www.eclipse.org/gmf/2005/GraphicalDefinition">
-           </parameter>
-           <parameter
-                 name="kind"
-                 value="xmi">
-           </parameter>
-        </describer>
-     </content-type>
-  </extension>
-
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/pom.xml
deleted file mode 100644
index 8a3ceef21f0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.graphdef</artifactId>
-	<version>2.9.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AbstractFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AbstractFigure.java
deleted file mode 100644
index 55013e77125..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AbstractFigure.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Figure</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is merely an implementation artifact to get only one base implementation of Figure attributes
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getAbstractFigure()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractFigure extends Figure {
-} // AbstractFigure
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AbstractNode.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AbstractNode.java
deleted file mode 100644
index 34ffde51b76..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AbstractNode.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Node</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getAbstractNode()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractNode extends DiagramElement {
-} // AbstractNode
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Alignment.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Alignment.java
deleted file mode 100644
index 39543a20219..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Alignment.java
+++ /dev/null
@@ -1,276 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Alignment</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getAlignment()
- * @model
- * @generated
- */
-public enum Alignment implements Enumerator
-{
-	/**
-	 * The '<em><b>BEGINNING</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BEGINNING
-	 * @generated
-	 * @ordered
-	 */
-	BEGINNING_LITERAL(0, "BEGINNING", "BEGINNING"),
-	/**
-	 * The '<em><b>CENTER</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CENTER
-	 * @generated
-	 * @ordered
-	 */
-	CENTER_LITERAL(1, "CENTER", "CENTER"),
-	/**
-	 * The '<em><b>END</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #END
-	 * @generated
-	 * @ordered
-	 */
-	END_LITERAL(2, "END", "END"),
-	/**
-	 * The '<em><b>FILL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FILL
-	 * @generated
-	 * @ordered
-	 */
-	FILL_LITERAL(3, "FILL", "FILL");
-	/**
-	 * The '<em><b>BEGINNING</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>BEGINNING</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BEGINNING_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BEGINNING = 0;
-
-	/**
-	 * The '<em><b>CENTER</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CENTER</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CENTER_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CENTER = 1;
-
-	/**
-	 * The '<em><b>END</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>END</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #END_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int END = 2;
-
-	/**
-	 * The '<em><b>FILL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FILL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FILL_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FILL = 3;
-
-	/**
-	 * An array of all the '<em><b>Alignment</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Alignment[] VALUES_ARRAY =
-		new Alignment[] {
-			BEGINNING_LITERAL,
-			CENTER_LITERAL,
-			END_LITERAL,
-			FILL_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Alignment</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Alignment> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Alignment</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Alignment get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Alignment result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Alignment</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Alignment getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Alignment result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Alignment</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Alignment get(int value) {
-		switch (value) {
-			case BEGINNING: return BEGINNING_LITERAL;
-			case CENTER: return CENTER_LITERAL;
-			case END: return END_LITERAL;
-			case FILL: return FILL_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Alignment(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AlignmentFacet.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AlignmentFacet.java
deleted file mode 100644
index 672ae424103..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/AlignmentFacet.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Alignment Facet</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Makes sense for DiagramLabels of Links only (now). Constants from {@link org.eclipse.draw2d.ConnectionLocator} are: MIDDLE = Alignment.CENTER, TARGET = Alignment.END, SOURCE = Alignment.BEGINNING
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet#getAlignment <em>Alignment</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getAlignmentFacet()
- * @model
- * @generated
- */
-public interface AlignmentFacet extends VisualFacet {
-	/**
-	 * Returns the value of the '<em><b>Alignment</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Alignment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Alignment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #setAlignment(Alignment)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getAlignmentFacet_Alignment()
-	 * @model
-	 * @generated
-	 */
-	Alignment getAlignment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet#getAlignment <em>Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #getAlignment()
-	 * @generated
-	 */
-	void setAlignment(Alignment value);
-
-} // AlignmentFacet
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BasicFont.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BasicFont.java
deleted file mode 100644
index 5e216395058..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BasicFont.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Basic Font</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getFaceName <em>Face Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getHeight <em>Height</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBasicFont()
- * @model
- * @generated
- */
-public interface BasicFont extends Font {
-	/**
-	 * Returns the value of the '<em><b>Face Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Face Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Face Name</em>' attribute.
-	 * @see #setFaceName(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBasicFont_FaceName()
-	 * @model
-	 * @generated
-	 */
-	String getFaceName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getFaceName <em>Face Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Face Name</em>' attribute.
-	 * @see #getFaceName()
-	 * @generated
-	 */
-	void setFaceName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Height</b></em>' attribute.
-	 * The default value is <code>"9"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Height</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Height</em>' attribute.
-	 * @see #setHeight(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBasicFont_Height()
-	 * @model default="9"
-	 * @generated
-	 */
-	int getHeight();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getHeight <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Height</em>' attribute.
-	 * @see #getHeight()
-	 * @generated
-	 */
-	void setHeight(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Style</b></em>' attribute.
-	 * The default value is <code>"NORMAL"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.FontStyle}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Style</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Style</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FontStyle
-	 * @see #setStyle(FontStyle)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBasicFont_Style()
-	 * @model default="NORMAL"
-	 * @generated
-	 */
-	FontStyle getStyle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FontStyle
-	 * @see #getStyle()
-	 * @generated
-	 */
-	void setStyle(FontStyle value);
-
-} // BasicFont
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Border.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Border.java
deleted file mode 100644
index 85d77fe5124..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Border.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Border</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBorder()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Border extends EObject {
-} // Border
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderLayout.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderLayout.java
deleted file mode 100644
index 87062b51d7f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderLayout.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Border Layout</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayout#getSpacing <em>Spacing</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBorderLayout()
- * @model
- * @generated
- */
-public interface BorderLayout extends Layout {
-	/**
-	 * Returns the value of the '<em><b>Spacing</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Spacing</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Spacing</em>' containment reference.
-	 * @see #setSpacing(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBorderLayout_Spacing()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Dimension getSpacing();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayout#getSpacing <em>Spacing</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Spacing</em>' containment reference.
-	 * @see #getSpacing()
-	 * @generated
-	 */
-	void setSpacing(Dimension value);
-
-} // BorderLayout
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderLayoutData.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderLayoutData.java
deleted file mode 100644
index be4be8cdb4c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderLayoutData.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Border Layout Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData#getAlignment <em>Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData#isVertical <em>Vertical</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBorderLayoutData()
- * @model
- * @generated
- */
-public interface BorderLayoutData extends LayoutData {
-	/**
-	 * Returns the value of the '<em><b>Alignment</b></em>' attribute.
-	 * The default value is <code>"CENTER"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Alignment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Alignment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #setAlignment(Alignment)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBorderLayoutData_Alignment()
-	 * @model default="CENTER" required="true"
-	 * @generated
-	 */
-	Alignment getAlignment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData#getAlignment <em>Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #getAlignment()
-	 * @generated
-	 */
-	void setAlignment(Alignment value);
-
-	/**
-	 * Returns the value of the '<em><b>Vertical</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Vertical</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Vertical</em>' attribute.
-	 * @see #setVertical(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBorderLayoutData_Vertical()
-	 * @model default="false"
-	 * @generated
-	 */
-	boolean isVertical();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData#isVertical <em>Vertical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Vertical</em>' attribute.
-	 * @see #isVertical()
-	 * @generated
-	 */
-	void setVertical(boolean value);
-
-} // BorderLayoutData
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderRef.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderRef.java
deleted file mode 100644
index a243144957e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/BorderRef.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Border Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Border reuse mechanism
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.BorderRef#getActual <em>Actual</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBorderRef()
- * @model
- * @generated
- */
-public interface BorderRef extends Border {
-	/**
-	 * Returns the value of the '<em><b>Actual</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * constraint: actual should not be another BorderRef
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual</em>' reference.
-	 * @see #setActual(Border)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getBorderRef_Actual()
-	 * @model required="true"
-	 * @generated
-	 */
-	Border getActual();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderRef#getActual <em>Actual</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual</em>' reference.
-	 * @see #getActual()
-	 * @generated
-	 */
-	void setActual(Border value);
-
-} // BorderRef
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Canvas.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Canvas.java
deleted file mode 100644
index 25ba9cabc64..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Canvas.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Canvas</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getFigures <em>Figures</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getNodes <em>Nodes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getConnections <em>Connections</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getCompartments <em>Compartments</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getLabels <em>Labels</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCanvas()
- * @model
- * @generated
- */
-public interface Canvas extends Identity {
-	/**
-	 * Returns the value of the '<em><b>Figures</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Figures</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * containment here doesn't restrict nodes/connection from using figure galeries defined elsewhere. No assumption should be made whether or not node/connection figure is defined in the galery beloning to this canvas
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Figures</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCanvas_Figures()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<FigureGallery> getFigures();
-
-	/**
-	 * Returns the value of the '<em><b>Nodes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Node}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nodes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Nodes</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCanvas_Nodes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Node> getNodes();
-
-	/**
-	 * Returns the value of the '<em><b>Connections</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Connection}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Connections</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Connections</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCanvas_Connections()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Connection> getConnections();
-
-	/**
-	 * Returns the value of the '<em><b>Compartments</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Compartment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Compartments</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Compartments</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCanvas_Compartments()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Compartment> getCompartments();
-
-	/**
-	 * Returns the value of the '<em><b>Labels</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Labels</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Labels</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCanvas_Labels()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<DiagramLabel> getLabels();
-
-} // Canvas
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CenterLayout.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CenterLayout.java
deleted file mode 100644
index 5792b8a544e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CenterLayout.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Center Layout</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCenterLayout()
- * @model
- * @generated
- */
-public interface CenterLayout extends Layout {
-} // CenterLayout
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ChildAccess.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ChildAccess.java
deleted file mode 100644
index ad8499df959..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ChildAccess.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Child Access</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getOwner <em>Owner</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getAccessor <em>Accessor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getFigure <em>Figure</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getChildAccess()
- * @model
- * @generated
- */
-public interface ChildAccess extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Owner</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getAccessors <em>Accessors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Owner</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owner</em>' container reference.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getChildAccess_Owner()
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getAccessors
-	 * @model opposite="accessors" resolveProxies="false" required="true" transient="false" changeable="false"
-	 * @generated
-	 */
-	FigureDescriptor getOwner();
-
-	/**
-	 * Returns the value of the '<em><b>Accessor</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Accessor</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Accessor</em>' attribute.
-	 * @see #setAccessor(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getChildAccess_Accessor()
-	 * @model
-	 * @generated
-	 */
-	String getAccessor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getAccessor <em>Accessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Accessor</em>' attribute.
-	 * @see #getAccessor()
-	 * @generated
-	 */
-	void setAccessor(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Figure</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This may also point to RealFigure from FigureAccessor#typedFigure
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Figure</em>' reference.
-	 * @see #setFigure(Figure)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getChildAccess_Figure()
-	 * @model required="true"
-	 * @generated
-	 */
-	Figure getFigure();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getFigure <em>Figure</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Figure</em>' reference.
-	 * @see #getFigure()
-	 * @generated
-	 */
-	void setFigure(Figure value);
-
-} // ChildAccess
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Color.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Color.java
deleted file mode 100644
index a68c5de3157..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Color.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Color</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getColor()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Color extends EObject {
-} // Color
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ColorConstants.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ColorConstants.java
deleted file mode 100644
index 85cc70f1ac1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ColorConstants.java
+++ /dev/null
@@ -1,562 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Color Constants</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getColorConstants()
- * @model
- * @generated
- */
-public enum ColorConstants implements Enumerator
-{
-	/**
-	 * The '<em><b>White</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #WHITE
-	 * @generated
-	 * @ordered
-	 */
-	WHITE_LITERAL(0, "white", "white"),
-	/**
-	 * The '<em><b>Black</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BLACK
-	 * @generated
-	 * @ordered
-	 */
-	BLACK_LITERAL(1, "black", "black"),
-	/**
-	 * The '<em><b>Light Gray</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LIGHT_GRAY
-	 * @generated
-	 * @ordered
-	 */
-	LIGHT_GRAY_LITERAL(2, "lightGray", "lightGray"),
-	/**
-	 * The '<em><b>Gray</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #GRAY
-	 * @generated
-	 * @ordered
-	 */
-	GRAY_LITERAL(3, "gray", "gray"),
-	/**
-	 * The '<em><b>Dark Gray</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DARK_GRAY
-	 * @generated
-	 * @ordered
-	 */
-	DARK_GRAY_LITERAL(4, "darkGray", "darkGray"),
-	/**
-	 * The '<em><b>Red</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #RED
-	 * @generated
-	 * @ordered
-	 */
-	RED_LITERAL(5, "red", "red"),
-	/**
-	 * The '<em><b>Orange</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ORANGE
-	 * @generated
-	 * @ordered
-	 */
-	ORANGE_LITERAL(6, "orange", "orange"),
-	/**
-	 * The '<em><b>Yellow</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #YELLOW
-	 * @generated
-	 * @ordered
-	 */
-	YELLOW_LITERAL(7, "yellow", "yellow"),
-	/**
-	 * The '<em><b>Green</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #GREEN
-	 * @generated
-	 * @ordered
-	 */
-	GREEN_LITERAL(8, "green", "green"),
-	/**
-	 * The '<em><b>Light Green</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LIGHT_GREEN
-	 * @generated
-	 * @ordered
-	 */
-	LIGHT_GREEN_LITERAL(9, "lightGreen", "lightGreen"),
-	/**
-	 * The '<em><b>Dark Green</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DARK_GREEN
-	 * @generated
-	 * @ordered
-	 */
-	DARK_GREEN_LITERAL(10, "darkGreen", "darkGreen"),
-	/**
-	 * The '<em><b>Cyan</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CYAN
-	 * @generated
-	 * @ordered
-	 */
-	CYAN_LITERAL(11, "cyan", "cyan"),
-	/**
-	 * The '<em><b>Light Blue</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LIGHT_BLUE
-	 * @generated
-	 * @ordered
-	 */
-	LIGHT_BLUE_LITERAL(12, "lightBlue", "lightBlue"),
-	/**
-	 * The '<em><b>Blue</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BLUE
-	 * @generated
-	 * @ordered
-	 */
-	BLUE_LITERAL(13, "blue", "blue"),
-	/**
-	 * The '<em><b>Dark Blue</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #DARK_BLUE
-	 * @generated
-	 * @ordered
-	 */
-	DARK_BLUE_LITERAL(14, "darkBlue", "darkBlue");
-	/**
-	 * The '<em><b>White</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>White</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #WHITE_LITERAL
-	 * @model name="white"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int WHITE = 0;
-
-	/**
-	 * The '<em><b>Black</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Black</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BLACK_LITERAL
-	 * @model name="black"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BLACK = 1;
-
-	/**
-	 * The '<em><b>Light Gray</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Light Gray</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LIGHT_GRAY_LITERAL
-	 * @model name="lightGray"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LIGHT_GRAY = 2;
-
-	/**
-	 * The '<em><b>Gray</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Gray</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #GRAY_LITERAL
-	 * @model name="gray"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GRAY = 3;
-
-	/**
-	 * The '<em><b>Dark Gray</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Dark Gray</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DARK_GRAY_LITERAL
-	 * @model name="darkGray"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DARK_GRAY = 4;
-
-	/**
-	 * The '<em><b>Red</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Red</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #RED_LITERAL
-	 * @model name="red"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int RED = 5;
-
-	/**
-	 * The '<em><b>Orange</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Orange</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ORANGE_LITERAL
-	 * @model name="orange"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ORANGE = 6;
-
-	/**
-	 * The '<em><b>Yellow</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Yellow</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #YELLOW_LITERAL
-	 * @model name="yellow"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int YELLOW = 7;
-
-	/**
-	 * The '<em><b>Green</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Green</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #GREEN_LITERAL
-	 * @model name="green"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int GREEN = 8;
-
-	/**
-	 * The '<em><b>Light Green</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Light Green</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LIGHT_GREEN_LITERAL
-	 * @model name="lightGreen"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LIGHT_GREEN = 9;
-
-	/**
-	 * The '<em><b>Dark Green</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Dark Green</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DARK_GREEN_LITERAL
-	 * @model name="darkGreen"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DARK_GREEN = 10;
-
-	/**
-	 * The '<em><b>Cyan</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Cyan</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CYAN_LITERAL
-	 * @model name="cyan"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CYAN = 11;
-
-	/**
-	 * The '<em><b>Light Blue</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Light Blue</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LIGHT_BLUE_LITERAL
-	 * @model name="lightBlue"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LIGHT_BLUE = 12;
-
-	/**
-	 * The '<em><b>Blue</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Blue</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BLUE_LITERAL
-	 * @model name="blue"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BLUE = 13;
-
-	/**
-	 * The '<em><b>Dark Blue</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Dark Blue</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #DARK_BLUE_LITERAL
-	 * @model name="darkBlue"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int DARK_BLUE = 14;
-
-	/**
-	 * An array of all the '<em><b>Color Constants</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ColorConstants[] VALUES_ARRAY =
-		new ColorConstants[] {
-			WHITE_LITERAL,
-			BLACK_LITERAL,
-			LIGHT_GRAY_LITERAL,
-			GRAY_LITERAL,
-			DARK_GRAY_LITERAL,
-			RED_LITERAL,
-			ORANGE_LITERAL,
-			YELLOW_LITERAL,
-			GREEN_LITERAL,
-			LIGHT_GREEN_LITERAL,
-			DARK_GREEN_LITERAL,
-			CYAN_LITERAL,
-			LIGHT_BLUE_LITERAL,
-			BLUE_LITERAL,
-			DARK_BLUE_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Color Constants</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ColorConstants> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Color Constants</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ColorConstants get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ColorConstants result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Color Constants</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ColorConstants getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ColorConstants result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Color Constants</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ColorConstants get(int value) {
-		switch (value) {
-			case WHITE: return WHITE_LITERAL;
-			case BLACK: return BLACK_LITERAL;
-			case LIGHT_GRAY: return LIGHT_GRAY_LITERAL;
-			case GRAY: return GRAY_LITERAL;
-			case DARK_GRAY: return DARK_GRAY_LITERAL;
-			case RED: return RED_LITERAL;
-			case ORANGE: return ORANGE_LITERAL;
-			case YELLOW: return YELLOW_LITERAL;
-			case GREEN: return GREEN_LITERAL;
-			case LIGHT_GREEN: return LIGHT_GREEN_LITERAL;
-			case DARK_GREEN: return DARK_GREEN_LITERAL;
-			case CYAN: return CYAN_LITERAL;
-			case LIGHT_BLUE: return LIGHT_BLUE_LITERAL;
-			case BLUE: return BLUE_LITERAL;
-			case DARK_BLUE: return DARK_BLUE_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ColorConstants(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ColorPin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ColorPin.java
deleted file mode 100644
index f36a7d99bfb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ColorPin.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Color Pin</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.ColorPin#isBackgroundNotForeground <em>Background Not Foreground</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getColorPin()
- * @model
- * @generated
- */
-public interface ColorPin extends Pin {
-	/**
-	 * Returns the value of the '<em><b>Background Not Foreground</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Background Not Foreground</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Background Not Foreground</em>' attribute.
-	 * @see #setBackgroundNotForeground(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getColorPin_BackgroundNotForeground()
-	 * @model
-	 * @generated
-	 */
-	boolean isBackgroundNotForeground();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.ColorPin#isBackgroundNotForeground <em>Background Not Foreground</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Background Not Foreground</em>' attribute.
-	 * @see #isBackgroundNotForeground()
-	 * @generated
-	 */
-	void setBackgroundNotForeground(boolean value);
-
-} // ColorPin
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Compartment.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Compartment.java
deleted file mode 100644
index 216bff5ea4f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Compartment.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Compartment</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#isCollapsible <em>Collapsible</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#isNeedsTitle <em>Needs Title</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#getAccessor <em>Accessor</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCompartment()
- * @model
- * @generated
- */
-public interface Compartment extends DiagramElement{
-	/**
-	 * Returns the value of the '<em><b>Collapsible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Collapsible</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Collapsible</em>' attribute.
-	 * @see #setCollapsible(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCompartment_Collapsible()
-	 * @model
-	 * @generated
-	 */
-	boolean isCollapsible();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#isCollapsible <em>Collapsible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Collapsible</em>' attribute.
-	 * @see #isCollapsible()
-	 * @generated
-	 */
-	void setCollapsible(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Needs Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Needs Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Needs Title</em>' attribute.
-	 * @see #setNeedsTitle(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCompartment_NeedsTitle()
-	 * @model
-	 * @generated
-	 */
-	boolean isNeedsTitle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#isNeedsTitle <em>Needs Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Needs Title</em>' attribute.
-	 * @see #isNeedsTitle()
-	 * @generated
-	 */
-	void setNeedsTitle(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Accessor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Accessor</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Accessor</em>' reference.
-	 * @see #setAccessor(ChildAccess)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCompartment_Accessor()
-	 * @model
-	 * @generated
-	 */
-	ChildAccess getAccessor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#getAccessor <em>Accessor</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Accessor</em>' reference.
-	 * @see #getAccessor()
-	 * @generated
-	 */
-	void setAccessor(ChildAccess value);
-
-} // Compartment
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CompoundBorder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CompoundBorder.java
deleted file mode 100644
index 404162ebac6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CompoundBorder.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Compound Border</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder#getOuter <em>Outer</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder#getInner <em>Inner</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCompoundBorder()
- * @model
- * @generated
- */
-public interface CompoundBorder extends Border {
-	/**
-	 * Returns the value of the '<em><b>Outer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Outer</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Outer</em>' containment reference.
-	 * @see #setOuter(Border)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCompoundBorder_Outer()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Border getOuter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder#getOuter <em>Outer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Outer</em>' containment reference.
-	 * @see #getOuter()
-	 * @generated
-	 */
-	void setOuter(Border value);
-
-	/**
-	 * Returns the value of the '<em><b>Inner</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Inner</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Inner</em>' containment reference.
-	 * @see #setInner(Border)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCompoundBorder_Inner()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Border getInner();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder#getInner <em>Inner</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Inner</em>' containment reference.
-	 * @see #getInner()
-	 * @generated
-	 */
-	void setInner(Border value);
-
-} // CompoundBorder
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Connection.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Connection.java
deleted file mode 100644
index 381b0ca1537..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Connection.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connection</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getConnection()
- * @model
- * @generated
- */
-public interface Connection extends DiagramElement {
-
-} // Connection
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ConnectionFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ConnectionFigure.java
deleted file mode 100644
index 9c71bb1290f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ConnectionFigure.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Connection Figure</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getConnectionFigure()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface ConnectionFigure extends RealFigure {
-} // ConnectionFigure
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ConstantColor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ConstantColor.java
deleted file mode 100644
index 8af9f588a8e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ConstantColor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constant Color</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.ConstantColor#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getConstantColor()
- * @model
- * @generated
- */
-public interface ConstantColor extends Color {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.ColorConstants}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ColorConstants
-	 * @see #setValue(ColorConstants)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getConstantColor_Value()
-	 * @model required="true"
-	 * @generated
-	 */
-	ColorConstants getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.ConstantColor#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ColorConstants
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(ColorConstants value);
-
-} // ConstantColor
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomAttribute.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomAttribute.java
deleted file mode 100644
index 32408ecb18d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomAttribute.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Attribute</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#isDirectAccess <em>Direct Access</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#isMultiStatementValue <em>Multi Statement Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute()
- * @model
- * @generated
- */
-public interface CustomAttribute extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_Name()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * The default value is <code>"null"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_Value()
-	 * @model default="null" required="true"
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Direct Access</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Direct Access</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Direct Access</em>' attribute.
-	 * @see #setDirectAccess(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_DirectAccess()
-	 * @model default="false" required="true"
-	 * @generated
-	 */
-	boolean isDirectAccess();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#isDirectAccess <em>Direct Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Direct Access</em>' attribute.
-	 * @see #isDirectAccess()
-	 * @generated
-	 */
-	void setDirectAccess(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Multi Statement Value</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multi Statement Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Multi Statement Value</em>' attribute.
-	 * @see #setMultiStatementValue(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomAttribute_MultiStatementValue()
-	 * @model default="false" required="true"
-	 * @generated
-	 */
-	boolean isMultiStatementValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#isMultiStatementValue <em>Multi Statement Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multi Statement Value</em>' attribute.
-	 * @see #isMultiStatementValue()
-	 * @generated
-	 */
-	void setMultiStatementValue(boolean value);
-
-} // CustomAttribute
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomAttributeOwner.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomAttributeOwner.java
deleted file mode 100644
index c9269528f6d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomAttributeOwner.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Attribute Owner</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner#getAttributes <em>Attributes</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomAttributeOwner()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface CustomAttributeOwner extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Attributes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attributes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attributes</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomAttributeOwner_Attributes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<CustomAttribute> getAttributes();
-
-} // CustomAttributeOwner
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomBorder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomBorder.java
deleted file mode 100644
index 3426412732a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomBorder.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Border</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomBorder()
- * @model
- * @generated
- */
-public interface CustomBorder extends Border, CustomClass {
-} // CustomBorder
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomClass.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomClass.java
deleted file mode 100644
index 430b9aba1f3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomClass.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Class</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomClass#getQualifiedClassName <em>Qualified Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomClass()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface CustomClass extends CustomAttributeOwner {
-	/**
-	 * Returns the value of the '<em><b>Qualified Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Qualified Class Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Qualified Class Name</em>' attribute.
-	 * @see #setQualifiedClassName(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomClass_QualifiedClassName()
-	 * @model
-	 * @generated
-	 */
-	String getQualifiedClassName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomClass#getQualifiedClassName <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Qualified Class Name</em>' attribute.
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 */
-	void setQualifiedClassName(String value);
-
-} // CustomClass
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomConnection.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomConnection.java
deleted file mode 100644
index 02d57bedb5b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomConnection.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Connection</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Same as CustomFigure, but for Connections
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomConnection()
- * @model
- * @generated
- */
-public interface CustomConnection extends CustomFigure, ConnectionFigure {
-} // CustomConnection
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomDecoration.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomDecoration.java
deleted file mode 100644
index fc19645816c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomDecoration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Decoration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Same as CustomFigure, but for Decorations
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomDecoration()
- * @model
- * @generated
- */
-public interface CustomDecoration extends CustomFigure, DecorationFigure {
-} // CustomDecoration
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomFigure.java
deleted file mode 100644
index 0da5fa0e0ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomFigure.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Figure</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Any figure class provided by some bundle
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomFigure#getCustomChildren <em>Custom Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomFigure()
- * @model
- * @generated
- */
-public interface CustomFigure extends RealFigure, CustomClass {
-	/**
-	 * Returns the value of the '<em><b>Custom Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Custom Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Childrent enumerated with this feature are mere 'access points' to actual structure of the CustomFigure. They are not created, unlike those contained in regular Figure#children
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Custom Children</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomFigure_CustomChildren()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<FigureAccessor> getCustomChildren();
-
-} // CustomFigure
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomLayout.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomLayout.java
deleted file mode 100644
index 1d7d37e621a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomLayout.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Layout</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomLayout()
- * @model
- * @generated
- */
-public interface CustomLayout extends Layout, CustomClass {
-} // CustomLayout
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomLayoutData.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomLayoutData.java
deleted file mode 100644
index 03cf1202ec8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomLayoutData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Layout Data</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomLayoutData()
- * @model
- * @generated
- */
-public interface CustomLayoutData extends LayoutData, CustomClass {
-} // CustomLayoutData
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomPin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomPin.java
deleted file mode 100644
index dbdbf2c418c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/CustomPin.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Custom Pin</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin#getCustomOperationName <em>Custom Operation Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin#getCustomOperationType <em>Custom Operation Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomPin()
- * @model
- * @generated
- */
-public interface CustomPin extends Pin {
-	/**
-	 * Returns the value of the '<em><b>Custom Operation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Custom Operation Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Custom Operation Name</em>' attribute.
-	 * @see #setCustomOperationName(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomPin_CustomOperationName()
-	 * @model
-	 * @generated
-	 */
-	String getCustomOperationName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin#getCustomOperationName <em>Custom Operation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Custom Operation Name</em>' attribute.
-	 * @see #getCustomOperationName()
-	 * @generated
-	 */
-	void setCustomOperationName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Custom Operation Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Custom Operation Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Custom Operation Type</em>' attribute.
-	 * @see #setCustomOperationType(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getCustomPin_CustomOperationType()
-	 * @model
-	 * @generated
-	 */
-	String getCustomOperationType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin#getCustomOperationType <em>Custom Operation Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Custom Operation Type</em>' attribute.
-	 * @see #getCustomOperationType()
-	 * @generated
-	 */
-	void setCustomOperationType(String value);
-
-} // CustomPin
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DecorationFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DecorationFigure.java
deleted file mode 100644
index 662e0124110..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DecorationFigure.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Decoration Figure</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDecorationFigure()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface DecorationFigure extends RealFigure {
-} // DecorationFigure
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DefaultSizeFacet.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DefaultSizeFacet.java
deleted file mode 100644
index 4e98282093e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DefaultSizeFacet.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Default Size Facet</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet#getDefaultSize <em>Default Size</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDefaultSizeFacet()
- * @model
- * @generated
- */
-public interface DefaultSizeFacet extends VisualFacet {
-	/**
-	 * Returns the value of the '<em><b>Default Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Size</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Size</em>' containment reference.
-	 * @see #setDefaultSize(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDefaultSizeFacet_DefaultSize()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Dimension getDefaultSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet#getDefaultSize <em>Default Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Size</em>' containment reference.
-	 * @see #getDefaultSize()
-	 * @generated
-	 */
-	void setDefaultSize(Dimension value);
-
-} // DefaultSizeFacet
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DiagramElement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DiagramElement.java
deleted file mode 100644
index 64062ed03c9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DiagramElement.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram Element</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramElement#getFigure <em>Figure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramElement#getFacets <em>Facets</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDiagramElement()
- * @model abstract="true"
- * @generated
- */
-public interface DiagramElement extends Identity {
-	/**
-	 * Returns the value of the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Figure</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Figure</em>' reference.
-	 * @see #setFigure(FigureDescriptor)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDiagramElement_Figure()
-	 * @model required="true"
-	 * @generated
-	 */
-	FigureDescriptor getFigure();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramElement#getFigure <em>Figure</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Figure</em>' reference.
-	 * @see #getFigure()
-	 * @generated
-	 */
-	void setFigure(FigureDescriptor value);
-
-	/**
-	 * Returns the value of the '<em><b>Facets</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.VisualFacet}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * anything to further specify constraint or any other aspect of the element
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Facets</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDiagramElement_Facets()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<VisualFacet> getFacets();
-
-} // DiagramElement
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DiagramLabel.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DiagramLabel.java
deleted file mode 100644
index 041c8dc1852..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/DiagramLabel.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram Label</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#isElementIcon <em>Element Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#getAccessor <em>Accessor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#getContainer <em>Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#isExternal <em>External</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDiagramLabel()
- * @model
- * @generated
- */
-public interface DiagramLabel extends Node {
-	/**
-	 * Returns the value of the '<em><b>Element Icon</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element Icon</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Element Icon</em>' attribute.
-	 * @see #setElementIcon(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDiagramLabel_ElementIcon()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isElementIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#isElementIcon <em>Element Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element Icon</em>' attribute.
-	 * @see #isElementIcon()
-	 * @generated
-	 */
-	void setElementIcon(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Accessor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Accessor</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Accessor</em>' reference.
-	 * @see #setAccessor(ChildAccess)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDiagramLabel_Accessor()
-	 * @model
-	 * @generated
-	 */
-	ChildAccess getAccessor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#getAccessor <em>Accessor</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Accessor</em>' reference.
-	 * @see #getAccessor()
-	 * @generated
-	 */
-	void setAccessor(ChildAccess value);
-
-	/**
-	 * Returns the value of the '<em><b>Container</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Container</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Container</em>' reference.
-	 * @see #setContainer(ChildAccess)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDiagramLabel_Container()
-	 * @model
-	 * @generated
-	 */
-	ChildAccess getContainer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#getContainer <em>Container</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container</em>' reference.
-	 * @see #getContainer()
-	 * @generated
-	 */
-	void setContainer(ChildAccess value);
-
-	/**
-	 * Returns the value of the '<em><b>External</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>External</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>External</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDiagramLabel_External()
-	 * @model transient="true" changeable="false" volatile="true" derived="true"
-	 * @generated
-	 */
-	boolean isExternal();
-
-} // DiagramLabel
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Dimension.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Dimension.java
deleted file mode 100644
index 8d18e4d7e38..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Dimension.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Dimension</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Dimension#getDx <em>Dx</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Dimension#getDy <em>Dy</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDimension()
- * @model
- * @generated
- */
-public interface Dimension extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Dx</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Dx</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Dx</em>' attribute.
-	 * @see #setDx(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDimension_Dx()
-	 * @model
-	 * @generated
-	 */
-	int getDx();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Dimension#getDx <em>Dx</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Dx</em>' attribute.
-	 * @see #getDx()
-	 * @generated
-	 */
-	void setDx(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Dy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Dy</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Dy</em>' attribute.
-	 * @see #setDy(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDimension_Dy()
-	 * @model
-	 * @generated
-	 */
-	int getDy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Dimension#getDy <em>Dy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Dy</em>' attribute.
-	 * @see #getDy()
-	 * @generated
-	 */
-	void setDy(int value);
-
-} // Dimension
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Direction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Direction.java
deleted file mode 100644
index b9ac55b9586..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Direction.java
+++ /dev/null
@@ -1,487 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Direction</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * Geographical bit constants from org.eclipse.draw2d.PositionConstants
- * <!-- end-model-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getDirection()
- * @model
- * @generated
- */
-public enum Direction implements Enumerator
-{
-	/**
-	 * The '<em><b>NONE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE
-	 * @generated
-	 * @ordered
-	 */
-	NONE_LITERAL(0, "NONE", "NONE"),
-	/**
-	 * The '<em><b>NORTH</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NORTH
-	 * @generated
-	 * @ordered
-	 */
-	NORTH_LITERAL(1, "NORTH", "NORTH"),
-	/**
-	 * The '<em><b>SOUTH</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SOUTH
-	 * @generated
-	 * @ordered
-	 */
-	SOUTH_LITERAL(4, "SOUTH", "SOUTH"),
-	/**
-	 * The '<em><b>WEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #WEST
-	 * @generated
-	 * @ordered
-	 */
-	WEST_LITERAL(8, "WEST", "WEST"),
-	/**
-	 * The '<em><b>EAST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EAST
-	 * @generated
-	 * @ordered
-	 */
-	EAST_LITERAL(16, "EAST", "EAST"),
-	/**
-	 * The '<em><b>NORTH EAST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NORTH_EAST
-	 * @generated
-	 * @ordered
-	 */
-	NORTH_EAST_LITERAL(17, "NORTH_EAST", "NORTH_EAST"),
-	/**
-	 * The '<em><b>NORTH WEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NORTH_WEST
-	 * @generated
-	 * @ordered
-	 */
-	NORTH_WEST_LITERAL(9, "NORTH_WEST", "NORTH_WEST"),
-	/**
-	 * The '<em><b>SOUTH EAST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SOUTH_EAST
-	 * @generated
-	 * @ordered
-	 */
-	SOUTH_EAST_LITERAL(20, "SOUTH_EAST", "SOUTH_EAST"),
-	/**
-	 * The '<em><b>SOUTH WEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SOUTH_WEST
-	 * @generated
-	 * @ordered
-	 */
-	SOUTH_WEST_LITERAL(12, "SOUTH_WEST", "SOUTH_WEST"),
-	/**
-	 * The '<em><b>NORTH SOUTH</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NORTH_SOUTH
-	 * @generated
-	 * @ordered
-	 */
-	NORTH_SOUTH_LITERAL(5, "NORTH_SOUTH", "NORTH_SOUTH"),
-	/**
-	 * The '<em><b>EAST WEST</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #EAST_WEST
-	 * @generated
-	 * @ordered
-	 */
-	EAST_WEST_LITERAL(24, "EAST_WEST", "EAST_WEST"),
-	/**
-	 * The '<em><b>NSEW</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NSEW
-	 * @generated
-	 * @ordered
-	 */
-	NSEW_LITERAL(29, "NSEW", "NSEW");
-	/**
-	 * The '<em><b>NONE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NONE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NONE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NONE = 0;
-
-	/**
-	 * The '<em><b>NORTH</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NORTH</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NORTH_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NORTH = 1;
-
-	/**
-	 * The '<em><b>SOUTH</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SOUTH</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SOUTH_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SOUTH = 4;
-
-	/**
-	 * The '<em><b>WEST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>WEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #WEST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int WEST = 8;
-
-	/**
-	 * The '<em><b>EAST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EAST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EAST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EAST = 16;
-
-	/**
-	 * The '<em><b>NORTH EAST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NORTH EAST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NORTH_EAST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NORTH_EAST = 17;
-
-	/**
-	 * The '<em><b>NORTH WEST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NORTH WEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NORTH_WEST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NORTH_WEST = 9;
-
-	/**
-	 * The '<em><b>SOUTH EAST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SOUTH EAST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SOUTH_EAST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SOUTH_EAST = 20;
-
-	/**
-	 * The '<em><b>SOUTH WEST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SOUTH WEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SOUTH_WEST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SOUTH_WEST = 12;
-
-	/**
-	 * The '<em><b>NORTH SOUTH</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NORTH SOUTH</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NORTH_SOUTH_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NORTH_SOUTH = 5;
-
-	/**
-	 * The '<em><b>EAST WEST</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>EAST WEST</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #EAST_WEST_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int EAST_WEST = 24;
-
-	/**
-	 * The '<em><b>NSEW</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NSEW</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NSEW_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NSEW = 29;
-
-	/**
-	 * An array of all the '<em><b>Direction</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Direction[] VALUES_ARRAY =
-		new Direction[] {
-			NONE_LITERAL,
-			NORTH_LITERAL,
-			SOUTH_LITERAL,
-			WEST_LITERAL,
-			EAST_LITERAL,
-			NORTH_EAST_LITERAL,
-			NORTH_WEST_LITERAL,
-			SOUTH_EAST_LITERAL,
-			SOUTH_WEST_LITERAL,
-			NORTH_SOUTH_LITERAL,
-			EAST_WEST_LITERAL,
-			NSEW_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Direction</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Direction> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Direction</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Direction get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Direction result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Direction</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Direction getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Direction result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Direction</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Direction get(int value) {
-		switch (value) {
-			case NONE: return NONE_LITERAL;
-			case NORTH: return NORTH_LITERAL;
-			case SOUTH: return SOUTH_LITERAL;
-			case WEST: return WEST_LITERAL;
-			case EAST: return EAST_LITERAL;
-			case NORTH_EAST: return NORTH_EAST_LITERAL;
-			case NORTH_WEST: return NORTH_WEST_LITERAL;
-			case SOUTH_EAST: return SOUTH_EAST_LITERAL;
-			case SOUTH_WEST: return SOUTH_WEST_LITERAL;
-			case NORTH_SOUTH: return NORTH_SOUTH_LITERAL;
-			case EAST_WEST: return EAST_WEST_LITERAL;
-			case NSEW: return NSEW_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Direction(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Ellipse.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Ellipse.java
deleted file mode 100644
index 53e14b5fe10..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Ellipse.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ellipse</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.Ellipse
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getEllipse()
- * @model
- * @generated
- */
-public interface Ellipse extends Shape {
-} // Ellipse
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Figure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Figure.java
deleted file mode 100644
index 217dddbc8b0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Figure.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Figure</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Anything you could combine visual representation from. Ordinary GEF figures, custom-defined or references to defined elsewhere. org.eclipse.draw2d.Figure
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getDescriptor <em>Descriptor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getForegroundColor <em>Foreground Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getBackgroundColor <em>Background Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getMaximumSize <em>Maximum Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getMinimumSize <em>Minimum Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getPreferredSize <em>Preferred Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getFont <em>Font</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getInsets <em>Insets</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getBorder <em>Border</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getSize <em>Size</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Figure extends Layoutable {
-	/**
-	 * Returns the value of the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptor</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptor</em>' reference.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_Descriptor()
-	 * @model resolveProxies="false" transient="true" changeable="false" volatile="true" derived="true"
-	 * @generated
-	 */
-	FigureDescriptor getDescriptor();
-
-	/**
-	 * Returns the value of the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Foreground Color</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Foreground Color</em>' containment reference.
-	 * @see #setForegroundColor(Color)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_ForegroundColor()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Color getForegroundColor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getForegroundColor <em>Foreground Color</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Foreground Color</em>' containment reference.
-	 * @see #getForegroundColor()
-	 * @generated
-	 */
-	void setForegroundColor(Color value);
-
-	/**
-	 * Returns the value of the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Background Color</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Background Color</em>' containment reference.
-	 * @see #setBackgroundColor(Color)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_BackgroundColor()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Color getBackgroundColor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getBackgroundColor <em>Background Color</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Background Color</em>' containment reference.
-	 * @see #getBackgroundColor()
-	 * @generated
-	 */
-	void setBackgroundColor(Color value);
-
-	/**
-	 * Returns the value of the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Maximum Size</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Maximum Size</em>' containment reference.
-	 * @see #setMaximumSize(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_MaximumSize()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Dimension getMaximumSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getMaximumSize <em>Maximum Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Maximum Size</em>' containment reference.
-	 * @see #getMaximumSize()
-	 * @generated
-	 */
-	void setMaximumSize(Dimension value);
-
-	/**
-	 * Returns the value of the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Minimum Size</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Minimum Size</em>' containment reference.
-	 * @see #setMinimumSize(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_MinimumSize()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Dimension getMinimumSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getMinimumSize <em>Minimum Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minimum Size</em>' containment reference.
-	 * @see #getMinimumSize()
-	 * @generated
-	 */
-	void setMinimumSize(Dimension value);
-
-	/**
-	 * Returns the value of the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Preferred Size</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Preferred Size</em>' containment reference.
-	 * @see #setPreferredSize(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_PreferredSize()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Dimension getPreferredSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getPreferredSize <em>Preferred Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Preferred Size</em>' containment reference.
-	 * @see #getPreferredSize()
-	 * @generated
-	 */
-	void setPreferredSize(Dimension value);
-
-	/**
-	 * Returns the value of the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Font</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Font</em>' containment reference.
-	 * @see #setFont(Font)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_Font()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Font getFont();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getFont <em>Font</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Font</em>' containment reference.
-	 * @see #getFont()
-	 * @generated
-	 */
-	void setFont(Font value);
-
-	/**
-	 * Returns the value of the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Insets</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Insets</em>' containment reference.
-	 * @see #setInsets(Insets)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_Insets()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Insets getInsets();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getInsets <em>Insets</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Insets</em>' containment reference.
-	 * @see #getInsets()
-	 * @generated
-	 */
-	void setInsets(Insets value);
-
-	/**
-	 * Returns the value of the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Border</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Border</em>' containment reference.
-	 * @see #setBorder(Border)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_Border()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Border getBorder();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getBorder <em>Border</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Border</em>' containment reference.
-	 * @see #getBorder()
-	 * @generated
-	 */
-	void setBorder(Border value);
-
-	/**
-	 * Returns the value of the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Location</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Location</em>' containment reference.
-	 * @see #setLocation(Point)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_Location()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Point getLocation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getLocation <em>Location</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Location</em>' containment reference.
-	 * @see #getLocation()
-	 * @generated
-	 */
-	void setLocation(Point value);
-
-	/**
-	 * Returns the value of the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Size</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Size</em>' containment reference.
-	 * @see #setSize(Point)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigure_Size()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Point getSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getSize <em>Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Size</em>' containment reference.
-	 * @see #getSize()
-	 * @generated
-	 */
-	void setSize(Point value);
-
-} // Figure
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureAccessor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureAccessor.java
deleted file mode 100644
index f744aea85fc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureAccessor.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Figure Accessor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor#getAccessor <em>Accessor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor#getTypedFigure <em>Typed Figure</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureAccessor()
- * @model
- * @generated
- */
-public interface FigureAccessor extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Accessor</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Accessor</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Accessor</em>' attribute.
-	 * @see #setAccessor(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureAccessor_Accessor()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getAccessor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor#getAccessor <em>Accessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Accessor</em>' attribute.
-	 * @see #getAccessor()
-	 * @generated
-	 */
-	void setAccessor(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Typed Figure</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Typed Figure</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Typed Figure</em>' containment reference.
-	 * @see #setTypedFigure(RealFigure)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureAccessor_TypedFigure()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	RealFigure getTypedFigure();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor#getTypedFigure <em>Typed Figure</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Typed Figure</em>' containment reference.
-	 * @see #getTypedFigure()
-	 * @generated
-	 */
-	void setTypedFigure(RealFigure value);
-
-} // FigureAccessor
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureDescriptor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureDescriptor.java
deleted file mode 100644
index f0b39fc9845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureDescriptor.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Figure Descriptor</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * The thing describes structure of a figure
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getActualFigure <em>Actual Figure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getAccessors <em>Accessors</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureDescriptor()
- * @model
- * @generated
- */
-public interface FigureDescriptor extends Identity {
-	/**
-	 * Returns the value of the '<em><b>Actual Figure</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Actual Figure</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Actual Figure</em>' containment reference.
-	 * @see #setActualFigure(Figure)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureDescriptor_ActualFigure()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Figure getActualFigure();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getActualFigure <em>Actual Figure</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual Figure</em>' containment reference.
-	 * @see #getActualFigure()
-	 * @generated
-	 */
-	void setActualFigure(Figure value);
-
-	/**
-	 * Returns the value of the '<em><b>Accessors</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getOwner <em>Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Accessors</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Accessors</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureDescriptor_Accessors()
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getOwner
-	 * @model opposite="owner" containment="true"
-	 * @generated
-	 */
-	EList<ChildAccess> getAccessors();
-
-} // FigureDescriptor
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureGallery.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureGallery.java
deleted file mode 100644
index a7a2c6a4030..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureGallery.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Figure Gallery</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Kind of explicit figure library notion. Bundle of figures. Allows to specify plugin id (allows importing it later from gmfgen code) in addition to figures
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getFigures <em>Figures</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getDescriptors <em>Descriptors</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getBorders <em>Borders</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getLayouts <em>Layouts</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getImplementationBundle <em>Implementation Bundle</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureGallery()
- * @model
- * @generated
- */
-public interface FigureGallery extends Identity {
-	/**
-	 * Returns the value of the '<em><b>Figures</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Figures</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Figures</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureGallery_Figures()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<RealFigure> getFigures();
-
-	/**
-	 * Returns the value of the '<em><b>Descriptors</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Descriptors</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Descriptors</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureGallery_Descriptors()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<FigureDescriptor> getDescriptors();
-
-	/**
-	 * Returns the value of the '<em><b>Borders</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Border}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Borders for reuse
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Borders</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureGallery_Borders()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Border> getBorders();
-
-	/**
-	 * Returns the value of the '<em><b>Layouts</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Layout}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Layouts for reuse
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Layouts</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureGallery_Layouts()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Layout> getLayouts();
-
-	/**
-	 * Returns the value of the '<em><b>Implementation Bundle</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Implementation Bundle</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Implementation Bundle</em>' attribute.
-	 * @see #setImplementationBundle(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureGallery_ImplementationBundle()
-	 * @model
-	 * @generated
-	 */
-	String getImplementationBundle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getImplementationBundle <em>Implementation Bundle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Implementation Bundle</em>' attribute.
-	 * @see #getImplementationBundle()
-	 * @generated
-	 */
-	void setImplementationBundle(String value);
-
-} // FigureGallery
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureRef.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureRef.java
deleted file mode 100644
index 4e27deca126..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FigureRef.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Figure Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Need this to facilitate reuse of figures while keeping (so nice looking) containment relationship in the Figure class
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FigureRef#getFigure <em>Figure</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureRef()
- * @model
- * @generated
- */
-public interface FigureRef extends AbstractFigure {
-	/**
-	 * Returns the value of the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * not just Figure because don't want to reference figure references.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Figure</em>' reference.
-	 * @see #setFigure(RealFigure)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFigureRef_Figure()
-	 * @model required="true"
-	 * @generated
-	 */
-	RealFigure getFigure();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureRef#getFigure <em>Figure</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Figure</em>' reference.
-	 * @see #getFigure()
-	 * @generated
-	 */
-	void setFigure(RealFigure value);
-
-} // FigureRef
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FlowLayout.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FlowLayout.java
deleted file mode 100644
index e6331bd6451..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FlowLayout.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Flow Layout</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isVertical <em>Vertical</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isMatchMinorSize <em>Match Minor Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isForceSingleLine <em>Force Single Line</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMajorAlignment <em>Major Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMinorAlignment <em>Minor Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMajorSpacing <em>Major Spacing</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMinorSpacing <em>Minor Spacing</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFlowLayout()
- * @model
- * @generated
- */
-public interface FlowLayout extends Layout {
-	/**
-	 * Returns the value of the '<em><b>Vertical</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Vertical</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Vertical</em>' attribute.
-	 * @see #setVertical(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_Vertical()
-	 * @model default="false"
-	 * @generated
-	 */
-	boolean isVertical();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isVertical <em>Vertical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Vertical</em>' attribute.
-	 * @see #isVertical()
-	 * @generated
-	 */
-	void setVertical(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Match Minor Size</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Match Minor Size</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Match Minor Size</em>' attribute.
-	 * @see #setMatchMinorSize(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MatchMinorSize()
-	 * @model default="false"
-	 * @generated
-	 */
-	boolean isMatchMinorSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isMatchMinorSize <em>Match Minor Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Match Minor Size</em>' attribute.
-	 * @see #isMatchMinorSize()
-	 * @generated
-	 */
-	void setMatchMinorSize(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Force Single Line</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Force Single Line</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Force Single Line</em>' attribute.
-	 * @see #setForceSingleLine(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_ForceSingleLine()
-	 * @model default="false"
-	 * @generated
-	 */
-	boolean isForceSingleLine();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isForceSingleLine <em>Force Single Line</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Force Single Line</em>' attribute.
-	 * @see #isForceSingleLine()
-	 * @generated
-	 */
-	void setForceSingleLine(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Major Alignment</b></em>' attribute.
-	 * The default value is <code>"BEGINNING"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Alignment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Major Alignment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Major Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #setMajorAlignment(Alignment)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MajorAlignment()
-	 * @model default="BEGINNING"
-	 * @generated
-	 */
-	Alignment getMajorAlignment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMajorAlignment <em>Major Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Major Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #getMajorAlignment()
-	 * @generated
-	 */
-	void setMajorAlignment(Alignment value);
-
-	/**
-	 * Returns the value of the '<em><b>Minor Alignment</b></em>' attribute.
-	 * The default value is <code>"BEGINNING"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Alignment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Minor Alignment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Minor Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #setMinorAlignment(Alignment)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MinorAlignment()
-	 * @model default="BEGINNING"
-	 * @generated
-	 */
-	Alignment getMinorAlignment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMinorAlignment <em>Minor Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minor Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #getMinorAlignment()
-	 * @generated
-	 */
-	void setMinorAlignment(Alignment value);
-
-	/**
-	 * Returns the value of the '<em><b>Major Spacing</b></em>' attribute.
-	 * The default value is <code>"5"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Major Spacing</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Major Spacing</em>' attribute.
-	 * @see #setMajorSpacing(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MajorSpacing()
-	 * @model default="5"
-	 * @generated
-	 */
-	int getMajorSpacing();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMajorSpacing <em>Major Spacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Major Spacing</em>' attribute.
-	 * @see #getMajorSpacing()
-	 * @generated
-	 */
-	void setMajorSpacing(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Minor Spacing</b></em>' attribute.
-	 * The default value is <code>"5"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Minor Spacing</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Minor Spacing</em>' attribute.
-	 * @see #setMinorSpacing(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFlowLayout_MinorSpacing()
-	 * @model default="5"
-	 * @generated
-	 */
-	int getMinorSpacing();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMinorSpacing <em>Minor Spacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Minor Spacing</em>' attribute.
-	 * @see #getMinorSpacing()
-	 * @generated
-	 */
-	void setMinorSpacing(int value);
-
-} // FlowLayout
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Font.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Font.java
deleted file mode 100644
index aff32c34bfe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Font.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Font</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFont()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Font extends EObject {
-} // Font
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FontStyle.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FontStyle.java
deleted file mode 100644
index 0235821a541..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/FontStyle.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Font Style</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getFontStyle()
- * @model
- * @generated
- */
-public enum FontStyle implements Enumerator
-{
-	/**
-	 * The '<em><b>NORMAL</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NORMAL
-	 * @generated
-	 * @ordered
-	 */
-	NORMAL_LITERAL(0, "NORMAL", "NORMAL"),
-	/**
-	 * The '<em><b>BOLD</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #BOLD
-	 * @generated
-	 * @ordered
-	 */
-	BOLD_LITERAL(1, "BOLD", "BOLD"),
-	/**
-	 * The '<em><b>ITALIC</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ITALIC
-	 * @generated
-	 * @ordered
-	 */
-	ITALIC_LITERAL(2, "ITALIC", "ITALIC");
-	/**
-	 * The '<em><b>NORMAL</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NORMAL</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NORMAL_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NORMAL = 0;
-
-	/**
-	 * The '<em><b>BOLD</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>BOLD</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #BOLD_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int BOLD = 1;
-
-	/**
-	 * The '<em><b>ITALIC</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ITALIC</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ITALIC_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ITALIC = 2;
-
-	/**
-	 * An array of all the '<em><b>Font Style</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final FontStyle[] VALUES_ARRAY =
-		new FontStyle[] {
-			NORMAL_LITERAL,
-			BOLD_LITERAL,
-			ITALIC_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Font Style</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<FontStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Font Style</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FontStyle get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FontStyle result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Font Style</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FontStyle getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			FontStyle result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Font Style</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static FontStyle get(int value) {
-		switch (value) {
-			case NORMAL: return NORMAL_LITERAL;
-			case BOLD: return BOLD_LITERAL;
-			case ITALIC: return ITALIC_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private FontStyle(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GMFGraphFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GMFGraphFactory.java
deleted file mode 100644
index 8fbf4b12d82..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GMFGraphFactory.java
+++ /dev/null
@@ -1,600 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage
- * @generated
- */
-public interface GMFGraphFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	GMFGraphFactory eINSTANCE = org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Canvas</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Canvas</em>'.
-	 * @generated
-	 */
-	Canvas createCanvas();
-
-	/**
-	 * Returns a new object of class '<em>Figure Gallery</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Figure Gallery</em>'.
-	 * @generated
-	 */
-	FigureGallery createFigureGallery();
-
-	/**
-	 * Returns a new object of class '<em>Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Node</em>'.
-	 * @generated
-	 */
-	Node createNode();
-
-	/**
-	 * Returns a new object of class '<em>Child Access</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Child Access</em>'.
-	 * @generated
-	 */
-	ChildAccess createChildAccess();
-
-	/**
-	 * Returns a new object of class '<em>Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Connection</em>'.
-	 * @generated
-	 */
-	Connection createConnection();
-
-	/**
-	 * Returns a new object of class '<em>Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Compartment</em>'.
-	 * @generated
-	 */
-	Compartment createCompartment();
-
-	/**
-	 * Returns a new object of class '<em>Diagram Label</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Diagram Label</em>'.
-	 * @generated
-	 */
-	DiagramLabel createDiagramLabel();
-
-	/**
-	 * Returns a new object of class '<em>General Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>General Facet</em>'.
-	 * @generated
-	 */
-	GeneralFacet createGeneralFacet();
-
-	/**
-	 * Returns a new object of class '<em>Alignment Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Alignment Facet</em>'.
-	 * @generated
-	 */
-	AlignmentFacet createAlignmentFacet();
-
-	/**
-	 * Returns a new object of class '<em>Gradient Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Gradient Facet</em>'.
-	 * @generated
-	 */
-	GradientFacet createGradientFacet();
-
-	/**
-	 * Returns a new object of class '<em>Label Offset Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Label Offset Facet</em>'.
-	 * @generated
-	 */
-	LabelOffsetFacet createLabelOffsetFacet();
-
-	/**
-	 * Returns a new object of class '<em>Default Size Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Default Size Facet</em>'.
-	 * @generated
-	 */
-	DefaultSizeFacet createDefaultSizeFacet();
-
-	/**
-	 * Returns a new object of class '<em>Figure Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Figure Descriptor</em>'.
-	 * @generated
-	 */
-	FigureDescriptor createFigureDescriptor();
-
-	/**
-	 * Returns a new object of class '<em>Figure Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Figure Ref</em>'.
-	 * @generated
-	 */
-	FigureRef createFigureRef();
-
-	/**
-	 * Returns a new object of class '<em>Label</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Label</em>'.
-	 * @generated
-	 */
-	Label createLabel();
-
-	/**
-	 * Returns a new object of class '<em>Labeled Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Labeled Container</em>'.
-	 * @generated
-	 */
-	LabeledContainer createLabeledContainer();
-
-	/**
-	 * Returns a new object of class '<em>Vertical Label</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Vertical Label</em>'.
-	 * @generated
-	 */
-	VerticalLabel createVerticalLabel();
-
-	/**
-	 * Returns a new object of class '<em>Rectangle</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Rectangle</em>'.
-	 * @generated
-	 */
-	Rectangle createRectangle();
-
-	/**
-	 * Returns a new object of class '<em>Invisible Rectangle</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Invisible Rectangle</em>'.
-	 * @generated
-	 */
-	InvisibleRectangle createInvisibleRectangle();
-
-	/**
-	 * Returns a new object of class '<em>Rounded Rectangle</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Rounded Rectangle</em>'.
-	 * @generated
-	 */
-	RoundedRectangle createRoundedRectangle();
-
-	/**
-	 * Returns a new object of class '<em>Ellipse</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ellipse</em>'.
-	 * @generated
-	 */
-	Ellipse createEllipse();
-
-	/**
-	 * Returns a new object of class '<em>Polyline</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Polyline</em>'.
-	 * @generated
-	 */
-	Polyline createPolyline();
-
-	/**
-	 * Returns a new object of class '<em>Polygon</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Polygon</em>'.
-	 * @generated
-	 */
-	Polygon createPolygon();
-
-	/**
-	 * Returns a new object of class '<em>Scalable Polygon</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Scalable Polygon</em>'.
-	 * @generated
-	 */
-	ScalablePolygon createScalablePolygon();
-
-	/**
-	 * Returns a new object of class '<em>Polyline Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Polyline Connection</em>'.
-	 * @generated
-	 */
-	PolylineConnection createPolylineConnection();
-
-	/**
-	 * Returns a new object of class '<em>Polyline Decoration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Polyline Decoration</em>'.
-	 * @generated
-	 */
-	PolylineDecoration createPolylineDecoration();
-
-	/**
-	 * Returns a new object of class '<em>Polygon Decoration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Polygon Decoration</em>'.
-	 * @generated
-	 */
-	PolygonDecoration createPolygonDecoration();
-
-	/**
-	 * Returns a new object of class '<em>Custom Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Figure</em>'.
-	 * @generated
-	 */
-	CustomFigure createCustomFigure();
-
-	/**
-	 * Returns a new object of class '<em>Custom Decoration</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Decoration</em>'.
-	 * @generated
-	 */
-	CustomDecoration createCustomDecoration();
-
-	/**
-	 * Returns a new object of class '<em>Custom Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Connection</em>'.
-	 * @generated
-	 */
-	CustomConnection createCustomConnection();
-
-	/**
-	 * Returns a new object of class '<em>RGB Color</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>RGB Color</em>'.
-	 * @generated
-	 */
-	RGBColor createRGBColor();
-
-	/**
-	 * Returns a new object of class '<em>Constant Color</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Constant Color</em>'.
-	 * @generated
-	 */
-	ConstantColor createConstantColor();
-
-	/**
-	 * Returns a new object of class '<em>Basic Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Basic Font</em>'.
-	 * @generated
-	 */
-	BasicFont createBasicFont();
-
-	/**
-	 * Returns a new object of class '<em>Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Point</em>'.
-	 * @generated
-	 */
-	Point createPoint();
-
-	/**
-	 * Returns a new object of class '<em>Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Dimension</em>'.
-	 * @generated
-	 */
-	Dimension createDimension();
-
-	/**
-	 * Returns a new object of class '<em>Insets</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Insets</em>'.
-	 * @generated
-	 */
-	Insets createInsets();
-
-	/**
-	 * Returns a new object of class '<em>Border Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Border Ref</em>'.
-	 * @generated
-	 */
-	BorderRef createBorderRef();
-
-	/**
-	 * Returns a new object of class '<em>Line Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Line Border</em>'.
-	 * @generated
-	 */
-	LineBorder createLineBorder();
-
-	/**
-	 * Returns a new object of class '<em>Margin Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Margin Border</em>'.
-	 * @generated
-	 */
-	MarginBorder createMarginBorder();
-
-	/**
-	 * Returns a new object of class '<em>Compound Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Compound Border</em>'.
-	 * @generated
-	 */
-	CompoundBorder createCompoundBorder();
-
-	/**
-	 * Returns a new object of class '<em>Custom Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Border</em>'.
-	 * @generated
-	 */
-	CustomBorder createCustomBorder();
-
-	/**
-	 * Returns a new object of class '<em>Custom Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Layout Data</em>'.
-	 * @generated
-	 */
-	CustomLayoutData createCustomLayoutData();
-
-	/**
-	 * Returns a new object of class '<em>Grid Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Grid Layout Data</em>'.
-	 * @generated
-	 */
-	GridLayoutData createGridLayoutData();
-
-	/**
-	 * Returns a new object of class '<em>Border Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Border Layout Data</em>'.
-	 * @generated
-	 */
-	BorderLayoutData createBorderLayoutData();
-
-	/**
-	 * Returns a new object of class '<em>Layout Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Layout Ref</em>'.
-	 * @generated
-	 */
-	LayoutRef createLayoutRef();
-
-	/**
-	 * Returns a new object of class '<em>Custom Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Layout</em>'.
-	 * @generated
-	 */
-	CustomLayout createCustomLayout();
-
-	/**
-	 * Returns a new object of class '<em>Grid Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Grid Layout</em>'.
-	 * @generated
-	 */
-	GridLayout createGridLayout();
-
-	/**
-	 * Returns a new object of class '<em>Border Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Border Layout</em>'.
-	 * @generated
-	 */
-	BorderLayout createBorderLayout();
-
-	/**
-	 * Returns a new object of class '<em>Custom Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Attribute</em>'.
-	 * @generated
-	 */
-	CustomAttribute createCustomAttribute();
-
-	/**
-	 * Returns a new object of class '<em>Figure Accessor</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Figure Accessor</em>'.
-	 * @generated
-	 */
-	FigureAccessor createFigureAccessor();
-
-	/**
-	 * Returns a new object of class '<em>Flow Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Flow Layout</em>'.
-	 * @generated
-	 */
-	FlowLayout createFlowLayout();
-
-	/**
-	 * Returns a new object of class '<em>XY Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>XY Layout</em>'.
-	 * @generated
-	 */
-	XYLayout createXYLayout();
-
-	/**
-	 * Returns a new object of class '<em>XY Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>XY Layout Data</em>'.
-	 * @generated
-	 */
-	XYLayoutData createXYLayoutData();
-
-	/**
-	 * Returns a new object of class '<em>Stack Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Stack Layout</em>'.
-	 * @generated
-	 */
-	StackLayout createStackLayout();
-
-	/**
-	 * Returns a new object of class '<em>Center Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Center Layout</em>'.
-	 * @generated
-	 */
-	CenterLayout createCenterLayout();
-
-	/**
-	 * Returns a new object of class '<em>SVG Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SVG Figure</em>'.
-	 * @generated
-	 */
-	SVGFigure createSVGFigure();
-
-	/**
-	 * Returns a new object of class '<em>SVG Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>SVG Property</em>'.
-	 * @generated
-	 */
-	SVGProperty createSVGProperty();
-
-	/**
-	 * Returns a new object of class '<em>Rectangle2 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Rectangle2 D</em>'.
-	 * @generated
-	 */
-	Rectangle2D createRectangle2D();
-
-	/**
-	 * Returns a new object of class '<em>Custom Pin</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Custom Pin</em>'.
-	 * @generated
-	 */
-	CustomPin createCustomPin();
-
-	/**
-	 * Returns a new object of class '<em>Color Pin</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Color Pin</em>'.
-	 * @generated
-	 */
-	ColorPin createColorPin();
-
-	/**
-	 * Returns a new object of class '<em>Visible Pin</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Visible Pin</em>'.
-	 * @generated
-	 */
-	VisiblePin createVisiblePin();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	GMFGraphPackage getGMFGraphPackage();
-
-} //GMFGraphFactory
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GMFGraphPackage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GMFGraphPackage.java
deleted file mode 100644
index 5c92d77b331..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GMFGraphPackage.java
+++ /dev/null
@@ -1,9795 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory
- * @model kind="package"
- * @generated
- */
-public interface GMFGraphPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "gmfgraph";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "gmfgraph";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	GMFGraphPackage eINSTANCE = org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Identity <em>Identity</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Identity
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getIdentity()
-	 * @generated
-	 */
-	int IDENTITY = 2;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IDENTITY__NAME = 0;
-
-	/**
-	 * The number of structural features of the '<em>Identity</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IDENTITY_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CanvasImpl <em>Canvas</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CanvasImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCanvas()
-	 * @generated
-	 */
-	int CANVAS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS__NAME = IDENTITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Figures</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS__FIGURES = IDENTITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS__NODES = IDENTITY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Connections</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS__CONNECTIONS = IDENTITY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Compartments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS__COMPARTMENTS = IDENTITY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Labels</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS__LABELS = IDENTITY_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Canvas</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS_FEATURE_COUNT = IDENTITY_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureGalleryImpl <em>Figure Gallery</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.FigureGalleryImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFigureGallery()
-	 * @generated
-	 */
-	int FIGURE_GALLERY = 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_GALLERY__NAME = IDENTITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Figures</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_GALLERY__FIGURES = IDENTITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Descriptors</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_GALLERY__DESCRIPTORS = IDENTITY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Borders</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_GALLERY__BORDERS = IDENTITY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Layouts</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_GALLERY__LAYOUTS = IDENTITY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Implementation Bundle</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_GALLERY__IMPLEMENTATION_BUNDLE = IDENTITY_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>Figure Gallery</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_GALLERY_FEATURE_COUNT = IDENTITY_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramElementImpl <em>Diagram Element</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramElementImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getDiagramElement()
-	 * @generated
-	 */
-	int DIAGRAM_ELEMENT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__NAME = IDENTITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__FIGURE = IDENTITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Facets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT__FACETS = IDENTITY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Diagram Element</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT_FEATURE_COUNT = IDENTITY_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractNodeImpl <em>Abstract Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractNodeImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getAbstractNode()
-	 * @generated
-	 */
-	int ABSTRACT_NODE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_NODE__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_NODE__FIGURE = DIAGRAM_ELEMENT__FIGURE;
-
-	/**
-	 * The feature id for the '<em><b>Facets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_NODE__FACETS = DIAGRAM_ELEMENT__FACETS;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_NODE_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.NodeImpl <em>Node</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.NodeImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getNode()
-	 * @generated
-	 */
-	int NODE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__NAME = ABSTRACT_NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__FIGURE = ABSTRACT_NODE__FIGURE;
-
-	/**
-	 * The feature id for the '<em><b>Facets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__FACETS = ABSTRACT_NODE__FACETS;
-
-	/**
-	 * The feature id for the '<em><b>Resize Constraint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__RESIZE_CONSTRAINT = ABSTRACT_NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Affixed Parent Side</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__AFFIXED_PARENT_SIDE = ABSTRACT_NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Content Pane</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE__CONTENT_PANE = ABSTRACT_NODE_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Node</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_FEATURE_COUNT = ABSTRACT_NODE_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ChildAccessImpl <em>Child Access</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.ChildAccessImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getChildAccess()
-	 * @generated
-	 */
-	int CHILD_ACCESS = 18;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ConnectionImpl <em>Connection</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.ConnectionImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getConnection()
-	 * @generated
-	 */
-	int CONNECTION = 6;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION__FIGURE = DIAGRAM_ELEMENT__FIGURE;
-
-	/**
-	 * The feature id for the '<em><b>Facets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION__FACETS = DIAGRAM_ELEMENT__FACETS;
-
-	/**
-	 * The number of structural features of the '<em>Connection</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CompartmentImpl <em>Compartment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CompartmentImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCompartment()
-	 * @generated
-	 */
-	int COMPARTMENT = 7;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT__NAME = DIAGRAM_ELEMENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT__FIGURE = DIAGRAM_ELEMENT__FIGURE;
-
-	/**
-	 * The feature id for the '<em><b>Facets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT__FACETS = DIAGRAM_ELEMENT__FACETS;
-
-	/**
-	 * The feature id for the '<em><b>Collapsible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT__COLLAPSIBLE = DIAGRAM_ELEMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Needs Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT__NEEDS_TITLE = DIAGRAM_ELEMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Accessor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT__ACCESSOR = DIAGRAM_ELEMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Compartment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT_FEATURE_COUNT = DIAGRAM_ELEMENT_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramLabelImpl <em>Diagram Label</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramLabelImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getDiagramLabel()
-	 * @generated
-	 */
-	int DIAGRAM_LABEL = 8;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__NAME = NODE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__FIGURE = NODE__FIGURE;
-
-	/**
-	 * The feature id for the '<em><b>Facets</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__FACETS = NODE__FACETS;
-
-	/**
-	 * The feature id for the '<em><b>Resize Constraint</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__RESIZE_CONSTRAINT = NODE__RESIZE_CONSTRAINT;
-
-	/**
-	 * The feature id for the '<em><b>Affixed Parent Side</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__AFFIXED_PARENT_SIDE = NODE__AFFIXED_PARENT_SIDE;
-
-	/**
-	 * The feature id for the '<em><b>Content Pane</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__CONTENT_PANE = NODE__CONTENT_PANE;
-
-	/**
-	 * The feature id for the '<em><b>Element Icon</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__ELEMENT_ICON = NODE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Accessor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__ACCESSOR = NODE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__CONTAINER = NODE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>External</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL__EXTERNAL = NODE_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Diagram Label</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_LABEL_FEATURE_COUNT = NODE_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.VisualFacet <em>Visual Facet</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.VisualFacet
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getVisualFacet()
-	 * @generated
-	 */
-	int VISUAL_FACET = 9;
-
-	/**
-	 * The number of structural features of the '<em>Visual Facet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VISUAL_FACET_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GeneralFacetImpl <em>General Facet</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GeneralFacetImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getGeneralFacet()
-	 * @generated
-	 */
-	int GENERAL_FACET = 10;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERAL_FACET__IDENTIFIER = VISUAL_FACET_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERAL_FACET__DATA = VISUAL_FACET_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>General Facet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERAL_FACET_FEATURE_COUNT = VISUAL_FACET_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AlignmentFacetImpl <em>Alignment Facet</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.AlignmentFacetImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getAlignmentFacet()
-	 * @generated
-	 */
-	int ALIGNMENT_FACET = 11;
-
-	/**
-	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ALIGNMENT_FACET__ALIGNMENT = VISUAL_FACET_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Alignment Facet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ALIGNMENT_FACET_FEATURE_COUNT = VISUAL_FACET_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GradientFacetImpl <em>Gradient Facet</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GradientFacetImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getGradientFacet()
-	 * @generated
-	 */
-	int GRADIENT_FACET = 12;
-
-	/**
-	 * The feature id for the '<em><b>Direction</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRADIENT_FACET__DIRECTION = VISUAL_FACET_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Gradient Facet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRADIENT_FACET_FEATURE_COUNT = VISUAL_FACET_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LabelOffsetFacetImpl <em>Label Offset Facet</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.LabelOffsetFacetImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLabelOffsetFacet()
-	 * @generated
-	 */
-	int LABEL_OFFSET_FACET = 13;
-
-	/**
-	 * The feature id for the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_OFFSET_FACET__X = VISUAL_FACET_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_OFFSET_FACET__Y = VISUAL_FACET_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Label Offset Facet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_OFFSET_FACET_FEATURE_COUNT = VISUAL_FACET_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DefaultSizeFacetImpl <em>Default Size Facet</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.DefaultSizeFacetImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getDefaultSizeFacet()
-	 * @generated
-	 */
-	int DEFAULT_SIZE_FACET = 14;
-
-	/**
-	 * The feature id for the '<em><b>Default Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_SIZE_FACET__DEFAULT_SIZE = VISUAL_FACET_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Default Size Facet</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_SIZE_FACET_FEATURE_COUNT = VISUAL_FACET_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable <em>Layoutable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layoutable
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLayoutable()
-	 * @generated
-	 */
-	int LAYOUTABLE = 62;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LAYOUTABLE__LAYOUT_DATA = 0;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LAYOUTABLE__LAYOUT = 1;
-
-	/**
-	 * The number of structural features of the '<em>Layoutable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LAYOUTABLE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure <em>Figure</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFigure()
-	 * @generated
-	 */
-	int FIGURE = 15;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__LAYOUT_DATA = LAYOUTABLE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__LAYOUT = LAYOUTABLE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__DESCRIPTOR = LAYOUTABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__FOREGROUND_COLOR = LAYOUTABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__BACKGROUND_COLOR = LAYOUTABLE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__MAXIMUM_SIZE = LAYOUTABLE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__MINIMUM_SIZE = LAYOUTABLE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__PREFERRED_SIZE = LAYOUTABLE_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__FONT = LAYOUTABLE_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__INSETS = LAYOUTABLE_FEATURE_COUNT + 7;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__BORDER = LAYOUTABLE_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__LOCATION = LAYOUTABLE_FEATURE_COUNT + 9;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE__SIZE = LAYOUTABLE_FEATURE_COUNT + 10;
-
-	/**
-	 * The number of structural features of the '<em>Figure</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_FEATURE_COUNT = LAYOUTABLE_FEATURE_COUNT + 11;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl <em>Abstract Figure</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getAbstractFigure()
-	 * @generated
-	 */
-	int ABSTRACT_FIGURE = 16;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__LAYOUT_DATA = FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__LAYOUT = FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__DESCRIPTOR = FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__FOREGROUND_COLOR = FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__BACKGROUND_COLOR = FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__MAXIMUM_SIZE = FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__MINIMUM_SIZE = FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__PREFERRED_SIZE = FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__FONT = FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__INSETS = FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__BORDER = FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__LOCATION = FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE__SIZE = FIGURE__SIZE;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Figure</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_FIGURE_FEATURE_COUNT = FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureDescriptorImpl <em>Figure Descriptor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.FigureDescriptorImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFigureDescriptor()
-	 * @generated
-	 */
-	int FIGURE_DESCRIPTOR = 17;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_DESCRIPTOR__NAME = IDENTITY__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Actual Figure</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_DESCRIPTOR__ACTUAL_FIGURE = IDENTITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Accessors</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_DESCRIPTOR__ACCESSORS = IDENTITY_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Figure Descriptor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_DESCRIPTOR_FEATURE_COUNT = IDENTITY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_ACCESS__OWNER = 0;
-
-	/**
-	 * The feature id for the '<em><b>Accessor</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_ACCESS__ACCESSOR = 1;
-
-	/**
-	 * The feature id for the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_ACCESS__FIGURE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Child Access</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_ACCESS_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RealFigureImpl <em>Real Figure</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.RealFigureImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getRealFigure()
-	 * @generated
-	 */
-	int REAL_FIGURE = 19;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__LAYOUT_DATA = ABSTRACT_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__LAYOUT = ABSTRACT_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__DESCRIPTOR = ABSTRACT_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__FOREGROUND_COLOR = ABSTRACT_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__BACKGROUND_COLOR = ABSTRACT_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__MAXIMUM_SIZE = ABSTRACT_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__MINIMUM_SIZE = ABSTRACT_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__PREFERRED_SIZE = ABSTRACT_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__FONT = ABSTRACT_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__INSETS = ABSTRACT_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__BORDER = ABSTRACT_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__LOCATION = ABSTRACT_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__SIZE = ABSTRACT_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__PINS = ABSTRACT_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__ATTRIBUTES = ABSTRACT_FIGURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__NAME = ABSTRACT_FIGURE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE__CHILDREN = ABSTRACT_FIGURE_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Real Figure</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REAL_FIGURE_FEATURE_COUNT = ABSTRACT_FIGURE_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureRefImpl <em>Figure Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.FigureRefImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFigureRef()
-	 * @generated
-	 */
-	int FIGURE_REF = 20;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__LAYOUT_DATA = ABSTRACT_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__LAYOUT = ABSTRACT_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__DESCRIPTOR = ABSTRACT_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__FOREGROUND_COLOR = ABSTRACT_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__BACKGROUND_COLOR = ABSTRACT_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__MAXIMUM_SIZE = ABSTRACT_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__MINIMUM_SIZE = ABSTRACT_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__PREFERRED_SIZE = ABSTRACT_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__FONT = ABSTRACT_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__INSETS = ABSTRACT_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__BORDER = ABSTRACT_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__LOCATION = ABSTRACT_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__SIZE = ABSTRACT_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Figure</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF__FIGURE = ABSTRACT_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Figure Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_REF_FEATURE_COUNT = ABSTRACT_FIGURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure <em>Connection Figure</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getConnectionFigure()
-	 * @generated
-	 */
-	int CONNECTION_FIGURE = 21;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Connection Figure</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONNECTION_FIGURE_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure <em>Decoration Figure</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getDecorationFigure()
-	 * @generated
-	 */
-	int DECORATION_FIGURE = 22;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Decoration Figure</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DECORATION_FIGURE_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl <em>Shape</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getShape()
-	 * @generated
-	 */
-	int SHAPE = 23;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__OUTLINE = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__FILL = REAL_FIGURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__LINE_WIDTH = REAL_FIGURE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__LINE_KIND = REAL_FIGURE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__XOR_FILL = REAL_FIGURE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__XOR_OUTLINE = REAL_FIGURE_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE__RESOLVED_CHILDREN = REAL_FIGURE_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Shape</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SHAPE_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LabelImpl <em>Label</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.LabelImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLabel()
-	 * @generated
-	 */
-	int LABEL = 24;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL__TEXT = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Label</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LabeledContainerImpl <em>Labeled Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.LabeledContainerImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLabeledContainer()
-	 * @generated
-	 */
-	int LABELED_CONTAINER = 25;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Labeled Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABELED_CONTAINER_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.VerticalLabelImpl <em>Vertical Label</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.VerticalLabelImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getVerticalLabel()
-	 * @generated
-	 */
-	int VERTICAL_LABEL = 26;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL__TEXT = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Vertical Label</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VERTICAL_LABEL_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RectangleImpl <em>Rectangle</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.RectangleImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getRectangle()
-	 * @generated
-	 */
-	int RECTANGLE = 27;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__LAYOUT_DATA = SHAPE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__LAYOUT = SHAPE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__DESCRIPTOR = SHAPE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__FOREGROUND_COLOR = SHAPE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__BACKGROUND_COLOR = SHAPE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__MAXIMUM_SIZE = SHAPE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__MINIMUM_SIZE = SHAPE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__PREFERRED_SIZE = SHAPE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__FONT = SHAPE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__INSETS = SHAPE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__BORDER = SHAPE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__LOCATION = SHAPE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__SIZE = SHAPE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__PINS = SHAPE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__ATTRIBUTES = SHAPE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__NAME = SHAPE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__CHILDREN = SHAPE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__OUTLINE = SHAPE__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__FILL = SHAPE__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__LINE_WIDTH = SHAPE__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__LINE_KIND = SHAPE__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__XOR_FILL = SHAPE__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__XOR_OUTLINE = SHAPE__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE__RESOLVED_CHILDREN = SHAPE__RESOLVED_CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Rectangle</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE_FEATURE_COUNT = SHAPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.InvisibleRectangleImpl <em>Invisible Rectangle</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.InvisibleRectangleImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getInvisibleRectangle()
-	 * @generated
-	 */
-	int INVISIBLE_RECTANGLE = 28;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Invisible Rectangle</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INVISIBLE_RECTANGLE_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RoundedRectangleImpl <em>Rounded Rectangle</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.RoundedRectangleImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getRoundedRectangle()
-	 * @generated
-	 */
-	int ROUNDED_RECTANGLE = 29;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__LAYOUT_DATA = SHAPE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__LAYOUT = SHAPE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__DESCRIPTOR = SHAPE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__FOREGROUND_COLOR = SHAPE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__BACKGROUND_COLOR = SHAPE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__MAXIMUM_SIZE = SHAPE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__MINIMUM_SIZE = SHAPE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__PREFERRED_SIZE = SHAPE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__FONT = SHAPE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__INSETS = SHAPE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__BORDER = SHAPE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__LOCATION = SHAPE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__SIZE = SHAPE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__PINS = SHAPE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__ATTRIBUTES = SHAPE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__NAME = SHAPE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__CHILDREN = SHAPE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__OUTLINE = SHAPE__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__FILL = SHAPE__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__LINE_WIDTH = SHAPE__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__LINE_KIND = SHAPE__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__XOR_FILL = SHAPE__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__XOR_OUTLINE = SHAPE__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__RESOLVED_CHILDREN = SHAPE__RESOLVED_CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Corner Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__CORNER_WIDTH = SHAPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Corner Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE__CORNER_HEIGHT = SHAPE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Rounded Rectangle</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ROUNDED_RECTANGLE_FEATURE_COUNT = SHAPE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.EllipseImpl <em>Ellipse</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.EllipseImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getEllipse()
-	 * @generated
-	 */
-	int ELLIPSE = 30;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__LAYOUT_DATA = SHAPE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__LAYOUT = SHAPE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__DESCRIPTOR = SHAPE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__FOREGROUND_COLOR = SHAPE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__BACKGROUND_COLOR = SHAPE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__MAXIMUM_SIZE = SHAPE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__MINIMUM_SIZE = SHAPE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__PREFERRED_SIZE = SHAPE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__FONT = SHAPE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__INSETS = SHAPE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__BORDER = SHAPE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__LOCATION = SHAPE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__SIZE = SHAPE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__PINS = SHAPE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__ATTRIBUTES = SHAPE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__NAME = SHAPE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__CHILDREN = SHAPE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__OUTLINE = SHAPE__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__FILL = SHAPE__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__LINE_WIDTH = SHAPE__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__LINE_KIND = SHAPE__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__XOR_FILL = SHAPE__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__XOR_OUTLINE = SHAPE__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE__RESOLVED_CHILDREN = SHAPE__RESOLVED_CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Ellipse</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELLIPSE_FEATURE_COUNT = SHAPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineImpl <em>Polyline</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getPolyline()
-	 * @generated
-	 */
-	int POLYLINE = 31;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__LAYOUT_DATA = SHAPE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__LAYOUT = SHAPE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__DESCRIPTOR = SHAPE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__FOREGROUND_COLOR = SHAPE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__BACKGROUND_COLOR = SHAPE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__MAXIMUM_SIZE = SHAPE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__MINIMUM_SIZE = SHAPE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__PREFERRED_SIZE = SHAPE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__FONT = SHAPE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__INSETS = SHAPE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__BORDER = SHAPE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__LOCATION = SHAPE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__SIZE = SHAPE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__PINS = SHAPE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__ATTRIBUTES = SHAPE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__NAME = SHAPE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__CHILDREN = SHAPE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__OUTLINE = SHAPE__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__FILL = SHAPE__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__LINE_WIDTH = SHAPE__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__LINE_KIND = SHAPE__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__XOR_FILL = SHAPE__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__XOR_OUTLINE = SHAPE__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__RESOLVED_CHILDREN = SHAPE__RESOLVED_CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE__TEMPLATE = SHAPE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Polyline</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_FEATURE_COUNT = SHAPE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PolygonImpl <em>Polygon</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.PolygonImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getPolygon()
-	 * @generated
-	 */
-	int POLYGON = 32;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__LAYOUT_DATA = POLYLINE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__LAYOUT = POLYLINE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__DESCRIPTOR = POLYLINE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__FOREGROUND_COLOR = POLYLINE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__BACKGROUND_COLOR = POLYLINE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__MAXIMUM_SIZE = POLYLINE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__MINIMUM_SIZE = POLYLINE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__PREFERRED_SIZE = POLYLINE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__FONT = POLYLINE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__INSETS = POLYLINE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__BORDER = POLYLINE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__LOCATION = POLYLINE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__SIZE = POLYLINE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__PINS = POLYLINE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__ATTRIBUTES = POLYLINE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__NAME = POLYLINE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__CHILDREN = POLYLINE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__OUTLINE = POLYLINE__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__FILL = POLYLINE__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__LINE_WIDTH = POLYLINE__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__LINE_KIND = POLYLINE__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__XOR_FILL = POLYLINE__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__XOR_OUTLINE = POLYLINE__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__RESOLVED_CHILDREN = POLYLINE__RESOLVED_CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON__TEMPLATE = POLYLINE__TEMPLATE;
-
-	/**
-	 * The number of structural features of the '<em>Polygon</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_FEATURE_COUNT = POLYLINE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ScalablePolygonImpl <em>Scalable Polygon</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.ScalablePolygonImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getScalablePolygon()
-	 * @generated
-	 */
-	int SCALABLE_POLYGON = 33;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__LAYOUT_DATA = POLYGON__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__LAYOUT = POLYGON__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__DESCRIPTOR = POLYGON__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__FOREGROUND_COLOR = POLYGON__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__BACKGROUND_COLOR = POLYGON__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__MAXIMUM_SIZE = POLYGON__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__MINIMUM_SIZE = POLYGON__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__PREFERRED_SIZE = POLYGON__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__FONT = POLYGON__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__INSETS = POLYGON__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__BORDER = POLYGON__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__LOCATION = POLYGON__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__SIZE = POLYGON__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__PINS = POLYGON__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__ATTRIBUTES = POLYGON__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__NAME = POLYGON__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__CHILDREN = POLYGON__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__OUTLINE = POLYGON__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__FILL = POLYGON__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__LINE_WIDTH = POLYGON__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__LINE_KIND = POLYGON__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__XOR_FILL = POLYGON__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__XOR_OUTLINE = POLYGON__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__RESOLVED_CHILDREN = POLYGON__RESOLVED_CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON__TEMPLATE = POLYGON__TEMPLATE;
-
-	/**
-	 * The number of structural features of the '<em>Scalable Polygon</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SCALABLE_POLYGON_FEATURE_COUNT = POLYGON_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineConnectionImpl <em>Polyline Connection</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineConnectionImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getPolylineConnection()
-	 * @generated
-	 */
-	int POLYLINE_CONNECTION = 34;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__LAYOUT_DATA = POLYLINE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__LAYOUT = POLYLINE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__DESCRIPTOR = POLYLINE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__FOREGROUND_COLOR = POLYLINE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__BACKGROUND_COLOR = POLYLINE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__MAXIMUM_SIZE = POLYLINE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__MINIMUM_SIZE = POLYLINE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__PREFERRED_SIZE = POLYLINE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__FONT = POLYLINE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__INSETS = POLYLINE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__BORDER = POLYLINE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__LOCATION = POLYLINE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__SIZE = POLYLINE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__PINS = POLYLINE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__ATTRIBUTES = POLYLINE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__NAME = POLYLINE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__CHILDREN = POLYLINE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__OUTLINE = POLYLINE__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__FILL = POLYLINE__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__LINE_WIDTH = POLYLINE__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__LINE_KIND = POLYLINE__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__XOR_FILL = POLYLINE__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__XOR_OUTLINE = POLYLINE__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__RESOLVED_CHILDREN = POLYLINE__RESOLVED_CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__TEMPLATE = POLYLINE__TEMPLATE;
-
-	/**
-	 * The feature id for the '<em><b>Source Decoration</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__SOURCE_DECORATION = POLYLINE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Target Decoration</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION__TARGET_DECORATION = POLYLINE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Polyline Connection</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_CONNECTION_FEATURE_COUNT = POLYLINE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineDecorationImpl <em>Polyline Decoration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineDecorationImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getPolylineDecoration()
-	 * @generated
-	 */
-	int POLYLINE_DECORATION = 35;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__LAYOUT_DATA = POLYLINE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__LAYOUT = POLYLINE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__DESCRIPTOR = POLYLINE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__FOREGROUND_COLOR = POLYLINE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__BACKGROUND_COLOR = POLYLINE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__MAXIMUM_SIZE = POLYLINE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__MINIMUM_SIZE = POLYLINE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__PREFERRED_SIZE = POLYLINE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__FONT = POLYLINE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__INSETS = POLYLINE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__BORDER = POLYLINE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__LOCATION = POLYLINE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__SIZE = POLYLINE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__PINS = POLYLINE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__ATTRIBUTES = POLYLINE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__NAME = POLYLINE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__CHILDREN = POLYLINE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__OUTLINE = POLYLINE__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__FILL = POLYLINE__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__LINE_WIDTH = POLYLINE__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__LINE_KIND = POLYLINE__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__XOR_FILL = POLYLINE__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__XOR_OUTLINE = POLYLINE__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__RESOLVED_CHILDREN = POLYLINE__RESOLVED_CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION__TEMPLATE = POLYLINE__TEMPLATE;
-
-	/**
-	 * The number of structural features of the '<em>Polyline Decoration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYLINE_DECORATION_FEATURE_COUNT = POLYLINE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PolygonDecorationImpl <em>Polygon Decoration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.PolygonDecorationImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getPolygonDecoration()
-	 * @generated
-	 */
-	int POLYGON_DECORATION = 36;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__LAYOUT_DATA = POLYGON__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__LAYOUT = POLYGON__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__DESCRIPTOR = POLYGON__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__FOREGROUND_COLOR = POLYGON__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__BACKGROUND_COLOR = POLYGON__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__MAXIMUM_SIZE = POLYGON__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__MINIMUM_SIZE = POLYGON__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__PREFERRED_SIZE = POLYGON__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__FONT = POLYGON__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__INSETS = POLYGON__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__BORDER = POLYGON__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__LOCATION = POLYGON__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__SIZE = POLYGON__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__PINS = POLYGON__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__ATTRIBUTES = POLYGON__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__NAME = POLYGON__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__CHILDREN = POLYGON__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__OUTLINE = POLYGON__OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__FILL = POLYGON__FILL;
-
-	/**
-	 * The feature id for the '<em><b>Line Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__LINE_WIDTH = POLYGON__LINE_WIDTH;
-
-	/**
-	 * The feature id for the '<em><b>Line Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__LINE_KIND = POLYGON__LINE_KIND;
-
-	/**
-	 * The feature id for the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__XOR_FILL = POLYGON__XOR_FILL;
-
-	/**
-	 * The feature id for the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__XOR_OUTLINE = POLYGON__XOR_OUTLINE;
-
-	/**
-	 * The feature id for the '<em><b>Resolved Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__RESOLVED_CHILDREN = POLYGON__RESOLVED_CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Template</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION__TEMPLATE = POLYGON__TEMPLATE;
-
-	/**
-	 * The number of structural features of the '<em>Polygon Decoration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POLYGON_DECORATION_FEATURE_COUNT = POLYGON_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner <em>Custom Attribute Owner</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomAttributeOwner()
-	 * @generated
-	 */
-	int CUSTOM_ATTRIBUTE_OWNER = 37;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES = 0;
-
-	/**
-	 * The number of structural features of the '<em>Custom Attribute Owner</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_ATTRIBUTE_OWNER_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomClass <em>Custom Class</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomClass
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomClass()
-	 * @generated
-	 */
-	int CUSTOM_CLASS = 38;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CLASS__ATTRIBUTES = CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CLASS__QUALIFIED_CLASS_NAME = CUSTOM_ATTRIBUTE_OWNER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Custom Class</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CLASS_FEATURE_COUNT = CUSTOM_ATTRIBUTE_OWNER_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomFigureImpl <em>Custom Figure</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CustomFigureImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomFigure()
-	 * @generated
-	 */
-	int CUSTOM_FIGURE = 41;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomDecorationImpl <em>Custom Decoration</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CustomDecorationImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomDecoration()
-	 * @generated
-	 */
-	int CUSTOM_DECORATION = 42;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomConnectionImpl <em>Custom Connection</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CustomConnectionImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomConnection()
-	 * @generated
-	 */
-	int CUSTOM_CONNECTION = 43;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Color <em>Color</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Color
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getColor()
-	 * @generated
-	 */
-	int COLOR = 44;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RGBColorImpl <em>RGB Color</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.RGBColorImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getRGBColor()
-	 * @generated
-	 */
-	int RGB_COLOR = 45;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ConstantColorImpl <em>Constant Color</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.ConstantColorImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getConstantColor()
-	 * @generated
-	 */
-	int CONSTANT_COLOR = 46;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Font <em>Font</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Font
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFont()
-	 * @generated
-	 */
-	int FONT = 47;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BasicFontImpl <em>Basic Font</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.BasicFontImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getBasicFont()
-	 * @generated
-	 */
-	int BASIC_FONT = 48;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.FontStyle <em>Font Style</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FontStyle
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFontStyle()
-	 * @generated
-	 */
-	int FONT_STYLE = 82;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PointImpl <em>Point</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.PointImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getPoint()
-	 * @generated
-	 */
-	int POINT = 49;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DimensionImpl <em>Dimension</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.DimensionImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getDimension()
-	 * @generated
-	 */
-	int DIMENSION = 50;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.InsetsImpl <em>Insets</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.InsetsImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getInsets()
-	 * @generated
-	 */
-	int INSETS = 51;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Border <em>Border</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Border
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getBorder()
-	 * @generated
-	 */
-	int BORDER = 52;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LineBorderImpl <em>Line Border</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.LineBorderImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLineBorder()
-	 * @generated
-	 */
-	int LINE_BORDER = 54;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.MarginBorderImpl <em>Margin Border</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.MarginBorderImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getMarginBorder()
-	 * @generated
-	 */
-	int MARGIN_BORDER = 55;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CompoundBorderImpl <em>Compound Border</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CompoundBorderImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCompoundBorder()
-	 * @generated
-	 */
-	int COMPOUND_BORDER = 56;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomBorderImpl <em>Custom Border</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CustomBorderImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomBorder()
-	 * @generated
-	 */
-	int CUSTOM_BORDER = 57;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutData <em>Layout Data</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LayoutData
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLayoutData()
-	 * @generated
-	 */
-	int LAYOUT_DATA = 58;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl <em>Grid Layout Data</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getGridLayoutData()
-	 * @generated
-	 */
-	int GRID_LAYOUT_DATA = 60;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BorderLayoutDataImpl <em>Border Layout Data</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.BorderLayoutDataImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getBorderLayoutData()
-	 * @generated
-	 */
-	int BORDER_LAYOUT_DATA = 61;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutImpl <em>Custom Layout</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomLayout()
-	 * @generated
-	 */
-	int CUSTOM_LAYOUT = 65;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Layout <em>Layout</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layout
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLayout()
-	 * @generated
-	 */
-	int LAYOUT = 63;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutDataImpl <em>Custom Layout Data</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutDataImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomLayoutData()
-	 * @generated
-	 */
-	int CUSTOM_LAYOUT_DATA = 59;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutImpl <em>Grid Layout</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getGridLayout()
-	 * @generated
-	 */
-	int GRID_LAYOUT = 66;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BorderLayoutImpl <em>Border Layout</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.BorderLayoutImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getBorderLayout()
-	 * @generated
-	 */
-	int BORDER_LAYOUT = 67;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomAttributeImpl <em>Custom Attribute</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CustomAttributeImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomAttribute()
-	 * @generated
-	 */
-	int CUSTOM_ATTRIBUTE = 39;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_ATTRIBUTE__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_ATTRIBUTE__VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Direct Access</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_ATTRIBUTE__DIRECT_ACCESS = 2;
-
-	/**
-	 * The feature id for the '<em><b>Multi Statement Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE = 3;
-
-	/**
-	 * The number of structural features of the '<em>Custom Attribute</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_ATTRIBUTE_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureAccessorImpl <em>Figure Accessor</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.FigureAccessorImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFigureAccessor()
-	 * @generated
-	 */
-	int FIGURE_ACCESSOR = 40;
-
-	/**
-	 * The feature id for the '<em><b>Accessor</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_ACCESSOR__ACCESSOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Typed Figure</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_ACCESSOR__TYPED_FIGURE = 1;
-
-	/**
-	 * The number of structural features of the '<em>Figure Accessor</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FIGURE_ACCESSOR_FEATURE_COUNT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__QUALIFIED_CLASS_NAME = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Custom Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE__CUSTOM_CHILDREN = REAL_FIGURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Custom Figure</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_FIGURE_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__LAYOUT_DATA = CUSTOM_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__LAYOUT = CUSTOM_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__DESCRIPTOR = CUSTOM_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__FOREGROUND_COLOR = CUSTOM_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__BACKGROUND_COLOR = CUSTOM_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__MAXIMUM_SIZE = CUSTOM_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__MINIMUM_SIZE = CUSTOM_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__PREFERRED_SIZE = CUSTOM_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__FONT = CUSTOM_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__INSETS = CUSTOM_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__BORDER = CUSTOM_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__LOCATION = CUSTOM_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__SIZE = CUSTOM_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__PINS = CUSTOM_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__ATTRIBUTES = CUSTOM_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__NAME = CUSTOM_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__CHILDREN = CUSTOM_FIGURE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__QUALIFIED_CLASS_NAME = CUSTOM_FIGURE__QUALIFIED_CLASS_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Custom Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION__CUSTOM_CHILDREN = CUSTOM_FIGURE__CUSTOM_CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Custom Decoration</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_DECORATION_FEATURE_COUNT = CUSTOM_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__LAYOUT_DATA = CUSTOM_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__LAYOUT = CUSTOM_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__DESCRIPTOR = CUSTOM_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__FOREGROUND_COLOR = CUSTOM_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__BACKGROUND_COLOR = CUSTOM_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__MAXIMUM_SIZE = CUSTOM_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__MINIMUM_SIZE = CUSTOM_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__PREFERRED_SIZE = CUSTOM_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__FONT = CUSTOM_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__INSETS = CUSTOM_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__BORDER = CUSTOM_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__LOCATION = CUSTOM_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__SIZE = CUSTOM_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__PINS = CUSTOM_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__ATTRIBUTES = CUSTOM_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__NAME = CUSTOM_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__CHILDREN = CUSTOM_FIGURE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__QUALIFIED_CLASS_NAME = CUSTOM_FIGURE__QUALIFIED_CLASS_NAME;
-
-	/**
-	 * The feature id for the '<em><b>Custom Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION__CUSTOM_CHILDREN = CUSTOM_FIGURE__CUSTOM_CHILDREN;
-
-	/**
-	 * The number of structural features of the '<em>Custom Connection</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_CONNECTION_FEATURE_COUNT = CUSTOM_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Color</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLOR_FEATURE_COUNT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Red</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RGB_COLOR__RED = COLOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Green</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RGB_COLOR__GREEN = COLOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Blue</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RGB_COLOR__BLUE = COLOR_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>RGB Color</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RGB_COLOR_FEATURE_COUNT = COLOR_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTANT_COLOR__VALUE = COLOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Constant Color</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTANT_COLOR_FEATURE_COUNT = COLOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Font</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FONT_FEATURE_COUNT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Face Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASIC_FONT__FACE_NAME = FONT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASIC_FONT__HEIGHT = FONT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASIC_FONT__STYLE = FONT_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Basic Font</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BASIC_FONT_FEATURE_COUNT = FONT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POINT__X = 0;
-
-	/**
-	 * The feature id for the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POINT__Y = 1;
-
-	/**
-	 * The number of structural features of the '<em>Point</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POINT_FEATURE_COUNT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Dx</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIMENSION__DX = 0;
-
-	/**
-	 * The feature id for the '<em><b>Dy</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIMENSION__DY = 1;
-
-	/**
-	 * The number of structural features of the '<em>Dimension</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIMENSION_FEATURE_COUNT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Top</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INSETS__TOP = 0;
-
-	/**
-	 * The feature id for the '<em><b>Left</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INSETS__LEFT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Bottom</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INSETS__BOTTOM = 2;
-
-	/**
-	 * The feature id for the '<em><b>Right</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INSETS__RIGHT = 3;
-
-	/**
-	 * The number of structural features of the '<em>Insets</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int INSETS_FEATURE_COUNT = 4;
-
-	/**
-	 * The number of structural features of the '<em>Border</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BorderRefImpl <em>Border Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.BorderRefImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getBorderRef()
-	 * @generated
-	 */
-	int BORDER_REF = 53;
-
-	/**
-	 * The feature id for the '<em><b>Actual</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_REF__ACTUAL = BORDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Border Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_REF_FEATURE_COUNT = BORDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINE_BORDER__COLOR = BORDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINE_BORDER__WIDTH = BORDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Line Border</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINE_BORDER_FEATURE_COUNT = BORDER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MARGIN_BORDER__INSETS = BORDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Margin Border</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MARGIN_BORDER_FEATURE_COUNT = BORDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Outer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOUND_BORDER__OUTER = BORDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Inner</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOUND_BORDER__INNER = BORDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Compound Border</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPOUND_BORDER_FEATURE_COUNT = BORDER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_BORDER__ATTRIBUTES = BORDER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_BORDER__QUALIFIED_CLASS_NAME = BORDER_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Custom Border</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_BORDER_FEATURE_COUNT = BORDER_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LAYOUT_DATA__OWNER = 0;
-
-	/**
-	 * The number of structural features of the '<em>Layout Data</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LAYOUT_DATA_FEATURE_COUNT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_LAYOUT_DATA__OWNER = LAYOUT_DATA__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_LAYOUT_DATA__ATTRIBUTES = LAYOUT_DATA_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME = LAYOUT_DATA_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Custom Layout Data</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_LAYOUT_DATA_FEATURE_COUNT = LAYOUT_DATA_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__OWNER = LAYOUT_DATA__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Grab Excess Horizontal Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE = LAYOUT_DATA_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Grab Excess Vertical Space</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE = LAYOUT_DATA_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Vertical Alignment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT = LAYOUT_DATA_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Horizontal Alignment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT = LAYOUT_DATA_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Vertical Span</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__VERTICAL_SPAN = LAYOUT_DATA_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Horizontal Span</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__HORIZONTAL_SPAN = LAYOUT_DATA_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Horizontal Indent</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__HORIZONTAL_INDENT = LAYOUT_DATA_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Size Hint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA__SIZE_HINT = LAYOUT_DATA_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Grid Layout Data</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_DATA_FEATURE_COUNT = LAYOUT_DATA_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_LAYOUT_DATA__OWNER = LAYOUT_DATA__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Alignment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_LAYOUT_DATA__ALIGNMENT = LAYOUT_DATA_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Vertical</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_LAYOUT_DATA__VERTICAL = LAYOUT_DATA_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Border Layout Data</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_LAYOUT_DATA_FEATURE_COUNT = LAYOUT_DATA_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Layout</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LAYOUT_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LayoutRefImpl <em>Layout Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.LayoutRefImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLayoutRef()
-	 * @generated
-	 */
-	int LAYOUT_REF = 64;
-
-	/**
-	 * The feature id for the '<em><b>Actual</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LAYOUT_REF__ACTUAL = LAYOUT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Layout Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LAYOUT_REF_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_LAYOUT__ATTRIBUTES = LAYOUT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Qualified Class Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME = LAYOUT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Custom Layout</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Num Columns</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT__NUM_COLUMNS = LAYOUT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Equal Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT__EQUAL_WIDTH = LAYOUT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Margins</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT__MARGINS = LAYOUT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Spacing</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT__SPACING = LAYOUT_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Grid Layout</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GRID_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Spacing</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_LAYOUT__SPACING = LAYOUT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Border Layout</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BORDER_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl <em>Flow Layout</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getFlowLayout()
-	 * @generated
-	 */
-	int FLOW_LAYOUT = 68;
-
-	/**
-	 * The feature id for the '<em><b>Vertical</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_LAYOUT__VERTICAL = LAYOUT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Match Minor Size</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_LAYOUT__MATCH_MINOR_SIZE = LAYOUT_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Force Single Line</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_LAYOUT__FORCE_SINGLE_LINE = LAYOUT_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Major Alignment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_LAYOUT__MAJOR_ALIGNMENT = LAYOUT_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Minor Alignment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_LAYOUT__MINOR_ALIGNMENT = LAYOUT_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Major Spacing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_LAYOUT__MAJOR_SPACING = LAYOUT_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Minor Spacing</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_LAYOUT__MINOR_SPACING = LAYOUT_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Flow Layout</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FLOW_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.XYLayoutImpl <em>XY Layout</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.XYLayoutImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getXYLayout()
-	 * @generated
-	 */
-	int XY_LAYOUT = 69;
-
-	/**
-	 * The number of structural features of the '<em>XY Layout</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XY_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.XYLayoutDataImpl <em>XY Layout Data</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.XYLayoutDataImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getXYLayoutData()
-	 * @generated
-	 */
-	int XY_LAYOUT_DATA = 70;
-
-	/**
-	 * The feature id for the '<em><b>Owner</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XY_LAYOUT_DATA__OWNER = LAYOUT_DATA__OWNER;
-
-	/**
-	 * The feature id for the '<em><b>Top Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XY_LAYOUT_DATA__TOP_LEFT = LAYOUT_DATA_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XY_LAYOUT_DATA__SIZE = LAYOUT_DATA_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>XY Layout Data</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int XY_LAYOUT_DATA_FEATURE_COUNT = LAYOUT_DATA_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.StackLayoutImpl <em>Stack Layout</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.StackLayoutImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getStackLayout()
-	 * @generated
-	 */
-	int STACK_LAYOUT = 71;
-
-	/**
-	 * The number of structural features of the '<em>Stack Layout</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STACK_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CenterLayoutImpl <em>Center Layout</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CenterLayoutImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCenterLayout()
-	 * @generated
-	 */
-	int CENTER_LAYOUT = 72;
-
-	/**
-	 * The number of structural features of the '<em>Center Layout</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CENTER_LAYOUT_FEATURE_COUNT = LAYOUT_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGFigureImpl <em>SVG Figure</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.SVGFigureImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getSVGFigure()
-	 * @generated
-	 */
-	int SVG_FIGURE = 73;
-
-	/**
-	 * The feature id for the '<em><b>Layout Data</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__LAYOUT_DATA = REAL_FIGURE__LAYOUT_DATA;
-
-	/**
-	 * The feature id for the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__LAYOUT = REAL_FIGURE__LAYOUT;
-
-	/**
-	 * The feature id for the '<em><b>Descriptor</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__DESCRIPTOR = REAL_FIGURE__DESCRIPTOR;
-
-	/**
-	 * The feature id for the '<em><b>Foreground Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__FOREGROUND_COLOR = REAL_FIGURE__FOREGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Background Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__BACKGROUND_COLOR = REAL_FIGURE__BACKGROUND_COLOR;
-
-	/**
-	 * The feature id for the '<em><b>Maximum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__MAXIMUM_SIZE = REAL_FIGURE__MAXIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Minimum Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__MINIMUM_SIZE = REAL_FIGURE__MINIMUM_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Preferred Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__PREFERRED_SIZE = REAL_FIGURE__PREFERRED_SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Font</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__FONT = REAL_FIGURE__FONT;
-
-	/**
-	 * The feature id for the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__INSETS = REAL_FIGURE__INSETS;
-
-	/**
-	 * The feature id for the '<em><b>Border</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__BORDER = REAL_FIGURE__BORDER;
-
-	/**
-	 * The feature id for the '<em><b>Location</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__LOCATION = REAL_FIGURE__LOCATION;
-
-	/**
-	 * The feature id for the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__SIZE = REAL_FIGURE__SIZE;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__PINS = REAL_FIGURE__PINS;
-
-	/**
-	 * The feature id for the '<em><b>Attributes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__ATTRIBUTES = REAL_FIGURE__ATTRIBUTES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__NAME = REAL_FIGURE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__CHILDREN = REAL_FIGURE__CHILDREN;
-
-	/**
-	 * The feature id for the '<em><b>Document URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__DOCUMENT_URI = REAL_FIGURE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Properties</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__PROPERTIES = REAL_FIGURE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Area Of Interest</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__AREA_OF_INTEREST = REAL_FIGURE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>No Canvas Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__NO_CANVAS_WIDTH = REAL_FIGURE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>No Canvas Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE__NO_CANVAS_HEIGHT = REAL_FIGURE_FEATURE_COUNT + 4;
-
-	/**
-	 * The number of structural features of the '<em>SVG Figure</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_FIGURE_FEATURE_COUNT = REAL_FIGURE_FEATURE_COUNT + 5;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGPropertyImpl <em>SVG Property</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.SVGPropertyImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getSVGProperty()
-	 * @generated
-	 */
-	int SVG_PROPERTY = 74;
-
-	/**
-	 * The feature id for the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_PROPERTY__QUERY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_PROPERTY__ATTRIBUTE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_PROPERTY__TYPE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Getter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_PROPERTY__GETTER = 3;
-
-	/**
-	 * The feature id for the '<em><b>Setter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_PROPERTY__SETTER = 4;
-
-	/**
-	 * The feature id for the '<em><b>Call Super</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_PROPERTY__CALL_SUPER = 5;
-
-	/**
-	 * The number of structural features of the '<em>SVG Property</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SVG_PROPERTY_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.Rectangle2DImpl <em>Rectangle2 D</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.Rectangle2DImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getRectangle2D()
-	 * @generated
-	 */
-	int RECTANGLE2_D = 75;
-
-	/**
-	 * The feature id for the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE2_D__X = 0;
-
-	/**
-	 * The feature id for the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE2_D__Y = 1;
-
-	/**
-	 * The feature id for the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE2_D__WIDTH = 2;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE2_D__HEIGHT = 3;
-
-	/**
-	 * The number of structural features of the '<em>Rectangle2 D</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RECTANGLE2_D_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Pin <em>Pin</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Pin
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getPin()
-	 * @generated
-	 */
-	int PIN = 76;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PIN__NAME = IDENTITY__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Pin</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PIN_FEATURE_COUNT = IDENTITY_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomPinImpl <em>Custom Pin</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.CustomPinImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getCustomPin()
-	 * @generated
-	 */
-	int CUSTOM_PIN = 77;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_PIN__NAME = PIN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Custom Operation Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_PIN__CUSTOM_OPERATION_NAME = PIN_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Custom Operation Type</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_PIN__CUSTOM_OPERATION_TYPE = PIN_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Custom Pin</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CUSTOM_PIN_FEATURE_COUNT = PIN_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ColorPinImpl <em>Color Pin</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.ColorPinImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getColorPin()
-	 * @generated
-	 */
-	int COLOR_PIN = 78;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLOR_PIN__NAME = PIN__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Background Not Foreground</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLOR_PIN__BACKGROUND_NOT_FOREGROUND = PIN_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Color Pin</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLOR_PIN_FEATURE_COUNT = PIN_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.impl.VisiblePinImpl <em>Visible Pin</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.VisiblePinImpl
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getVisiblePin()
-	 * @generated
-	 */
-	int VISIBLE_PIN = 79;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VISIBLE_PIN__NAME = PIN__NAME;
-
-	/**
-	 * The number of structural features of the '<em>Visible Pin</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VISIBLE_PIN_FEATURE_COUNT = PIN_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.PinOwner <em>Pin Owner</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PinOwner
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getPinOwner()
-	 * @generated
-	 */
-	int PIN_OWNER = 80;
-
-	/**
-	 * The feature id for the '<em><b>Pins</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PIN_OWNER__PINS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Pin Owner</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PIN_OWNER_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.ColorConstants <em>Color Constants</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ColorConstants
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getColorConstants()
-	 * @generated
-	 */
-	int COLOR_CONSTANTS = 81;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Direction <em>Direction</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Direction
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getDirection()
-	 * @generated
-	 */
-	int DIRECTION = 83;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.LineKind <em>Line Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LineKind
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getLineKind()
-	 * @generated
-	 */
-	int LINE_KIND = 84;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.Alignment <em>Alignment</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getAlignment()
-	 * @generated
-	 */
-	int ALIGNMENT = 85;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType <em>SVG Property Type</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.impl.GMFGraphPackageImpl#getSVGPropertyType()
-	 * @generated
-	 */
-	int SVG_PROPERTY_TYPE = 86;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas <em>Canvas</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Canvas</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Canvas
-	 * @generated
-	 */
-	EClass getCanvas();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getFigures <em>Figures</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Figures</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Canvas#getFigures()
-	 * @see #getCanvas()
-	 * @generated
-	 */
-	EReference getCanvas_Figures();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getNodes <em>Nodes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Nodes</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Canvas#getNodes()
-	 * @see #getCanvas()
-	 * @generated
-	 */
-	EReference getCanvas_Nodes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getConnections <em>Connections</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Connections</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Canvas#getConnections()
-	 * @see #getCanvas()
-	 * @generated
-	 */
-	EReference getCanvas_Connections();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getCompartments <em>Compartments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Compartments</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Canvas#getCompartments()
-	 * @see #getCanvas()
-	 * @generated
-	 */
-	EReference getCanvas_Compartments();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas#getLabels <em>Labels</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Labels</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Canvas#getLabels()
-	 * @see #getCanvas()
-	 * @generated
-	 */
-	EReference getCanvas_Labels();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery <em>Figure Gallery</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Figure Gallery</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureGallery
-	 * @generated
-	 */
-	EClass getFigureGallery();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getFigures <em>Figures</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Figures</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getFigures()
-	 * @see #getFigureGallery()
-	 * @generated
-	 */
-	EReference getFigureGallery_Figures();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getDescriptors <em>Descriptors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Descriptors</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getDescriptors()
-	 * @see #getFigureGallery()
-	 * @generated
-	 */
-	EReference getFigureGallery_Descriptors();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getBorders <em>Borders</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Borders</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getBorders()
-	 * @see #getFigureGallery()
-	 * @generated
-	 */
-	EReference getFigureGallery_Borders();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getLayouts <em>Layouts</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Layouts</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getLayouts()
-	 * @see #getFigureGallery()
-	 * @generated
-	 */
-	EReference getFigureGallery_Layouts();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getImplementationBundle <em>Implementation Bundle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Implementation Bundle</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureGallery#getImplementationBundle()
-	 * @see #getFigureGallery()
-	 * @generated
-	 */
-	EAttribute getFigureGallery_ImplementationBundle();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Identity <em>Identity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Identity</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Identity
-	 * @generated
-	 */
-	EClass getIdentity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Identity#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Identity#getName()
-	 * @see #getIdentity()
-	 * @generated
-	 */
-	EAttribute getIdentity_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramElement <em>Diagram Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Diagram Element</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramElement
-	 * @generated
-	 */
-	EClass getDiagramElement();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramElement#getFigure <em>Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramElement#getFigure()
-	 * @see #getDiagramElement()
-	 * @generated
-	 */
-	EReference getDiagramElement_Figure();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramElement#getFacets <em>Facets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Facets</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramElement#getFacets()
-	 * @see #getDiagramElement()
-	 * @generated
-	 */
-	EReference getDiagramElement_Facets();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.AbstractNode <em>Abstract Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Node</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.AbstractNode
-	 * @generated
-	 */
-	EClass getAbstractNode();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Node <em>Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Node</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Node
-	 * @generated
-	 */
-	EClass getNode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getResizeConstraint <em>Resize Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Resize Constraint</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Node#getResizeConstraint()
-	 * @see #getNode()
-	 * @generated
-	 */
-	EAttribute getNode_ResizeConstraint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getAffixedParentSide <em>Affixed Parent Side</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Affixed Parent Side</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Node#getAffixedParentSide()
-	 * @see #getNode()
-	 * @generated
-	 */
-	EAttribute getNode_AffixedParentSide();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getContentPane <em>Content Pane</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Content Pane</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Node#getContentPane()
-	 * @see #getNode()
-	 * @generated
-	 */
-	EReference getNode_ContentPane();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess <em>Child Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Child Access</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ChildAccess
-	 * @generated
-	 */
-	EClass getChildAccess();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getOwner <em>Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Owner</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getOwner()
-	 * @see #getChildAccess()
-	 * @generated
-	 */
-	EReference getChildAccess_Owner();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getAccessor <em>Accessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Accessor</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getAccessor()
-	 * @see #getChildAccess()
-	 * @generated
-	 */
-	EAttribute getChildAccess_Accessor();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getFigure <em>Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ChildAccess#getFigure()
-	 * @see #getChildAccess()
-	 * @generated
-	 */
-	EReference getChildAccess_Figure();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure <em>Real Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Real Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RealFigure
-	 * @generated
-	 */
-	EClass getRealFigure();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RealFigure#getName()
-	 * @see #getRealFigure()
-	 * @generated
-	 */
-	EAttribute getRealFigure_Name();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Children</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RealFigure#getChildren()
-	 * @see #getRealFigure()
-	 * @generated
-	 */
-	EReference getRealFigure_Children();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Connection <em>Connection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Connection</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Connection
-	 * @generated
-	 */
-	EClass getConnection();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment <em>Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Compartment</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Compartment
-	 * @generated
-	 */
-	EClass getCompartment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#isCollapsible <em>Collapsible</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Collapsible</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Compartment#isCollapsible()
-	 * @see #getCompartment()
-	 * @generated
-	 */
-	EAttribute getCompartment_Collapsible();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#isNeedsTitle <em>Needs Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Needs Title</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Compartment#isNeedsTitle()
-	 * @see #getCompartment()
-	 * @generated
-	 */
-	EAttribute getCompartment_NeedsTitle();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment#getAccessor <em>Accessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Accessor</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Compartment#getAccessor()
-	 * @see #getCompartment()
-	 * @generated
-	 */
-	EReference getCompartment_Accessor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel <em>Diagram Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Diagram Label</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel
-	 * @generated
-	 */
-	EClass getDiagramLabel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#isElementIcon <em>Element Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Element Icon</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#isElementIcon()
-	 * @see #getDiagramLabel()
-	 * @generated
-	 */
-	EAttribute getDiagramLabel_ElementIcon();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#getAccessor <em>Accessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Accessor</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#getAccessor()
-	 * @see #getDiagramLabel()
-	 * @generated
-	 */
-	EReference getDiagramLabel_Accessor();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#getContainer <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Container</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#getContainer()
-	 * @see #getDiagramLabel()
-	 * @generated
-	 */
-	EReference getDiagramLabel_Container();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#isExternal <em>External</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>External</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel#isExternal()
-	 * @see #getDiagramLabel()
-	 * @generated
-	 */
-	EAttribute getDiagramLabel_External();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.VisualFacet <em>Visual Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Visual Facet</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.VisualFacet
-	 * @generated
-	 */
-	EClass getVisualFacet();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet <em>General Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>General Facet</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet
-	 * @generated
-	 */
-	EClass getGeneralFacet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet#getIdentifier <em>Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet#getIdentifier()
-	 * @see #getGeneralFacet()
-	 * @generated
-	 */
-	EAttribute getGeneralFacet_Identifier();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet#getData <em>Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Data</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet#getData()
-	 * @see #getGeneralFacet()
-	 * @generated
-	 */
-	EAttribute getGeneralFacet_Data();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet <em>Alignment Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Alignment Facet</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet
-	 * @generated
-	 */
-	EClass getAlignmentFacet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet#getAlignment <em>Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alignment</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet#getAlignment()
-	 * @see #getAlignmentFacet()
-	 * @generated
-	 */
-	EAttribute getAlignmentFacet_Alignment();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.GradientFacet <em>Gradient Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Gradient Facet</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GradientFacet
-	 * @generated
-	 */
-	EClass getGradientFacet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GradientFacet#getDirection <em>Direction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Direction</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GradientFacet#getDirection()
-	 * @see #getGradientFacet()
-	 * @generated
-	 */
-	EAttribute getGradientFacet_Direction();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet <em>Label Offset Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Label Offset Facet</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet
-	 * @generated
-	 */
-	EClass getLabelOffsetFacet();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet#getX <em>X</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>X</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet#getX()
-	 * @see #getLabelOffsetFacet()
-	 * @generated
-	 */
-	EAttribute getLabelOffsetFacet_X();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet#getY <em>Y</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Y</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet#getY()
-	 * @see #getLabelOffsetFacet()
-	 * @generated
-	 */
-	EAttribute getLabelOffsetFacet_Y();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet <em>Default Size Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Default Size Facet</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet
-	 * @generated
-	 */
-	EClass getDefaultSizeFacet();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet#getDefaultSize <em>Default Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Default Size</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet#getDefaultSize()
-	 * @see #getDefaultSizeFacet()
-	 * @generated
-	 */
-	EReference getDefaultSizeFacet_DefaultSize();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure <em>Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure
-	 * @generated
-	 */
-	EClass getFigure();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getDescriptor <em>Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Descriptor</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getDescriptor()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_Descriptor();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getForegroundColor <em>Foreground Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Foreground Color</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getForegroundColor()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_ForegroundColor();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getBackgroundColor <em>Background Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Background Color</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getBackgroundColor()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_BackgroundColor();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getMaximumSize <em>Maximum Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Maximum Size</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getMaximumSize()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_MaximumSize();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getMinimumSize <em>Minimum Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Minimum Size</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getMinimumSize()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_MinimumSize();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getPreferredSize <em>Preferred Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Preferred Size</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getPreferredSize()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_PreferredSize();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getFont <em>Font</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Font</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getFont()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_Font();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getInsets <em>Insets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Insets</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getInsets()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_Insets();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getBorder <em>Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Border</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getBorder()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_Border();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getLocation <em>Location</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Location</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getLocation()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_Location();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure#getSize <em>Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Size</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure#getSize()
-	 * @see #getFigure()
-	 * @generated
-	 */
-	EReference getFigure_Size();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor <em>Figure Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Figure Descriptor</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor
-	 * @generated
-	 */
-	EClass getFigureDescriptor();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getActualFigure <em>Actual Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Actual Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getActualFigure()
-	 * @see #getFigureDescriptor()
-	 * @generated
-	 */
-	EReference getFigureDescriptor_ActualFigure();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getAccessors <em>Accessors</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Accessors</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor#getAccessors()
-	 * @see #getFigureDescriptor()
-	 * @generated
-	 */
-	EReference getFigureDescriptor_Accessors();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure <em>Abstract Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure
-	 * @generated
-	 */
-	EClass getAbstractFigure();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureRef <em>Figure Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Figure Ref</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureRef
-	 * @generated
-	 */
-	EClass getFigureRef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureRef#getFigure <em>Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureRef#getFigure()
-	 * @see #getFigureRef()
-	 * @generated
-	 */
-	EReference getFigureRef_Figure();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure <em>Connection Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Connection Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure
-	 * @generated
-	 */
-	EClass getConnectionFigure();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure <em>Decoration Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Decoration Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure
-	 * @generated
-	 */
-	EClass getDecorationFigure();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape <em>Shape</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Shape</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape
-	 * @generated
-	 */
-	EClass getShape();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isOutline <em>Outline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Outline</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape#isOutline()
-	 * @see #getShape()
-	 * @generated
-	 */
-	EAttribute getShape_Outline();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isFill <em>Fill</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Fill</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape#isFill()
-	 * @see #getShape()
-	 * @generated
-	 */
-	EAttribute getShape_Fill();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#getLineWidth <em>Line Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Line Width</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape#getLineWidth()
-	 * @see #getShape()
-	 * @generated
-	 */
-	EAttribute getShape_LineWidth();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#getLineKind <em>Line Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Line Kind</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape#getLineKind()
-	 * @see #getShape()
-	 * @generated
-	 */
-	EAttribute getShape_LineKind();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isXorFill <em>Xor Fill</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Xor Fill</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape#isXorFill()
-	 * @see #getShape()
-	 * @generated
-	 */
-	EAttribute getShape_XorFill();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isXorOutline <em>Xor Outline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Xor Outline</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape#isXorOutline()
-	 * @see #getShape()
-	 * @generated
-	 */
-	EAttribute getShape_XorOutline();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#getResolvedChildren <em>Resolved Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Resolved Children</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape#getResolvedChildren()
-	 * @see #getShape()
-	 * @generated
-	 */
-	EReference getShape_ResolvedChildren();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Label <em>Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Label</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Label
-	 * @generated
-	 */
-	EClass getLabel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Label#getText <em>Text</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Text</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Label#getText()
-	 * @see #getLabel()
-	 * @generated
-	 */
-	EAttribute getLabel_Text();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer <em>Labeled Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Labeled Container</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer
-	 * @generated
-	 */
-	EClass getLabeledContainer();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel <em>Vertical Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Vertical Label</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel
-	 * @generated
-	 */
-	EClass getVerticalLabel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel#getText <em>Text</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Text</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel#getText()
-	 * @see #getVerticalLabel()
-	 * @generated
-	 */
-	EAttribute getVerticalLabel_Text();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle <em>Rectangle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Rectangle</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Rectangle
-	 * @generated
-	 */
-	EClass getRectangle();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle <em>Invisible Rectangle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Invisible Rectangle</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle
-	 * @generated
-	 */
-	EClass getInvisibleRectangle();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle <em>Rounded Rectangle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Rounded Rectangle</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle
-	 * @generated
-	 */
-	EClass getRoundedRectangle();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle#getCornerWidth <em>Corner Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Corner Width</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle#getCornerWidth()
-	 * @see #getRoundedRectangle()
-	 * @generated
-	 */
-	EAttribute getRoundedRectangle_CornerWidth();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle#getCornerHeight <em>Corner Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Corner Height</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle#getCornerHeight()
-	 * @see #getRoundedRectangle()
-	 * @generated
-	 */
-	EAttribute getRoundedRectangle_CornerHeight();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Ellipse <em>Ellipse</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Ellipse</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Ellipse
-	 * @generated
-	 */
-	EClass getEllipse();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Polyline <em>Polyline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Polyline</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Polyline
-	 * @generated
-	 */
-	EClass getPolyline();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.Polyline#getTemplate <em>Template</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Template</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Polyline#getTemplate()
-	 * @see #getPolyline()
-	 * @generated
-	 */
-	EReference getPolyline_Template();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Polygon <em>Polygon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Polygon</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Polygon
-	 * @generated
-	 */
-	EClass getPolygon();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon <em>Scalable Polygon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Scalable Polygon</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon
-	 * @generated
-	 */
-	EClass getScalablePolygon();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection <em>Polyline Connection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Polyline Connection</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection
-	 * @generated
-	 */
-	EClass getPolylineConnection();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection#getSourceDecoration <em>Source Decoration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Source Decoration</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection#getSourceDecoration()
-	 * @see #getPolylineConnection()
-	 * @generated
-	 */
-	EReference getPolylineConnection_SourceDecoration();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection#getTargetDecoration <em>Target Decoration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Target Decoration</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection#getTargetDecoration()
-	 * @see #getPolylineConnection()
-	 * @generated
-	 */
-	EReference getPolylineConnection_TargetDecoration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration <em>Polyline Decoration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Polyline Decoration</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration
-	 * @generated
-	 */
-	EClass getPolylineDecoration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration <em>Polygon Decoration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Polygon Decoration</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration
-	 * @generated
-	 */
-	EClass getPolygonDecoration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner <em>Custom Attribute Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Attribute Owner</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner
-	 * @generated
-	 */
-	EClass getCustomAttributeOwner();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner#getAttributes <em>Attributes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Attributes</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner#getAttributes()
-	 * @see #getCustomAttributeOwner()
-	 * @generated
-	 */
-	EReference getCustomAttributeOwner_Attributes();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomClass <em>Custom Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Class</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomClass
-	 * @generated
-	 */
-	EClass getCustomClass();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomClass#getQualifiedClassName <em>Qualified Class Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Qualified Class Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomClass#getQualifiedClassName()
-	 * @see #getCustomClass()
-	 * @generated
-	 */
-	EAttribute getCustomClass_QualifiedClassName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomFigure <em>Custom Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomFigure
-	 * @generated
-	 */
-	EClass getCustomFigure();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomFigure#getCustomChildren <em>Custom Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Custom Children</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomFigure#getCustomChildren()
-	 * @see #getCustomFigure()
-	 * @generated
-	 */
-	EReference getCustomFigure_CustomChildren();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration <em>Custom Decoration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Decoration</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration
-	 * @generated
-	 */
-	EClass getCustomDecoration();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomConnection <em>Custom Connection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Connection</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomConnection
-	 * @generated
-	 */
-	EClass getCustomConnection();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Color <em>Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Color</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Color
-	 * @generated
-	 */
-	EClass getColor();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor <em>RGB Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>RGB Color</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RGBColor
-	 * @generated
-	 */
-	EClass getRGBColor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getRed <em>Red</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Red</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getRed()
-	 * @see #getRGBColor()
-	 * @generated
-	 */
-	EAttribute getRGBColor_Red();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getGreen <em>Green</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Green</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getGreen()
-	 * @see #getRGBColor()
-	 * @generated
-	 */
-	EAttribute getRGBColor_Green();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getBlue <em>Blue</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Blue</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getBlue()
-	 * @see #getRGBColor()
-	 * @generated
-	 */
-	EAttribute getRGBColor_Blue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.ConstantColor <em>Constant Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Constant Color</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ConstantColor
-	 * @generated
-	 */
-	EClass getConstantColor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.ConstantColor#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ConstantColor#getValue()
-	 * @see #getConstantColor()
-	 * @generated
-	 */
-	EAttribute getConstantColor_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Font <em>Font</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Font</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Font
-	 * @generated
-	 */
-	EClass getFont();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont <em>Basic Font</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Basic Font</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BasicFont
-	 * @generated
-	 */
-	EClass getBasicFont();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getFaceName <em>Face Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Face Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getFaceName()
-	 * @see #getBasicFont()
-	 * @generated
-	 */
-	EAttribute getBasicFont_FaceName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getHeight <em>Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Height</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getHeight()
-	 * @see #getBasicFont()
-	 * @generated
-	 */
-	EAttribute getBasicFont_Height();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Style</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BasicFont#getStyle()
-	 * @see #getBasicFont()
-	 * @generated
-	 */
-	EAttribute getBasicFont_Style();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.gmfgraph.FontStyle <em>Font Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Font Style</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FontStyle
-	 * @generated
-	 */
-	EEnum getFontStyle();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Point <em>Point</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Point</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Point
-	 * @generated
-	 */
-	EClass getPoint();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Point#getX <em>X</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>X</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Point#getX()
-	 * @see #getPoint()
-	 * @generated
-	 */
-	EAttribute getPoint_X();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Point#getY <em>Y</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Y</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Point#getY()
-	 * @see #getPoint()
-	 * @generated
-	 */
-	EAttribute getPoint_Y();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Dimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Dimension</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Dimension
-	 * @generated
-	 */
-	EClass getDimension();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Dimension#getDx <em>Dx</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Dx</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Dimension#getDx()
-	 * @see #getDimension()
-	 * @generated
-	 */
-	EAttribute getDimension_Dx();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Dimension#getDy <em>Dy</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Dy</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Dimension#getDy()
-	 * @see #getDimension()
-	 * @generated
-	 */
-	EAttribute getDimension_Dy();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets <em>Insets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Insets</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Insets
-	 * @generated
-	 */
-	EClass getInsets();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getTop <em>Top</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Top</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Insets#getTop()
-	 * @see #getInsets()
-	 * @generated
-	 */
-	EAttribute getInsets_Top();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getLeft <em>Left</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Left</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Insets#getLeft()
-	 * @see #getInsets()
-	 * @generated
-	 */
-	EAttribute getInsets_Left();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getBottom <em>Bottom</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Bottom</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Insets#getBottom()
-	 * @see #getInsets()
-	 * @generated
-	 */
-	EAttribute getInsets_Bottom();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getRight <em>Right</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Right</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Insets#getRight()
-	 * @see #getInsets()
-	 * @generated
-	 */
-	EAttribute getInsets_Right();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Border <em>Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Border</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Border
-	 * @generated
-	 */
-	EClass getBorder();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderRef <em>Border Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Border Ref</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderRef
-	 * @generated
-	 */
-	EClass getBorderRef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderRef#getActual <em>Actual</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Actual</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderRef#getActual()
-	 * @see #getBorderRef()
-	 * @generated
-	 */
-	EReference getBorderRef_Actual();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder <em>Line Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Line Border</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LineBorder
-	 * @generated
-	 */
-	EClass getLineBorder();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder#getColor <em>Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Color</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LineBorder#getColor()
-	 * @see #getLineBorder()
-	 * @generated
-	 */
-	EReference getLineBorder_Color();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Width</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LineBorder#getWidth()
-	 * @see #getLineBorder()
-	 * @generated
-	 */
-	EAttribute getLineBorder_Width();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.MarginBorder <em>Margin Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Margin Border</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.MarginBorder
-	 * @generated
-	 */
-	EClass getMarginBorder();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.MarginBorder#getInsets <em>Insets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Insets</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.MarginBorder#getInsets()
-	 * @see #getMarginBorder()
-	 * @generated
-	 */
-	EReference getMarginBorder_Insets();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder <em>Compound Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Compound Border</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder
-	 * @generated
-	 */
-	EClass getCompoundBorder();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder#getOuter <em>Outer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Outer</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder#getOuter()
-	 * @see #getCompoundBorder()
-	 * @generated
-	 */
-	EReference getCompoundBorder_Outer();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder#getInner <em>Inner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Inner</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder#getInner()
-	 * @see #getCompoundBorder()
-	 * @generated
-	 */
-	EReference getCompoundBorder_Inner();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomBorder <em>Custom Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Border</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomBorder
-	 * @generated
-	 */
-	EClass getCustomBorder();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutData <em>Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Layout Data</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LayoutData
-	 * @generated
-	 */
-	EClass getLayoutData();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutData#getOwner <em>Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Owner</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LayoutData#getOwner()
-	 * @see #getLayoutData()
-	 * @generated
-	 */
-	EReference getLayoutData_Owner();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData <em>Custom Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Layout Data</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData
-	 * @generated
-	 */
-	EClass getCustomLayoutData();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData <em>Grid Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Grid Layout Data</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData
-	 * @generated
-	 */
-	EClass getGridLayoutData();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#isGrabExcessHorizontalSpace <em>Grab Excess Horizontal Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Grab Excess Horizontal Space</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#isGrabExcessHorizontalSpace()
-	 * @see #getGridLayoutData()
-	 * @generated
-	 */
-	EAttribute getGridLayoutData_GrabExcessHorizontalSpace();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#isGrabExcessVerticalSpace <em>Grab Excess Vertical Space</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Grab Excess Vertical Space</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#isGrabExcessVerticalSpace()
-	 * @see #getGridLayoutData()
-	 * @generated
-	 */
-	EAttribute getGridLayoutData_GrabExcessVerticalSpace();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getVerticalAlignment <em>Vertical Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Vertical Alignment</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getVerticalAlignment()
-	 * @see #getGridLayoutData()
-	 * @generated
-	 */
-	EAttribute getGridLayoutData_VerticalAlignment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalAlignment <em>Horizontal Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Horizontal Alignment</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalAlignment()
-	 * @see #getGridLayoutData()
-	 * @generated
-	 */
-	EAttribute getGridLayoutData_HorizontalAlignment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getVerticalSpan <em>Vertical Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Vertical Span</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getVerticalSpan()
-	 * @see #getGridLayoutData()
-	 * @generated
-	 */
-	EAttribute getGridLayoutData_VerticalSpan();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalSpan <em>Horizontal Span</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Horizontal Span</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalSpan()
-	 * @see #getGridLayoutData()
-	 * @generated
-	 */
-	EAttribute getGridLayoutData_HorizontalSpan();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalIndent <em>Horizontal Indent</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Horizontal Indent</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalIndent()
-	 * @see #getGridLayoutData()
-	 * @generated
-	 */
-	EAttribute getGridLayoutData_HorizontalIndent();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getSizeHint <em>Size Hint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Size Hint</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getSizeHint()
-	 * @see #getGridLayoutData()
-	 * @generated
-	 */
-	EReference getGridLayoutData_SizeHint();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData <em>Border Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Border Layout Data</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData
-	 * @generated
-	 */
-	EClass getBorderLayoutData();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData#getAlignment <em>Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Alignment</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData#getAlignment()
-	 * @see #getBorderLayoutData()
-	 * @generated
-	 */
-	EAttribute getBorderLayoutData_Alignment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData#isVertical <em>Vertical</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Vertical</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData#isVertical()
-	 * @see #getBorderLayoutData()
-	 * @generated
-	 */
-	EAttribute getBorderLayoutData_Vertical();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable <em>Layoutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Layoutable</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layoutable
-	 * @generated
-	 */
-	EClass getLayoutable();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayoutData <em>Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Layout Data</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayoutData()
-	 * @see #getLayoutable()
-	 * @generated
-	 */
-	EReference getLayoutable_LayoutData();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayout <em>Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayout()
-	 * @see #getLayoutable()
-	 * @generated
-	 */
-	EReference getLayoutable_Layout();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Layout <em>Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layout
-	 * @generated
-	 */
-	EClass getLayout();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutRef <em>Layout Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Layout Ref</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LayoutRef
-	 * @generated
-	 */
-	EClass getLayoutRef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutRef#getActual <em>Actual</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Actual</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LayoutRef#getActual()
-	 * @see #getLayoutRef()
-	 * @generated
-	 */
-	EReference getLayoutRef_Actual();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayout <em>Custom Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomLayout
-	 * @generated
-	 */
-	EClass getCustomLayout();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout <em>Grid Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Grid Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayout
-	 * @generated
-	 */
-	EClass getGridLayout();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getNumColumns <em>Num Columns</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Num Columns</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getNumColumns()
-	 * @see #getGridLayout()
-	 * @generated
-	 */
-	EAttribute getGridLayout_NumColumns();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#isEqualWidth <em>Equal Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Equal Width</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayout#isEqualWidth()
-	 * @see #getGridLayout()
-	 * @generated
-	 */
-	EAttribute getGridLayout_EqualWidth();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getMargins <em>Margins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Margins</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getMargins()
-	 * @see #getGridLayout()
-	 * @generated
-	 */
-	EReference getGridLayout_Margins();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getSpacing <em>Spacing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Spacing</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getSpacing()
-	 * @see #getGridLayout()
-	 * @generated
-	 */
-	EReference getGridLayout_Spacing();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayout <em>Border Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Border Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderLayout
-	 * @generated
-	 */
-	EClass getBorderLayout();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayout#getSpacing <em>Spacing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Spacing</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderLayout#getSpacing()
-	 * @see #getBorderLayout()
-	 * @generated
-	 */
-	EReference getBorderLayout_Spacing();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute <em>Custom Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Attribute</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute
-	 * @generated
-	 */
-	EClass getCustomAttribute();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#getName()
-	 * @see #getCustomAttribute()
-	 * @generated
-	 */
-	EAttribute getCustomAttribute_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#getValue()
-	 * @see #getCustomAttribute()
-	 * @generated
-	 */
-	EAttribute getCustomAttribute_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#isDirectAccess <em>Direct Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Direct Access</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#isDirectAccess()
-	 * @see #getCustomAttribute()
-	 * @generated
-	 */
-	EAttribute getCustomAttribute_DirectAccess();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#isMultiStatementValue <em>Multi Statement Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Multi Statement Value</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute#isMultiStatementValue()
-	 * @see #getCustomAttribute()
-	 * @generated
-	 */
-	EAttribute getCustomAttribute_MultiStatementValue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor <em>Figure Accessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Figure Accessor</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor
-	 * @generated
-	 */
-	EClass getFigureAccessor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor#getAccessor <em>Accessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Accessor</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor#getAccessor()
-	 * @see #getFigureAccessor()
-	 * @generated
-	 */
-	EAttribute getFigureAccessor_Accessor();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor#getTypedFigure <em>Typed Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Typed Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor#getTypedFigure()
-	 * @see #getFigureAccessor()
-	 * @generated
-	 */
-	EReference getFigureAccessor_TypedFigure();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout <em>Flow Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Flow Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout
-	 * @generated
-	 */
-	EClass getFlowLayout();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isVertical <em>Vertical</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Vertical</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isVertical()
-	 * @see #getFlowLayout()
-	 * @generated
-	 */
-	EAttribute getFlowLayout_Vertical();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isMatchMinorSize <em>Match Minor Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Match Minor Size</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isMatchMinorSize()
-	 * @see #getFlowLayout()
-	 * @generated
-	 */
-	EAttribute getFlowLayout_MatchMinorSize();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isForceSingleLine <em>Force Single Line</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Force Single Line</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#isForceSingleLine()
-	 * @see #getFlowLayout()
-	 * @generated
-	 */
-	EAttribute getFlowLayout_ForceSingleLine();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMajorAlignment <em>Major Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Major Alignment</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMajorAlignment()
-	 * @see #getFlowLayout()
-	 * @generated
-	 */
-	EAttribute getFlowLayout_MajorAlignment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMinorAlignment <em>Minor Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Minor Alignment</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMinorAlignment()
-	 * @see #getFlowLayout()
-	 * @generated
-	 */
-	EAttribute getFlowLayout_MinorAlignment();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMajorSpacing <em>Major Spacing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Major Spacing</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMajorSpacing()
-	 * @see #getFlowLayout()
-	 * @generated
-	 */
-	EAttribute getFlowLayout_MajorSpacing();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMinorSpacing <em>Minor Spacing</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Minor Spacing</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout#getMinorSpacing()
-	 * @see #getFlowLayout()
-	 * @generated
-	 */
-	EAttribute getFlowLayout_MinorSpacing();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayout <em>XY Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>XY Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.XYLayout
-	 * @generated
-	 */
-	EClass getXYLayout();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData <em>XY Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>XY Layout Data</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData
-	 * @generated
-	 */
-	EClass getXYLayoutData();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData#getTopLeft <em>Top Left</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Top Left</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData#getTopLeft()
-	 * @see #getXYLayoutData()
-	 * @generated
-	 */
-	EReference getXYLayoutData_TopLeft();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData#getSize <em>Size</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Size</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData#getSize()
-	 * @see #getXYLayoutData()
-	 * @generated
-	 */
-	EReference getXYLayoutData_Size();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.StackLayout <em>Stack Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Stack Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.StackLayout
-	 * @generated
-	 */
-	EClass getStackLayout();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CenterLayout <em>Center Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Center Layout</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CenterLayout
-	 * @generated
-	 */
-	EClass getCenterLayout();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure <em>SVG Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>SVG Figure</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGFigure
-	 * @generated
-	 */
-	EClass getSVGFigure();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getDocumentURI <em>Document URI</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Document URI</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getDocumentURI()
-	 * @see #getSVGFigure()
-	 * @generated
-	 */
-	EAttribute getSVGFigure_DocumentURI();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getProperties <em>Properties</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Properties</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getProperties()
-	 * @see #getSVGFigure()
-	 * @generated
-	 */
-	EReference getSVGFigure_Properties();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getAreaOfInterest <em>Area Of Interest</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Area Of Interest</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getAreaOfInterest()
-	 * @see #getSVGFigure()
-	 * @generated
-	 */
-	EReference getSVGFigure_AreaOfInterest();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#isNoCanvasWidth <em>No Canvas Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>No Canvas Width</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#isNoCanvasWidth()
-	 * @see #getSVGFigure()
-	 * @generated
-	 */
-	EAttribute getSVGFigure_NoCanvasWidth();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#isNoCanvasHeight <em>No Canvas Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>No Canvas Height</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#isNoCanvasHeight()
-	 * @see #getSVGFigure()
-	 * @generated
-	 */
-	EAttribute getSVGFigure_NoCanvasHeight();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty <em>SVG Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>SVG Property</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGProperty
-	 * @generated
-	 */
-	EClass getSVGProperty();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getQuery <em>Query</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Query</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getQuery()
-	 * @see #getSVGProperty()
-	 * @generated
-	 */
-	EAttribute getSVGProperty_Query();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getAttribute <em>Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Attribute</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getAttribute()
-	 * @see #getSVGProperty()
-	 * @generated
-	 */
-	EAttribute getSVGProperty_Attribute();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getType <em>Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Type</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getType()
-	 * @see #getSVGProperty()
-	 * @generated
-	 */
-	EAttribute getSVGProperty_Type();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getGetter <em>Getter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Getter</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getGetter()
-	 * @see #getSVGProperty()
-	 * @generated
-	 */
-	EAttribute getSVGProperty_Getter();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getSetter <em>Setter</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Setter</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getSetter()
-	 * @see #getSVGProperty()
-	 * @generated
-	 */
-	EAttribute getSVGProperty_Setter();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#isCallSuper <em>Call Super</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Call Super</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#isCallSuper()
-	 * @see #getSVGProperty()
-	 * @generated
-	 */
-	EAttribute getSVGProperty_CallSuper();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D <em>Rectangle2 D</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Rectangle2 D</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D
-	 * @generated
-	 */
-	EClass getRectangle2D();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getX <em>X</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>X</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getX()
-	 * @see #getRectangle2D()
-	 * @generated
-	 */
-	EAttribute getRectangle2D_X();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getY <em>Y</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Y</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getY()
-	 * @see #getRectangle2D()
-	 * @generated
-	 */
-	EAttribute getRectangle2D_Y();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getWidth <em>Width</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Width</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getWidth()
-	 * @see #getRectangle2D()
-	 * @generated
-	 */
-	EAttribute getRectangle2D_Width();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getHeight <em>Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Height</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getHeight()
-	 * @see #getRectangle2D()
-	 * @generated
-	 */
-	EAttribute getRectangle2D_Height();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.Pin <em>Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Pin</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Pin
-	 * @generated
-	 */
-	EClass getPin();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin <em>Custom Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Custom Pin</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomPin
-	 * @generated
-	 */
-	EClass getCustomPin();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin#getCustomOperationName <em>Custom Operation Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Custom Operation Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomPin#getCustomOperationName()
-	 * @see #getCustomPin()
-	 * @generated
-	 */
-	EAttribute getCustomPin_CustomOperationName();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin#getCustomOperationType <em>Custom Operation Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Custom Operation Type</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomPin#getCustomOperationType()
-	 * @see #getCustomPin()
-	 * @generated
-	 */
-	EAttribute getCustomPin_CustomOperationType();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.ColorPin <em>Color Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Color Pin</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ColorPin
-	 * @generated
-	 */
-	EClass getColorPin();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.gmfgraph.ColorPin#isBackgroundNotForeground <em>Background Not Foreground</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Background Not Foreground</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ColorPin#isBackgroundNotForeground()
-	 * @see #getColorPin()
-	 * @generated
-	 */
-	EAttribute getColorPin_BackgroundNotForeground();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.VisiblePin <em>Visible Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Visible Pin</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.VisiblePin
-	 * @generated
-	 */
-	EClass getVisiblePin();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.gmfgraph.PinOwner <em>Pin Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Pin Owner</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PinOwner
-	 * @generated
-	 */
-	EClass getPinOwner();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.gmfgraph.PinOwner#getPins <em>Pins</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Pins</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PinOwner#getPins()
-	 * @see #getPinOwner()
-	 * @generated
-	 */
-	EReference getPinOwner_Pins();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.gmfgraph.ColorConstants <em>Color Constants</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Color Constants</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ColorConstants
-	 * @generated
-	 */
-	EEnum getColorConstants();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.gmfgraph.Direction <em>Direction</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Direction</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Direction
-	 * @generated
-	 */
-	EEnum getDirection();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.gmfgraph.LineKind <em>Line Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Line Kind</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LineKind
-	 * @generated
-	 */
-	EEnum getLineKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.gmfgraph.Alignment <em>Alignment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Alignment</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @generated
-	 */
-	EEnum getAlignment();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType <em>SVG Property Type</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>SVG Property Type</em>'.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType
-	 * @generated
-	 */
-	EEnum getSVGPropertyType();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	GMFGraphFactory getGMFGraphFactory();
-
-} //GMFGraphPackage
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GeneralFacet.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GeneralFacet.java
deleted file mode 100644
index 61c827e6e4a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GeneralFacet.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>General Facet</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * provide means to attach arbitrary data to your diagram element definition. It's up to you (template author) to process it somehow.
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet#getData <em>Data</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGeneralFacet()
- * @model
- * @generated
- */
-public interface GeneralFacet extends VisualFacet {
-	/**
-	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Identifier</em>' attribute.
-	 * @see #setIdentifier(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGeneralFacet_Identifier()
-	 * @model id="true"
-	 * @generated
-	 */
-	String getIdentifier();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Identifier</em>' attribute.
-	 * @see #getIdentifier()
-	 * @generated
-	 */
-	void setIdentifier(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Data</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Data</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Data</em>' attribute.
-	 * @see #setData(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGeneralFacet_Data()
-	 * @model
-	 * @generated
-	 */
-	String getData();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet#getData <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Data</em>' attribute.
-	 * @see #getData()
-	 * @generated
-	 */
-	void setData(String value);
-
-} // GeneralFacet
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GradientFacet.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GradientFacet.java
deleted file mode 100644
index d5af7df9740..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GradientFacet.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Gradient Facet</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GradientFacet#getDirection <em>Direction</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGradientFacet()
- * @model
- * @generated
- */
-public interface GradientFacet extends VisualFacet {
-	/**
-	 * Returns the value of the '<em><b>Direction</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Direction}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Direction</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Direction</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Direction
-	 * @see #setDirection(Direction)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGradientFacet_Direction()
-	 * @model
-	 * @generated
-	 */
-	Direction getDirection();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GradientFacet#getDirection <em>Direction</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Direction</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Direction
-	 * @see #getDirection()
-	 * @generated
-	 */
-	void setDirection(Direction value);
-
-} // GradientFacet
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GridLayout.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GridLayout.java
deleted file mode 100644
index f898af640fc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GridLayout.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Grid Layout</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getNumColumns <em>Num Columns</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#isEqualWidth <em>Equal Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getMargins <em>Margins</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getSpacing <em>Spacing</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayout()
- * @model
- * @generated
- */
-public interface GridLayout extends Layout {
-	/**
-	 * Returns the value of the '<em><b>Num Columns</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Num Columns</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Num Columns</em>' attribute.
-	 * @see #setNumColumns(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayout_NumColumns()
-	 * @model default="1" required="true"
-	 * @generated
-	 */
-	int getNumColumns();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getNumColumns <em>Num Columns</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Num Columns</em>' attribute.
-	 * @see #getNumColumns()
-	 * @generated
-	 */
-	void setNumColumns(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Equal Width</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Equal Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Equal Width</em>' attribute.
-	 * @see #setEqualWidth(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayout_EqualWidth()
-	 * @model default="true" required="true"
-	 * @generated
-	 */
-	boolean isEqualWidth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#isEqualWidth <em>Equal Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Equal Width</em>' attribute.
-	 * @see #isEqualWidth()
-	 * @generated
-	 */
-	void setEqualWidth(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Margins</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Margins</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Margins</em>' containment reference.
-	 * @see #setMargins(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayout_Margins()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Dimension getMargins();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getMargins <em>Margins</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Margins</em>' containment reference.
-	 * @see #getMargins()
-	 * @generated
-	 */
-	void setMargins(Dimension value);
-
-	/**
-	 * Returns the value of the '<em><b>Spacing</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Spacing</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Spacing</em>' containment reference.
-	 * @see #setSpacing(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayout_Spacing()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Dimension getSpacing();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout#getSpacing <em>Spacing</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Spacing</em>' containment reference.
-	 * @see #getSpacing()
-	 * @generated
-	 */
-	void setSpacing(Dimension value);
-
-} // GridLayout
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GridLayoutData.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GridLayoutData.java
deleted file mode 100644
index f03fefb9141..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/GridLayoutData.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Grid Layout Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#isGrabExcessHorizontalSpace <em>Grab Excess Horizontal Space</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#isGrabExcessVerticalSpace <em>Grab Excess Vertical Space</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getVerticalAlignment <em>Vertical Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalAlignment <em>Horizontal Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getVerticalSpan <em>Vertical Span</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalSpan <em>Horizontal Span</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalIndent <em>Horizontal Indent</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getSizeHint <em>Size Hint</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData()
- * @model
- * @generated
- */
-public interface GridLayoutData extends LayoutData {
-	/**
-	 * Returns the value of the '<em><b>Grab Excess Horizontal Space</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Grab Excess Horizontal Space</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Grab Excess Horizontal Space</em>' attribute.
-	 * @see #setGrabExcessHorizontalSpace(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_GrabExcessHorizontalSpace()
-	 * @model default="false" required="true"
-	 * @generated
-	 */
-	boolean isGrabExcessHorizontalSpace();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#isGrabExcessHorizontalSpace <em>Grab Excess Horizontal Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Grab Excess Horizontal Space</em>' attribute.
-	 * @see #isGrabExcessHorizontalSpace()
-	 * @generated
-	 */
-	void setGrabExcessHorizontalSpace(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Grab Excess Vertical Space</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Grab Excess Vertical Space</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Grab Excess Vertical Space</em>' attribute.
-	 * @see #setGrabExcessVerticalSpace(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_GrabExcessVerticalSpace()
-	 * @model default="false" required="true"
-	 * @generated
-	 */
-	boolean isGrabExcessVerticalSpace();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#isGrabExcessVerticalSpace <em>Grab Excess Vertical Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Grab Excess Vertical Space</em>' attribute.
-	 * @see #isGrabExcessVerticalSpace()
-	 * @generated
-	 */
-	void setGrabExcessVerticalSpace(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Vertical Alignment</b></em>' attribute.
-	 * The default value is <code>"CENTER"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Alignment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Vertical Alignment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Vertical Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #setVerticalAlignment(Alignment)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_VerticalAlignment()
-	 * @model default="CENTER" required="true"
-	 * @generated
-	 */
-	Alignment getVerticalAlignment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getVerticalAlignment <em>Vertical Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Vertical Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #getVerticalAlignment()
-	 * @generated
-	 */
-	void setVerticalAlignment(Alignment value);
-
-	/**
-	 * Returns the value of the '<em><b>Horizontal Alignment</b></em>' attribute.
-	 * The default value is <code>"CENTER"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Alignment}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Horizontal Alignment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Horizontal Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #setHorizontalAlignment(Alignment)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_HorizontalAlignment()
-	 * @model default="CENTER" required="true"
-	 * @generated
-	 */
-	Alignment getHorizontalAlignment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalAlignment <em>Horizontal Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Horizontal Alignment</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Alignment
-	 * @see #getHorizontalAlignment()
-	 * @generated
-	 */
-	void setHorizontalAlignment(Alignment value);
-
-	/**
-	 * Returns the value of the '<em><b>Vertical Span</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Vertical Span</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Vertical Span</em>' attribute.
-	 * @see #setVerticalSpan(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_VerticalSpan()
-	 * @model default="1" required="true"
-	 * @generated
-	 */
-	int getVerticalSpan();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getVerticalSpan <em>Vertical Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Vertical Span</em>' attribute.
-	 * @see #getVerticalSpan()
-	 * @generated
-	 */
-	void setVerticalSpan(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Horizontal Span</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Horizontal Span</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Horizontal Span</em>' attribute.
-	 * @see #setHorizontalSpan(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_HorizontalSpan()
-	 * @model default="1" required="true"
-	 * @generated
-	 */
-	int getHorizontalSpan();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalSpan <em>Horizontal Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Horizontal Span</em>' attribute.
-	 * @see #getHorizontalSpan()
-	 * @generated
-	 */
-	void setHorizontalSpan(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Horizontal Indent</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Horizontal Indent</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Horizontal Indent</em>' attribute.
-	 * @see #setHorizontalIndent(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_HorizontalIndent()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getHorizontalIndent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getHorizontalIndent <em>Horizontal Indent</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Horizontal Indent</em>' attribute.
-	 * @see #getHorizontalIndent()
-	 * @generated
-	 */
-	void setHorizontalIndent(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Size Hint</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Size Hint</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Size Hint</em>' containment reference.
-	 * @see #setSizeHint(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getGridLayoutData_SizeHint()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Dimension getSizeHint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData#getSizeHint <em>Size Hint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Size Hint</em>' containment reference.
-	 * @see #getSizeHint()
-	 * @generated
-	 */
-	void setSizeHint(Dimension value);
-
-} // GridLayoutData
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Identity.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Identity.java
deleted file mode 100644
index 2852755f370..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Identity.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Identity</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Easy and readable way to reference element of the model from another one
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Identity#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getIdentity()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Identity extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getIdentity_Name()
-	 * @model id="true" required="true"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Identity#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // Identity
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Insets.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Insets.java
deleted file mode 100644
index 1d850fa600d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Insets.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Insets</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getTop <em>Top</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getLeft <em>Left</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getBottom <em>Bottom</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getInsets()
- * @model
- * @generated
- */
-public interface Insets extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Top</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Top</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Top</em>' attribute.
-	 * @see #setTop(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getInsets_Top()
-	 * @model
-	 * @generated
-	 */
-	int getTop();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getTop <em>Top</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Top</em>' attribute.
-	 * @see #getTop()
-	 * @generated
-	 */
-	void setTop(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Left</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Left</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Left</em>' attribute.
-	 * @see #setLeft(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getInsets_Left()
-	 * @model
-	 * @generated
-	 */
-	int getLeft();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getLeft <em>Left</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Left</em>' attribute.
-	 * @see #getLeft()
-	 * @generated
-	 */
-	void setLeft(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Bottom</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bottom</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Bottom</em>' attribute.
-	 * @see #setBottom(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getInsets_Bottom()
-	 * @model
-	 * @generated
-	 */
-	int getBottom();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getBottom <em>Bottom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bottom</em>' attribute.
-	 * @see #getBottom()
-	 * @generated
-	 */
-	void setBottom(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Right</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Right</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Right</em>' attribute.
-	 * @see #setRight(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getInsets_Right()
-	 * @model
-	 * @generated
-	 */
-	int getRight();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets#getRight <em>Right</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Right</em>' attribute.
-	 * @see #getRight()
-	 * @generated
-	 */
-	void setRight(int value);
-
-} // Insets
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/InvisibleRectangle.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/InvisibleRectangle.java
deleted file mode 100644
index 1ab71332211..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/InvisibleRectangle.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Invisible Rectangle</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.RectangleFigure #opaque=false, #outline=false, #fill=false
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getInvisibleRectangle()
- * @model
- * @generated
- */
-public interface InvisibleRectangle extends RealFigure {
-} // InvisibleRectangle
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Label.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Label.java
deleted file mode 100644
index 2985768c1b9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Label.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Label</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.gmf.runtime.draw2d.ui.figures.WrappingLabel
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Label#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLabel()
- * @model
- * @generated
- */
-public interface Label extends RealFigure {
-	/**
-	 * Returns the value of the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Text</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Text</em>' attribute.
-	 * @see #setText(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLabel_Text()
-	 * @model
-	 * @generated
-	 */
-	String getText();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Label#getText <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Text</em>' attribute.
-	 * @see #getText()
-	 * @generated
-	 */
-	void setText(String value);
-
-} // Label
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LabelOffsetFacet.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LabelOffsetFacet.java
deleted file mode 100644
index ea32cb44d42..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LabelOffsetFacet.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Label Offset Facet</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet#getY <em>Y</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLabelOffsetFacet()
- * @model
- * @generated
- */
-public interface LabelOffsetFacet extends VisualFacet {
-	/**
-	 * Returns the value of the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>X</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>X</em>' attribute.
-	 * @see #setX(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLabelOffsetFacet_X()
-	 * @model
-	 * @generated
-	 */
-	int getX();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet#getX <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>X</em>' attribute.
-	 * @see #getX()
-	 * @generated
-	 */
-	void setX(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Y</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Y</em>' attribute.
-	 * @see #setY(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLabelOffsetFacet_Y()
-	 * @model
-	 * @generated
-	 */
-	int getY();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet#getY <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Y</em>' attribute.
-	 * @see #getY()
-	 * @generated
-	 */
-	void setY(int value);
-
-} // LabelOffsetFacet
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LabeledContainer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LabeledContainer.java
deleted file mode 100644
index a9b4812adf1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LabeledContainer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Labeled Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.LabeledContainer
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLabeledContainer()
- * @model
- * @generated
- */
-public interface LabeledContainer extends RealFigure {
-} // LabeledContainer
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Layout.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Layout.java
deleted file mode 100644
index 8773f02fee7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Layout.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Layout</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLayout()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Layout extends EObject {
-} // Layout
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LayoutData.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LayoutData.java
deleted file mode 100644
index 1f3af5f9c7b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LayoutData.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Layout Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutData#getOwner <em>Owner</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLayoutData()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface LayoutData extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Owner</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayoutData <em>Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Owner</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owner</em>' container reference.
-	 * @see #setOwner(Layoutable)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLayoutData_Owner()
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayoutData
-	 * @model opposite="layoutData" required="true" transient="false"
-	 * @generated
-	 */
-	Layoutable getOwner();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutData#getOwner <em>Owner</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owner</em>' container reference.
-	 * @see #getOwner()
-	 * @generated
-	 */
-	void setOwner(Layoutable value);
-
-} // LayoutData
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LayoutRef.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LayoutRef.java
deleted file mode 100644
index a7f97230c3e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LayoutRef.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Layout Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Layout reuse mechanism
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutRef#getActual <em>Actual</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLayoutRef()
- * @model
- * @generated
- */
-public interface LayoutRef extends Layout {
-	/**
-	 * Returns the value of the '<em><b>Actual</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * constraint: actual should not be another LayoutRef
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Actual</em>' reference.
-	 * @see #setActual(Layout)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLayoutRef_Actual()
-	 * @model required="true"
-	 * @generated
-	 */
-	Layout getActual();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutRef#getActual <em>Actual</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Actual</em>' reference.
-	 * @see #getActual()
-	 * @generated
-	 */
-	void setActual(Layout value);
-
-} // LayoutRef
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Layoutable.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Layoutable.java
deleted file mode 100644
index 5f1057a624e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Layoutable.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Layoutable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayoutData <em>Layout Data</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayout <em>Layout</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLayoutable()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Layoutable extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Layout Data</b></em>' containment reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutData#getOwner <em>Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Layout Data</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Layout Data</em>' containment reference.
-	 * @see #setLayoutData(LayoutData)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLayoutable_LayoutData()
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LayoutData#getOwner
-	 * @model opposite="owner" containment="true"
-	 * @generated
-	 */
-	LayoutData getLayoutData();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayoutData <em>Layout Data</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Layout Data</em>' containment reference.
-	 * @see #getLayoutData()
-	 * @generated
-	 */
-	void setLayoutData(LayoutData value);
-
-	/**
-	 * Returns the value of the '<em><b>Layout</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Layout</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Layout</em>' containment reference.
-	 * @see #setLayout(Layout)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLayoutable_Layout()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Layout getLayout();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable#getLayout <em>Layout</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Layout</em>' containment reference.
-	 * @see #getLayout()
-	 * @generated
-	 */
-	void setLayout(Layout value);
-
-} // Layoutable
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LineBorder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LineBorder.java
deleted file mode 100644
index 73e47bb0a77..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LineBorder.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Line Border</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder#getColor <em>Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder#getWidth <em>Width</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLineBorder()
- * @model
- * @generated
- */
-public interface LineBorder extends Border {
-	/**
-	 * Returns the value of the '<em><b>Color</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Color</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Color</em>' containment reference.
-	 * @see #setColor(Color)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLineBorder_Color()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Color getColor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder#getColor <em>Color</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Color</em>' containment reference.
-	 * @see #getColor()
-	 * @generated
-	 */
-	void setColor(Color value);
-
-	/**
-	 * Returns the value of the '<em><b>Width</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Width</em>' attribute.
-	 * @see #setWidth(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLineBorder_Width()
-	 * @model default="1"
-	 * @generated
-	 */
-	int getWidth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
-	 * @see #getWidth()
-	 * @generated
-	 */
-	void setWidth(int value);
-
-} // LineBorder
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LineKind.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LineKind.java
deleted file mode 100644
index 97ce9e2c80f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/LineKind.java
+++ /dev/null
@@ -1,331 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Line Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.Graphics.LINE_* (== org.eclipse.swt.SWT.LINE_*. Values are same as SWT constants
- * <!-- end-model-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getLineKind()
- * @model
- * @generated
- */
-public enum LineKind implements Enumerator
-{
-	/**
-	 * The '<em><b>LINE SOLID</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LINE_SOLID
-	 * @generated
-	 * @ordered
-	 */
-	LINE_SOLID_LITERAL(1, "LINE_SOLID", "LINE_SOLID"),
-	/**
-	 * The '<em><b>LINE DASH</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LINE_DASH
-	 * @generated
-	 * @ordered
-	 */
-	LINE_DASH_LITERAL(2, "LINE_DASH", "LINE_DASH"),
-	/**
-	 * The '<em><b>LINE DOT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LINE_DOT
-	 * @generated
-	 * @ordered
-	 */
-	LINE_DOT_LITERAL(3, "LINE_DOT", "LINE_DOT"),
-	/**
-	 * The '<em><b>LINE DASHDOT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LINE_DASHDOT
-	 * @generated
-	 * @ordered
-	 */
-	LINE_DASHDOT_LITERAL(4, "LINE_DASHDOT", "LINE_DASHDOT"),
-	/**
-	 * The '<em><b>LINE DASHDOTDOT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LINE_DASHDOTDOT
-	 * @generated
-	 * @ordered
-	 */
-	LINE_DASHDOTDOT_LITERAL(5, "LINE_DASHDOTDOT", "LINE_DASHDOTDOT"),
-	/**
-	 * The '<em><b>LINE CUSTOM</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LINE_CUSTOM
-	 * @generated
-	 * @ordered
-	 */
-	LINE_CUSTOM_LITERAL(6, "LINE_CUSTOM", "LINE_CUSTOM");
-	/**
-	 * The '<em><b>LINE SOLID</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LINE SOLID</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LINE_SOLID_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LINE_SOLID = 1;
-
-	/**
-	 * The '<em><b>LINE DASH</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LINE DASH</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LINE_DASH_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LINE_DASH = 2;
-
-	/**
-	 * The '<em><b>LINE DOT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LINE DOT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LINE_DOT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LINE_DOT = 3;
-
-	/**
-	 * The '<em><b>LINE DASHDOT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LINE DASHDOT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LINE_DASHDOT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LINE_DASHDOT = 4;
-
-	/**
-	 * The '<em><b>LINE DASHDOTDOT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LINE DASHDOTDOT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LINE_DASHDOTDOT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LINE_DASHDOTDOT = 5;
-
-	/**
-	 * The '<em><b>LINE CUSTOM</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>LINE CUSTOM</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LINE_CUSTOM_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LINE_CUSTOM = 6;
-
-	/**
-	 * An array of all the '<em><b>Line Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final LineKind[] VALUES_ARRAY =
-		new LineKind[] {
-			LINE_SOLID_LITERAL,
-			LINE_DASH_LITERAL,
-			LINE_DOT_LITERAL,
-			LINE_DASHDOT_LITERAL,
-			LINE_DASHDOTDOT_LITERAL,
-			LINE_CUSTOM_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Line Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<LineKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Line Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LineKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LineKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Line Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LineKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LineKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Line Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LineKind get(int value) {
-		switch (value) {
-			case LINE_SOLID: return LINE_SOLID_LITERAL;
-			case LINE_DASH: return LINE_DASH_LITERAL;
-			case LINE_DOT: return LINE_DOT_LITERAL;
-			case LINE_DASHDOT: return LINE_DASHDOT_LITERAL;
-			case LINE_DASHDOTDOT: return LINE_DASHDOTDOT_LITERAL;
-			case LINE_CUSTOM: return LINE_CUSTOM_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private LineKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/MarginBorder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/MarginBorder.java
deleted file mode 100644
index 58cbc034b1e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/MarginBorder.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Margin Border</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.MarginBorder#getInsets <em>Insets</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getMarginBorder()
- * @model
- * @generated
- */
-public interface MarginBorder extends Border {
-	/**
-	 * Returns the value of the '<em><b>Insets</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Insets</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Insets</em>' containment reference.
-	 * @see #setInsets(Insets)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getMarginBorder_Insets()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Insets getInsets();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.MarginBorder#getInsets <em>Insets</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Insets</em>' containment reference.
-	 * @see #getInsets()
-	 * @generated
-	 */
-	void setInsets(Insets value);
-
-} // MarginBorder
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Node.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Node.java
deleted file mode 100644
index 276956503bf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Node.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getResizeConstraint <em>Resize Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getAffixedParentSide <em>Affixed Parent Side</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getContentPane <em>Content Pane</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getNode()
- * @model
- * @generated
- */
-public interface Node extends AbstractNode {
-	/**
-	 * Returns the value of the '<em><b>Resize Constraint</b></em>' attribute.
-	 * The default value is <code>"NSEW"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Direction}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resize Constraint</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Resize Constraint</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Direction
-	 * @see #setResizeConstraint(Direction)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getNode_ResizeConstraint()
-	 * @model default="NSEW"
-	 * @generated
-	 */
-	Direction getResizeConstraint();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getResizeConstraint <em>Resize Constraint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Resize Constraint</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Direction
-	 * @see #getResizeConstraint()
-	 * @generated
-	 */
-	void setResizeConstraint(Direction value);
-
-	/**
-	 * Returns the value of the '<em><b>Affixed Parent Side</b></em>' attribute.
-	 * The default value is <code>"NONE"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.Direction}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Affixed Parent Side</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Affixed Parent Side</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Direction
-	 * @see #setAffixedParentSide(Direction)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getNode_AffixedParentSide()
-	 * @model default="NONE"
-	 * @generated
-	 */
-	Direction getAffixedParentSide();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getAffixedParentSide <em>Affixed Parent Side</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Affixed Parent Side</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Direction
-	 * @see #getAffixedParentSide()
-	 * @generated
-	 */
-	void setAffixedParentSide(Direction value);
-
-	/**
-	 * Returns the value of the '<em><b>Content Pane</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content Pane</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Content Pane</em>' reference.
-	 * @see #setContentPane(ChildAccess)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getNode_ContentPane()
-	 * @model
-	 * @generated
-	 */
-	ChildAccess getContentPane();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Node#getContentPane <em>Content Pane</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Content Pane</em>' reference.
-	 * @see #getContentPane()
-	 * @generated
-	 */
-	void setContentPane(ChildAccess value);
-
-} // Node
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Pin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Pin.java
deleted file mode 100644
index ca94f261b80..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Pin.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pin</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPin()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Pin extends Identity {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getOperationName();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getOperationType();
-
-} // Pin
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PinOwner.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PinOwner.java
deleted file mode 100644
index 2a9e1227835..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PinOwner.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Pin Owner</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.PinOwner#getPins <em>Pins</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPinOwner()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface PinOwner extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Pins</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Pin}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Pins</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Pins</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPinOwner_Pins()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Pin> getPins();
-
-} // PinOwner
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Point.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Point.java
deleted file mode 100644
index 713eea42976..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Point.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Point</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Point#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Point#getY <em>Y</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPoint()
- * @model
- * @generated
- */
-public interface Point extends EObject {
-	/**
-	 * Returns the value of the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>X</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>X</em>' attribute.
-	 * @see #setX(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPoint_X()
-	 * @model
-	 * @generated
-	 */
-	int getX();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Point#getX <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>X</em>' attribute.
-	 * @see #getX()
-	 * @generated
-	 */
-	void setX(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Y</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Y</em>' attribute.
-	 * @see #setY(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPoint_Y()
-	 * @model
-	 * @generated
-	 */
-	int getY();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Point#getY <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Y</em>' attribute.
-	 * @see #getY()
-	 * @generated
-	 */
-	void setY(int value);
-
-} // Point
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Polygon.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Polygon.java
deleted file mode 100644
index e635d8946c0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Polygon.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Polygon</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.Polygon
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPolygon()
- * @model
- * @generated
- */
-public interface Polygon extends Polyline {
-} // Polygon
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolygonDecoration.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolygonDecoration.java
deleted file mode 100644
index ed475580807..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolygonDecoration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Polygon Decoration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.PolygonDecoration
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPolygonDecoration()
- * @model
- * @generated
- */
-public interface PolygonDecoration extends Polygon, DecorationFigure {
-} // PolygonDecoration
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Polyline.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Polyline.java
deleted file mode 100644
index f8b348886db..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Polyline.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Polyline</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.Polyline
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Polyline#getTemplate <em>Template</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPolyline()
- * @model
- * @generated
- */
-public interface Polyline extends Shape {
-	/**
-	 * Returns the value of the '<em><b>Template</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Point}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Template</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Template</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPolyline_Template()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Point> getTemplate();
-
-} // Polyline
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolylineConnection.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolylineConnection.java
deleted file mode 100644
index 0265b4e7b79..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolylineConnection.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Polyline Connection</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.PolylineConnection
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection#getSourceDecoration <em>Source Decoration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection#getTargetDecoration <em>Target Decoration</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPolylineConnection()
- * @model
- * @generated
- */
-public interface PolylineConnection extends Polyline, ConnectionFigure {
-	/**
-	 * Returns the value of the '<em><b>Source Decoration</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source Decoration</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source Decoration</em>' reference.
-	 * @see #setSourceDecoration(DecorationFigure)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPolylineConnection_SourceDecoration()
-	 * @model
-	 * @generated
-	 */
-	DecorationFigure getSourceDecoration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection#getSourceDecoration <em>Source Decoration</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Decoration</em>' reference.
-	 * @see #getSourceDecoration()
-	 * @generated
-	 */
-	void setSourceDecoration(DecorationFigure value);
-
-	/**
-	 * Returns the value of the '<em><b>Target Decoration</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Target Decoration</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Target Decoration</em>' reference.
-	 * @see #setTargetDecoration(DecorationFigure)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPolylineConnection_TargetDecoration()
-	 * @model
-	 * @generated
-	 */
-	DecorationFigure getTargetDecoration();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection#getTargetDecoration <em>Target Decoration</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target Decoration</em>' reference.
-	 * @see #getTargetDecoration()
-	 * @generated
-	 */
-	void setTargetDecoration(DecorationFigure value);
-
-} // PolylineConnection
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolylineDecoration.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolylineDecoration.java
deleted file mode 100644
index b5e1c5636c2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/PolylineDecoration.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Polyline Decoration</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.PolylineDecoration
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getPolylineDecoration()
- * @model
- * @generated
- */
-public interface PolylineDecoration extends Polyline, DecorationFigure {
-} // PolylineDecoration
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RGBColor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RGBColor.java
deleted file mode 100644
index 8543409aaee..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RGBColor.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>RGB Color</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getRed <em>Red</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getGreen <em>Green</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getBlue <em>Blue</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRGBColor()
- * @model
- * @generated
- */
-public interface RGBColor extends Color {
-	/**
-	 * Returns the value of the '<em><b>Red</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Red</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Red</em>' attribute.
-	 * @see #setRed(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRGBColor_Red()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getRed();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getRed <em>Red</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Red</em>' attribute.
-	 * @see #getRed()
-	 * @generated
-	 */
-	void setRed(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Green</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Green</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Green</em>' attribute.
-	 * @see #setGreen(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRGBColor_Green()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getGreen();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getGreen <em>Green</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Green</em>' attribute.
-	 * @see #getGreen()
-	 * @generated
-	 */
-	void setGreen(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Blue</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Blue</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Blue</em>' attribute.
-	 * @see #setBlue(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRGBColor_Blue()
-	 * @model required="true"
-	 * @generated
-	 */
-	int getBlue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor#getBlue <em>Blue</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Blue</em>' attribute.
-	 * @see #getBlue()
-	 * @generated
-	 */
-	void setBlue(int value);
-
-} // RGBColor
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RealFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RealFigure.java
deleted file mode 100644
index f715d3f08dd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RealFigure.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Real Figure</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * This is exact/specific/concrete figure, unlike proxy/reference-nature FigureRef
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRealFigure()
- * @model abstract="true"
- * @generated
- */
-public interface RealFigure extends AbstractFigure, PinOwner, CustomAttributeOwner {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRealFigure_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Figure}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Children</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRealFigure_Children()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Figure> getChildren();
-
-} // RealFigure
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Rectangle.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Rectangle.java
deleted file mode 100644
index 7dd252ff02f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Rectangle.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rectangle</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.RectangleFigure
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRectangle()
- * @model
- * @generated
- */
-public interface Rectangle extends Shape {
-} // Rectangle
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Rectangle2D.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Rectangle2D.java
deleted file mode 100644
index a0d1f45fd59..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Rectangle2D.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Rectangle2D.java,v 1.2 2008/08/07 13:30:05 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rectangle2 D</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getY <em>Y</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getHeight <em>Height</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRectangle2D()
- * @model
- * @generated
- */
-public interface Rectangle2D extends EObject {
-	/**
-	 * Returns the value of the '<em><b>X</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>X</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>X</em>' attribute.
-	 * @see #setX(float)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRectangle2D_X()
-	 * @model
-	 * @generated
-	 */
-	float getX();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getX <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>X</em>' attribute.
-	 * @see #getX()
-	 * @generated
-	 */
-	void setX(float value);
-
-	/**
-	 * Returns the value of the '<em><b>Y</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Y</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Y</em>' attribute.
-	 * @see #setY(float)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRectangle2D_Y()
-	 * @model
-	 * @generated
-	 */
-	float getY();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getY <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Y</em>' attribute.
-	 * @see #getY()
-	 * @generated
-	 */
-	void setY(float value);
-
-	/**
-	 * Returns the value of the '<em><b>Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Width</em>' attribute.
-	 * @see #setWidth(float)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRectangle2D_Width()
-	 * @model
-	 * @generated
-	 */
-	float getWidth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getWidth <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Width</em>' attribute.
-	 * @see #getWidth()
-	 * @generated
-	 */
-	void setWidth(float value);
-
-	/**
-	 * Returns the value of the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Height</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Height</em>' attribute.
-	 * @see #setHeight(float)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRectangle2D_Height()
-	 * @model
-	 * @generated
-	 */
-	float getHeight();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D#getHeight <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Height</em>' attribute.
-	 * @see #getHeight()
-	 * @generated
-	 */
-	void setHeight(float value);
-
-} // Rectangle2D
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RoundedRectangle.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RoundedRectangle.java
deleted file mode 100644
index d7214429664..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/RoundedRectangle.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rounded Rectangle</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.RoundedRectangle
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle#getCornerWidth <em>Corner Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle#getCornerHeight <em>Corner Height</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRoundedRectangle()
- * @model
- * @generated
- */
-public interface RoundedRectangle extends Shape {
-	/**
-	 * Returns the value of the '<em><b>Corner Width</b></em>' attribute.
-	 * The default value is <code>"8"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Corner Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Corner Width</em>' attribute.
-	 * @see #setCornerWidth(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRoundedRectangle_CornerWidth()
-	 * @model default="8"
-	 * @generated
-	 */
-	int getCornerWidth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle#getCornerWidth <em>Corner Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Corner Width</em>' attribute.
-	 * @see #getCornerWidth()
-	 * @generated
-	 */
-	void setCornerWidth(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Corner Height</b></em>' attribute.
-	 * The default value is <code>"8"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Corner Height</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Corner Height</em>' attribute.
-	 * @see #setCornerHeight(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getRoundedRectangle_CornerHeight()
-	 * @model default="8"
-	 * @generated
-	 */
-	int getCornerHeight();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle#getCornerHeight <em>Corner Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Corner Height</em>' attribute.
-	 * @see #getCornerHeight()
-	 * @generated
-	 */
-	void setCornerHeight(int value);
-
-} // RoundedRectangle
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGFigure.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGFigure.java
deleted file mode 100644
index 60cf74535db..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGFigure.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SVGFigure.java,v 1.5 2008/08/12 13:56:28 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>SVG Figure</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getDocumentURI <em>Document URI</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getAreaOfInterest <em>Area Of Interest</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#isNoCanvasWidth <em>No Canvas Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#isNoCanvasHeight <em>No Canvas Height</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGFigure()
- * @model
- * @generated
- */
-public interface SVGFigure extends RealFigure {
-	/**
-	 * Returns the value of the '<em><b>Document URI</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Document URI</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Document URI</em>' attribute.
-	 * @see #setDocumentURI(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGFigure_DocumentURI()
-	 * @model
-	 * @generated
-	 */
-	String getDocumentURI();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getDocumentURI <em>Document URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Document URI</em>' attribute.
-	 * @see #getDocumentURI()
-	 * @generated
-	 */
-	void setDocumentURI(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Properties</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Properties</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Properties</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGFigure_Properties()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<SVGProperty> getProperties();
-
-	/**
-	 * Returns the value of the '<em><b>Area Of Interest</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Area Of Interest</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Area Of Interest</em>' containment reference.
-	 * @see #setAreaOfInterest(Rectangle2D)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGFigure_AreaOfInterest()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Rectangle2D getAreaOfInterest();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#getAreaOfInterest <em>Area Of Interest</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Area Of Interest</em>' containment reference.
-	 * @see #getAreaOfInterest()
-	 * @generated
-	 */
-	void setAreaOfInterest(Rectangle2D value);
-
-	/**
-	 * Returns the value of the '<em><b>No Canvas Width</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>No Canvas Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>No Canvas Width</em>' attribute.
-	 * @see #setNoCanvasWidth(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGFigure_NoCanvasWidth()
-	 * @model
-	 * @generated
-	 */
-	boolean isNoCanvasWidth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#isNoCanvasWidth <em>No Canvas Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>No Canvas Width</em>' attribute.
-	 * @see #isNoCanvasWidth()
-	 * @generated
-	 */
-	void setNoCanvasWidth(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>No Canvas Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>No Canvas Height</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>No Canvas Height</em>' attribute.
-	 * @see #setNoCanvasHeight(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGFigure_NoCanvasHeight()
-	 * @model
-	 * @generated
-	 */
-	boolean isNoCanvasHeight();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure#isNoCanvasHeight <em>No Canvas Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>No Canvas Height</em>' attribute.
-	 * @see #isNoCanvasHeight()
-	 * @generated
-	 */
-	void setNoCanvasHeight(boolean value);
-
-} // SVGFigure
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGProperty.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGProperty.java
deleted file mode 100644
index e1b323ffcf7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGProperty.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SVGProperty.java,v 1.1 2008/07/31 12:17:13 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>SVG Property</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getQuery <em>Query</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getAttribute <em>Attribute</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getGetter <em>Getter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getSetter <em>Setter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#isCallSuper <em>Call Super</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGProperty()
- * @model
- * @generated
- */
-public interface SVGProperty extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Query</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Query</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Query</em>' attribute.
-	 * @see #setQuery(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGProperty_Query()
-	 * @model
-	 * @generated
-	 */
-	String getQuery();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getQuery <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Query</em>' attribute.
-	 * @see #getQuery()
-	 * @generated
-	 */
-	void setQuery(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Attribute</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute</em>' attribute.
-	 * @see #setAttribute(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGProperty_Attribute()
-	 * @model
-	 * @generated
-	 */
-	String getAttribute();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getAttribute <em>Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute</em>' attribute.
-	 * @see #getAttribute()
-	 * @generated
-	 */
-	void setAttribute(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType
-	 * @see #setType(SVGPropertyType)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGProperty_Type()
-	 * @model
-	 * @generated
-	 */
-	SVGPropertyType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getType <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(SVGPropertyType value);
-
-	/**
-	 * Returns the value of the '<em><b>Getter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Getter</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Getter</em>' attribute.
-	 * @see #setGetter(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGProperty_Getter()
-	 * @model
-	 * @generated
-	 */
-	String getGetter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getGetter <em>Getter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Getter</em>' attribute.
-	 * @see #getGetter()
-	 * @generated
-	 */
-	void setGetter(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Setter</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Setter</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Setter</em>' attribute.
-	 * @see #setSetter(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGProperty_Setter()
-	 * @model
-	 * @generated
-	 */
-	String getSetter();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#getSetter <em>Setter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Setter</em>' attribute.
-	 * @see #getSetter()
-	 * @generated
-	 */
-	void setSetter(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Call Super</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Call Super</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Call Super</em>' attribute.
-	 * @see #setCallSuper(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGProperty_CallSuper()
-	 * @model
-	 * @generated
-	 */
-	boolean isCallSuper();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty#isCallSuper <em>Call Super</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Call Super</em>' attribute.
-	 * @see #isCallSuper()
-	 * @generated
-	 */
-	void setCallSuper(boolean value);
-
-} // SVGProperty
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGPropertyType.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGPropertyType.java
deleted file mode 100644
index c1aa910f378..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/SVGPropertyType.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SVGPropertyType.java,v 1.2 2008/08/07 13:30:05 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>SVG Property Type</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getSVGPropertyType()
- * @model
- * @generated
- */
-public enum SVGPropertyType implements Enumerator {
-	/**
-	 * The '<em><b>STRING</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #STRING_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	STRING(0, "STRING", "STRING"),
-
-	/**
-	 * The '<em><b>COLOR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #COLOR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	COLOR(1, "COLOR", "COLOR"), /**
-	 * The '<em><b>FLOAT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FLOAT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FLOAT(2, "FLOAT", "FLOAT");
-
-	/**
-	 * The '<em><b>STRING</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>STRING</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STRING
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STRING_VALUE = 0;
-
-	/**
-	 * The '<em><b>COLOR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>COLOR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #COLOR
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COLOR_VALUE = 1;
-
-	/**
-	 * The '<em><b>FLOAT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>FLOAT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FLOAT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FLOAT_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>SVG Property Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final SVGPropertyType[] VALUES_ARRAY =
-		new SVGPropertyType[] {
-			STRING,
-			COLOR,
-			FLOAT,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>SVG Property Type</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<SVGPropertyType> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>SVG Property Type</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SVGPropertyType get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SVGPropertyType result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>SVG Property Type</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SVGPropertyType getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			SVGPropertyType result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>SVG Property Type</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static SVGPropertyType get(int value) {
-		switch (value) {
-			case STRING_VALUE: return STRING;
-			case COLOR_VALUE: return COLOR;
-			case FLOAT_VALUE: return FLOAT;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private SVGPropertyType(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //SVGPropertyType
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ScalablePolygon.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ScalablePolygon.java
deleted file mode 100644
index 1ac0f510b49..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/ScalablePolygon.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Scalable Polygon</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Marker interface to denote polygons with ability to autoscale to fit all available bounds. Separate class is needed instead of property in the Polygon class because of generalization PolygonDecoration extends Polygon
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getScalablePolygon()
- * @model
- * @generated
- */
-public interface ScalablePolygon extends Polygon {
-} // ScalablePolygon
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Shape.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Shape.java
deleted file mode 100644
index 53f4c280f0d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/Shape.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Shape</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.draw2d.Shape
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isOutline <em>Outline</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isFill <em>Fill</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#getLineWidth <em>Line Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#getLineKind <em>Line Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isXorFill <em>Xor Fill</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isXorOutline <em>Xor Outline</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#getResolvedChildren <em>Resolved Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getShape()
- * @model abstract="true"
- * @generated
- */
-public interface Shape extends RealFigure {
-	/**
-	 * Returns the value of the '<em><b>Outline</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Outline</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Outline</em>' attribute.
-	 * @see #setOutline(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getShape_Outline()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isOutline();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isOutline <em>Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Outline</em>' attribute.
-	 * @see #isOutline()
-	 * @generated
-	 */
-	void setOutline(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Fill</b></em>' attribute.
-	 * The default value is <code>"true"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fill</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fill</em>' attribute.
-	 * @see #setFill(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getShape_Fill()
-	 * @model default="true"
-	 * @generated
-	 */
-	boolean isFill();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isFill <em>Fill</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fill</em>' attribute.
-	 * @see #isFill()
-	 * @generated
-	 */
-	void setFill(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Line Width</b></em>' attribute.
-	 * The default value is <code>"1"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Line Width</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Line Width</em>' attribute.
-	 * @see #setLineWidth(int)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getShape_LineWidth()
-	 * @model default="1"
-	 * @generated
-	 */
-	int getLineWidth();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#getLineWidth <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Line Width</em>' attribute.
-	 * @see #getLineWidth()
-	 * @generated
-	 */
-	void setLineWidth(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Line Kind</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.gmfgraph.LineKind}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Line Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Line Kind</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LineKind
-	 * @see #setLineKind(LineKind)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getShape_LineKind()
-	 * @model
-	 * @generated
-	 */
-	LineKind getLineKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#getLineKind <em>Line Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Line Kind</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LineKind
-	 * @see #getLineKind()
-	 * @generated
-	 */
-	void setLineKind(LineKind value);
-
-	/**
-	 * Returns the value of the '<em><b>Xor Fill</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Xor Fill</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Xor Fill</em>' attribute.
-	 * @see #setXorFill(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getShape_XorFill()
-	 * @model
-	 * @generated
-	 */
-	boolean isXorFill();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isXorFill <em>Xor Fill</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xor Fill</em>' attribute.
-	 * @see #isXorFill()
-	 * @generated
-	 */
-	void setXorFill(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Xor Outline</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Xor Outline</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Xor Outline</em>' attribute.
-	 * @see #setXorOutline(boolean)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getShape_XorOutline()
-	 * @model
-	 * @generated
-	 */
-	boolean isXorOutline();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape#isXorOutline <em>Xor Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Xor Outline</em>' attribute.
-	 * @see #isXorOutline()
-	 * @generated
-	 */
-	void setXorOutline(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Resolved Children</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.gmfgraph.Figure}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Resolved Children</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Same as children, but resolves child FigureRefs, if any, to Figures
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Resolved Children</em>' reference list.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getShape_ResolvedChildren()
-	 * @model transient="true" changeable="false" volatile="true" derived="true"
-	 * @generated
-	 */
-	EList<Figure> getResolvedChildren();
-
-} // Shape
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/StackLayout.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/StackLayout.java
deleted file mode 100644
index 642a38c7fc9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/StackLayout.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Stack Layout</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getStackLayout()
- * @model
- * @generated
- */
-public interface StackLayout extends Layout {
-} // StackLayout
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VerticalLabel.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VerticalLabel.java
deleted file mode 100644
index 6fba177b9dd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VerticalLabel.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Vertical Label</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * org.eclipse.gmf.tooling.runtime.draw2d.labels.VerticalLabel
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getVerticalLabel()
- * @model
- * @generated
- */
-public interface VerticalLabel extends RealFigure {
-	/**
-	 * Returns the value of the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Text</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Text</em>' attribute.
-	 * @see #setText(String)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getVerticalLabel_Text()
-	 * @model
-	 * @generated
-	 */
-	String getText();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel#getText <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Text</em>' attribute.
-	 * @see #getText()
-	 * @generated
-	 */
-	void setText(String value);
-
-} // VerticalLabel
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VisiblePin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VisiblePin.java
deleted file mode 100644
index 50db656d3ec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VisiblePin.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Visible Pin</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getVisiblePin()
- * @model
- * @generated
- */
-public interface VisiblePin extends Pin {
-} // VisiblePin
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VisualFacet.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VisualFacet.java
deleted file mode 100644
index c1932d0e8aa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/VisualFacet.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Visual Facet</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getVisualFacet()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface VisualFacet extends EObject {
-} // VisualFacet
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/XYLayout.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/XYLayout.java
deleted file mode 100644
index ed0a0163dec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/XYLayout.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XY Layout</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getXYLayout()
- * @model
- * @generated
- */
-public interface XYLayout extends Layout {
-} // XYLayout
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/XYLayoutData.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/XYLayoutData.java
deleted file mode 100644
index 8d2ab24b0b5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/XYLayoutData.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>XY Layout Data</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData#getTopLeft <em>Top Left</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData#getSize <em>Size</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getXYLayoutData()
- * @model
- * @generated
- */
-public interface XYLayoutData extends LayoutData {
-	/**
-	 * Returns the value of the '<em><b>Top Left</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Top Left</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Top Left</em>' containment reference.
-	 * @see #setTopLeft(Point)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getXYLayoutData_TopLeft()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Point getTopLeft();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData#getTopLeft <em>Top Left</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Top Left</em>' containment reference.
-	 * @see #getTopLeft()
-	 * @generated
-	 */
-	void setTopLeft(Point value);
-
-	/**
-	 * Returns the value of the '<em><b>Size</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Size</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Size</em>' containment reference.
-	 * @see #setSize(Dimension)
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#getXYLayoutData_Size()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Dimension getSize();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData#getSize <em>Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Size</em>' containment reference.
-	 * @see #getSize()
-	 * @generated
-	 */
-	void setSize(Dimension value);
-
-} // XYLayoutData
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AbstractFigureImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AbstractFigureImpl.java
deleted file mode 100644
index 04aa2015d30..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AbstractFigureImpl.java
+++ /dev/null
@@ -1,962 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.Border;
-import org.eclipse.papyrus.gmf.gmfgraph.Color;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.Font;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Insets;
-import org.eclipse.papyrus.gmf.gmfgraph.Layout;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Figure</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getLayoutData <em>Layout Data</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getLayout <em>Layout</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getDescriptor <em>Descriptor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getForegroundColor <em>Foreground Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getBackgroundColor <em>Background Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getMaximumSize <em>Maximum Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getMinimumSize <em>Minimum Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getPreferredSize <em>Preferred Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getFont <em>Font</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getInsets <em>Insets</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getBorder <em>Border</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getLocation <em>Location</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AbstractFigureImpl#getSize <em>Size</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractFigureImpl extends EObjectImpl implements AbstractFigure {
-	/**
-	 * The cached value of the '{@link #getLayoutData() <em>Layout Data</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLayoutData()
-	 * @generated
-	 * @ordered
-	 */
-	protected LayoutData layoutData;
-
-	/**
-	 * The cached value of the '{@link #getLayout() <em>Layout</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLayout()
-	 * @generated
-	 * @ordered
-	 */
-	protected Layout layout;
-
-	/**
-	 * The cached value of the '{@link #getForegroundColor() <em>Foreground Color</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getForegroundColor()
-	 * @generated
-	 * @ordered
-	 */
-	protected Color foregroundColor;
-
-	/**
-	 * The cached value of the '{@link #getBackgroundColor() <em>Background Color</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBackgroundColor()
-	 * @generated
-	 * @ordered
-	 */
-	protected Color backgroundColor;
-
-	/**
-	 * The cached value of the '{@link #getMaximumSize() <em>Maximum Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMaximumSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension maximumSize;
-
-	/**
-	 * The cached value of the '{@link #getMinimumSize() <em>Minimum Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinimumSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension minimumSize;
-
-	/**
-	 * The cached value of the '{@link #getPreferredSize() <em>Preferred Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPreferredSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension preferredSize;
-
-	/**
-	 * The cached value of the '{@link #getFont() <em>Font</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFont()
-	 * @generated
-	 * @ordered
-	 */
-	protected Font font;
-
-	/**
-	 * The cached value of the '{@link #getInsets() <em>Insets</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInsets()
-	 * @generated
-	 * @ordered
-	 */
-	protected Insets insets;
-
-	/**
-	 * The cached value of the '{@link #getBorder() <em>Border</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBorder()
-	 * @generated
-	 * @ordered
-	 */
-	protected Border border;
-
-	/**
-	 * The cached value of the '{@link #getLocation() <em>Location</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLocation()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point location;
-
-	/**
-	 * The cached value of the '{@link #getSize() <em>Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point size;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractFigureImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getAbstractFigure();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LayoutData getLayoutData() {
-		return layoutData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLayoutData(LayoutData newLayoutData, NotificationChain msgs) {
-		LayoutData oldLayoutData = layoutData;
-		layoutData = newLayoutData;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA, oldLayoutData, newLayoutData);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLayoutData(LayoutData newLayoutData) {
-		if (newLayoutData != layoutData) {
-			NotificationChain msgs = null;
-			if (layoutData != null)
-				msgs = ((InternalEObject)layoutData).eInverseRemove(this, GMFGraphPackage.LAYOUT_DATA__OWNER, LayoutData.class, msgs);
-			if (newLayoutData != null)
-				msgs = ((InternalEObject)newLayoutData).eInverseAdd(this, GMFGraphPackage.LAYOUT_DATA__OWNER, LayoutData.class, msgs);
-			msgs = basicSetLayoutData(newLayoutData, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA, newLayoutData, newLayoutData));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Layout getLayout() {
-		return layout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLayout(Layout newLayout, NotificationChain msgs) {
-		Layout oldLayout = layout;
-		layout = newLayout;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT, oldLayout, newLayout);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLayout(Layout newLayout) {
-		if (newLayout != layout) {
-			NotificationChain msgs = null;
-			if (layout != null)
-				msgs = ((InternalEObject)layout).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT, null, msgs);
-			if (newLayout != null)
-				msgs = ((InternalEObject)newLayout).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT, null, msgs);
-			msgs = basicSetLayout(newLayout, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT, newLayout, newLayout));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public FigureDescriptor getDescriptor() {
-		if (eContainer() instanceof FigureDescriptor) {
-			return (FigureDescriptor) eContainer();
-		}
-		if (eContainer() instanceof Figure) {
-			return ((Figure) eContainer()).getDescriptor();
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Color getForegroundColor() {
-		return foregroundColor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetForegroundColor(Color newForegroundColor, NotificationChain msgs) {
-		Color oldForegroundColor = foregroundColor;
-		foregroundColor = newForegroundColor;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR, oldForegroundColor, newForegroundColor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setForegroundColor(Color newForegroundColor) {
-		if (newForegroundColor != foregroundColor) {
-			NotificationChain msgs = null;
-			if (foregroundColor != null)
-				msgs = ((InternalEObject)foregroundColor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR, null, msgs);
-			if (newForegroundColor != null)
-				msgs = ((InternalEObject)newForegroundColor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR, null, msgs);
-			msgs = basicSetForegroundColor(newForegroundColor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR, newForegroundColor, newForegroundColor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Color getBackgroundColor() {
-		return backgroundColor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBackgroundColor(Color newBackgroundColor, NotificationChain msgs) {
-		Color oldBackgroundColor = backgroundColor;
-		backgroundColor = newBackgroundColor;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR, oldBackgroundColor, newBackgroundColor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBackgroundColor(Color newBackgroundColor) {
-		if (newBackgroundColor != backgroundColor) {
-			NotificationChain msgs = null;
-			if (backgroundColor != null)
-				msgs = ((InternalEObject)backgroundColor).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR, null, msgs);
-			if (newBackgroundColor != null)
-				msgs = ((InternalEObject)newBackgroundColor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR, null, msgs);
-			msgs = basicSetBackgroundColor(newBackgroundColor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR, newBackgroundColor, newBackgroundColor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getMaximumSize() {
-		return maximumSize;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMaximumSize(Dimension newMaximumSize, NotificationChain msgs) {
-		Dimension oldMaximumSize = maximumSize;
-		maximumSize = newMaximumSize;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE, oldMaximumSize, newMaximumSize);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMaximumSize(Dimension newMaximumSize) {
-		if (newMaximumSize != maximumSize) {
-			NotificationChain msgs = null;
-			if (maximumSize != null)
-				msgs = ((InternalEObject)maximumSize).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE, null, msgs);
-			if (newMaximumSize != null)
-				msgs = ((InternalEObject)newMaximumSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE, null, msgs);
-			msgs = basicSetMaximumSize(newMaximumSize, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE, newMaximumSize, newMaximumSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getMinimumSize() {
-		return minimumSize;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMinimumSize(Dimension newMinimumSize, NotificationChain msgs) {
-		Dimension oldMinimumSize = minimumSize;
-		minimumSize = newMinimumSize;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE, oldMinimumSize, newMinimumSize);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMinimumSize(Dimension newMinimumSize) {
-		if (newMinimumSize != minimumSize) {
-			NotificationChain msgs = null;
-			if (minimumSize != null)
-				msgs = ((InternalEObject)minimumSize).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE, null, msgs);
-			if (newMinimumSize != null)
-				msgs = ((InternalEObject)newMinimumSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE, null, msgs);
-			msgs = basicSetMinimumSize(newMinimumSize, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE, newMinimumSize, newMinimumSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getPreferredSize() {
-		return preferredSize;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPreferredSize(Dimension newPreferredSize, NotificationChain msgs) {
-		Dimension oldPreferredSize = preferredSize;
-		preferredSize = newPreferredSize;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE, oldPreferredSize, newPreferredSize);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPreferredSize(Dimension newPreferredSize) {
-		if (newPreferredSize != preferredSize) {
-			NotificationChain msgs = null;
-			if (preferredSize != null)
-				msgs = ((InternalEObject)preferredSize).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE, null, msgs);
-			if (newPreferredSize != null)
-				msgs = ((InternalEObject)newPreferredSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE, null, msgs);
-			msgs = basicSetPreferredSize(newPreferredSize, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE, newPreferredSize, newPreferredSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Font getFont() {
-		return font;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetFont(Font newFont, NotificationChain msgs) {
-		Font oldFont = font;
-		font = newFont;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__FONT, oldFont, newFont);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFont(Font newFont) {
-		if (newFont != font) {
-			NotificationChain msgs = null;
-			if (font != null)
-				msgs = ((InternalEObject)font).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__FONT, null, msgs);
-			if (newFont != null)
-				msgs = ((InternalEObject)newFont).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__FONT, null, msgs);
-			msgs = basicSetFont(newFont, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__FONT, newFont, newFont));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Insets getInsets() {
-		return insets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInsets(Insets newInsets, NotificationChain msgs) {
-		Insets oldInsets = insets;
-		insets = newInsets;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__INSETS, oldInsets, newInsets);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInsets(Insets newInsets) {
-		if (newInsets != insets) {
-			NotificationChain msgs = null;
-			if (insets != null)
-				msgs = ((InternalEObject)insets).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__INSETS, null, msgs);
-			if (newInsets != null)
-				msgs = ((InternalEObject)newInsets).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__INSETS, null, msgs);
-			msgs = basicSetInsets(newInsets, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__INSETS, newInsets, newInsets));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Border getBorder() {
-		return border;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetBorder(Border newBorder, NotificationChain msgs) {
-		Border oldBorder = border;
-		border = newBorder;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__BORDER, oldBorder, newBorder);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBorder(Border newBorder) {
-		if (newBorder != border) {
-			NotificationChain msgs = null;
-			if (border != null)
-				msgs = ((InternalEObject)border).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__BORDER, null, msgs);
-			if (newBorder != null)
-				msgs = ((InternalEObject)newBorder).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__BORDER, null, msgs);
-			msgs = basicSetBorder(newBorder, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__BORDER, newBorder, newBorder));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getLocation() {
-		return location;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLocation(Point newLocation, NotificationChain msgs) {
-		Point oldLocation = location;
-		location = newLocation;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__LOCATION, oldLocation, newLocation);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLocation(Point newLocation) {
-		if (newLocation != location) {
-			NotificationChain msgs = null;
-			if (location != null)
-				msgs = ((InternalEObject)location).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__LOCATION, null, msgs);
-			if (newLocation != null)
-				msgs = ((InternalEObject)newLocation).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__LOCATION, null, msgs);
-			msgs = basicSetLocation(newLocation, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__LOCATION, newLocation, newLocation));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getSize() {
-		return size;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSize(Point newSize, NotificationChain msgs) {
-		Point oldSize = size;
-		size = newSize;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__SIZE, oldSize, newSize);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSize(Point newSize) {
-		if (newSize != size) {
-			NotificationChain msgs = null;
-			if (size != null)
-				msgs = ((InternalEObject)size).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__SIZE, null, msgs);
-			if (newSize != null)
-				msgs = ((InternalEObject)newSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__SIZE, null, msgs);
-			msgs = basicSetSize(newSize, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ABSTRACT_FIGURE__SIZE, newSize, newSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA:
-				if (layoutData != null)
-					msgs = ((InternalEObject)layoutData).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA, null, msgs);
-				return basicSetLayoutData((LayoutData)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA:
-				return basicSetLayoutData(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT:
-				return basicSetLayout(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR:
-				return basicSetForegroundColor(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR:
-				return basicSetBackgroundColor(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE:
-				return basicSetMaximumSize(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE:
-				return basicSetMinimumSize(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE:
-				return basicSetPreferredSize(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__FONT:
-				return basicSetFont(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__INSETS:
-				return basicSetInsets(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__BORDER:
-				return basicSetBorder(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__LOCATION:
-				return basicSetLocation(null, msgs);
-			case GMFGraphPackage.ABSTRACT_FIGURE__SIZE:
-				return basicSetSize(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA:
-				return getLayoutData();
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT:
-				return getLayout();
-			case GMFGraphPackage.ABSTRACT_FIGURE__DESCRIPTOR:
-				return getDescriptor();
-			case GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR:
-				return getForegroundColor();
-			case GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR:
-				return getBackgroundColor();
-			case GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE:
-				return getMaximumSize();
-			case GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE:
-				return getMinimumSize();
-			case GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE:
-				return getPreferredSize();
-			case GMFGraphPackage.ABSTRACT_FIGURE__FONT:
-				return getFont();
-			case GMFGraphPackage.ABSTRACT_FIGURE__INSETS:
-				return getInsets();
-			case GMFGraphPackage.ABSTRACT_FIGURE__BORDER:
-				return getBorder();
-			case GMFGraphPackage.ABSTRACT_FIGURE__LOCATION:
-				return getLocation();
-			case GMFGraphPackage.ABSTRACT_FIGURE__SIZE:
-				return getSize();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA:
-				setLayoutData((LayoutData)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT:
-				setLayout((Layout)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR:
-				setForegroundColor((Color)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR:
-				setBackgroundColor((Color)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE:
-				setMaximumSize((Dimension)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE:
-				setMinimumSize((Dimension)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE:
-				setPreferredSize((Dimension)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__FONT:
-				setFont((Font)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__INSETS:
-				setInsets((Insets)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__BORDER:
-				setBorder((Border)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__LOCATION:
-				setLocation((Point)newValue);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__SIZE:
-				setSize((Point)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA:
-				setLayoutData((LayoutData)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT:
-				setLayout((Layout)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR:
-				setForegroundColor((Color)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR:
-				setBackgroundColor((Color)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE:
-				setMaximumSize((Dimension)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE:
-				setMinimumSize((Dimension)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE:
-				setPreferredSize((Dimension)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__FONT:
-				setFont((Font)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__INSETS:
-				setInsets((Insets)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__BORDER:
-				setBorder((Border)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__LOCATION:
-				setLocation((Point)null);
-				return;
-			case GMFGraphPackage.ABSTRACT_FIGURE__SIZE:
-				setSize((Point)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT_DATA:
-				return layoutData != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__LAYOUT:
-				return layout != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__DESCRIPTOR:
-				return getDescriptor() != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__FOREGROUND_COLOR:
-				return foregroundColor != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__BACKGROUND_COLOR:
-				return backgroundColor != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__MAXIMUM_SIZE:
-				return maximumSize != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__MINIMUM_SIZE:
-				return minimumSize != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__PREFERRED_SIZE:
-				return preferredSize != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__FONT:
-				return font != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__INSETS:
-				return insets != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__BORDER:
-				return border != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__LOCATION:
-				return location != null;
-			case GMFGraphPackage.ABSTRACT_FIGURE__SIZE:
-				return size != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //AbstractFigureImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AbstractNodeImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AbstractNodeImpl.java
deleted file mode 100644
index 4840a7f7288..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AbstractNodeImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractNode;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractNodeImpl extends DiagramElementImpl implements AbstractNode {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractNodeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getAbstractNode();
-	}
-
-} //AbstractNodeImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AlignmentFacetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AlignmentFacetImpl.java
deleted file mode 100644
index bfa8702bb1c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/AlignmentFacetImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Alignment Facet</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.AlignmentFacetImpl#getAlignment <em>Alignment</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AlignmentFacetImpl extends EObjectImpl implements AlignmentFacet {
-	/**
-	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Alignment ALIGNMENT_EDEFAULT = Alignment.BEGINNING_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected Alignment alignment = ALIGNMENT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AlignmentFacetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getAlignmentFacet();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Alignment getAlignment() {
-		return alignment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlignment(Alignment newAlignment) {
-		Alignment oldAlignment = alignment;
-		alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ALIGNMENT_FACET__ALIGNMENT, oldAlignment, alignment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.ALIGNMENT_FACET__ALIGNMENT:
-				return getAlignment();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.ALIGNMENT_FACET__ALIGNMENT:
-				setAlignment((Alignment)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.ALIGNMENT_FACET__ALIGNMENT:
-				setAlignment(ALIGNMENT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.ALIGNMENT_FACET__ALIGNMENT:
-				return alignment != ALIGNMENT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (alignment: ");
-		result.append(alignment);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AlignmentFacetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BasicFontImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BasicFontImpl.java
deleted file mode 100644
index 44c5623a94a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BasicFontImpl.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.BasicFont;
-import org.eclipse.papyrus.gmf.gmfgraph.FontStyle;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Basic Font</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BasicFontImpl#getFaceName <em>Face Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BasicFontImpl#getHeight <em>Height</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BasicFontImpl#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BasicFontImpl extends EObjectImpl implements BasicFont {
-	/**
-	 * The default value of the '{@link #getFaceName() <em>Face Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFaceName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String FACE_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getFaceName() <em>Face Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFaceName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String faceName = FACE_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HEIGHT_EDEFAULT = 9;
-
-	/**
-	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected int height = HEIGHT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final FontStyle STYLE_EDEFAULT = FontStyle.NORMAL_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected FontStyle style = STYLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BasicFontImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getBasicFont();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getFaceName() {
-		return faceName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFaceName(String newFaceName) {
-		String oldFaceName = faceName;
-		faceName = newFaceName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BASIC_FONT__FACE_NAME, oldFaceName, faceName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHeight() {
-		return height;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHeight(int newHeight) {
-		int oldHeight = height;
-		height = newHeight;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BASIC_FONT__HEIGHT, oldHeight, height));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FontStyle getStyle() {
-		return style;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStyle(FontStyle newStyle) {
-		FontStyle oldStyle = style;
-		style = newStyle == null ? STYLE_EDEFAULT : newStyle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BASIC_FONT__STYLE, oldStyle, style));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.BASIC_FONT__FACE_NAME:
-				return getFaceName();
-			case GMFGraphPackage.BASIC_FONT__HEIGHT:
-				return getHeight();
-			case GMFGraphPackage.BASIC_FONT__STYLE:
-				return getStyle();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.BASIC_FONT__FACE_NAME:
-				setFaceName((String)newValue);
-				return;
-			case GMFGraphPackage.BASIC_FONT__HEIGHT:
-				setHeight((Integer)newValue);
-				return;
-			case GMFGraphPackage.BASIC_FONT__STYLE:
-				setStyle((FontStyle)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.BASIC_FONT__FACE_NAME:
-				setFaceName(FACE_NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.BASIC_FONT__HEIGHT:
-				setHeight(HEIGHT_EDEFAULT);
-				return;
-			case GMFGraphPackage.BASIC_FONT__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.BASIC_FONT__FACE_NAME:
-				return FACE_NAME_EDEFAULT == null ? faceName != null : !FACE_NAME_EDEFAULT.equals(faceName);
-			case GMFGraphPackage.BASIC_FONT__HEIGHT:
-				return height != HEIGHT_EDEFAULT;
-			case GMFGraphPackage.BASIC_FONT__STYLE:
-				return style != STYLE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (faceName: ");
-		result.append(faceName);
-		result.append(", height: ");
-		result.append(height);
-		result.append(", style: ");
-		result.append(style);
-		result.append(')');
-		return result.toString();
-	}
-
-} //BasicFontImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderLayoutDataImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderLayoutDataImpl.java
deleted file mode 100644
index a9984f8b2be..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderLayoutDataImpl.java
+++ /dev/null
@@ -1,333 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Layoutable;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Border Layout Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BorderLayoutDataImpl#getOwner <em>Owner</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BorderLayoutDataImpl#getAlignment <em>Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BorderLayoutDataImpl#isVertical <em>Vertical</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BorderLayoutDataImpl extends EObjectImpl implements BorderLayoutData {
-	/**
-	 * The default value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Alignment ALIGNMENT_EDEFAULT = Alignment.CENTER_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getAlignment() <em>Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected Alignment alignment = ALIGNMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isVertical() <em>Vertical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVertical()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean VERTICAL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isVertical() <em>Vertical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVertical()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean vertical = VERTICAL_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BorderLayoutDataImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getBorderLayoutData();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Layoutable getOwner() {
-		if (eContainerFeatureID() != GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER) return null;
-		return (Layoutable)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOwner(Layoutable newOwner, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newOwner, GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOwner(Layoutable newOwner) {
-		if (newOwner != eInternalContainer() || (eContainerFeatureID() != GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER && newOwner != null)) {
-			if (EcoreUtil.isAncestor(this, newOwner))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newOwner != null)
-				msgs = ((InternalEObject)newOwner).eInverseAdd(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
-			msgs = basicSetOwner(newOwner, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER, newOwner, newOwner));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Alignment getAlignment() {
-		return alignment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAlignment(Alignment newAlignment) {
-		Alignment oldAlignment = alignment;
-		alignment = newAlignment == null ? ALIGNMENT_EDEFAULT : newAlignment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT, oldAlignment, alignment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isVertical() {
-		return vertical;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVertical(boolean newVertical) {
-		boolean oldVertical = vertical;
-		vertical = newVertical;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL, oldVertical, vertical));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetOwner((Layoutable)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
-				return basicSetOwner(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
-				return eInternalContainer().eInverseRemove(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
-				return getOwner();
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
-				return getAlignment();
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
-				return isVertical();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
-				setOwner((Layoutable)newValue);
-				return;
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
-				setAlignment((Alignment)newValue);
-				return;
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
-				setVertical((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
-				setOwner((Layoutable)null);
-				return;
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
-				setAlignment(ALIGNMENT_EDEFAULT);
-				return;
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
-				setVertical(VERTICAL_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__OWNER:
-				return getOwner() != null;
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__ALIGNMENT:
-				return alignment != ALIGNMENT_EDEFAULT;
-			case GMFGraphPackage.BORDER_LAYOUT_DATA__VERTICAL:
-				return vertical != VERTICAL_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (alignment: ");
-		result.append(alignment);
-		result.append(", vertical: ");
-		result.append(vertical);
-		result.append(')');
-		return result.toString();
-	}
-
-} //BorderLayoutDataImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderLayoutImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderLayoutImpl.java
deleted file mode 100644
index 7790c618835..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderLayoutImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Border Layout</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BorderLayoutImpl#getSpacing <em>Spacing</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BorderLayoutImpl extends EObjectImpl implements BorderLayout {
-	/**
-	 * The cached value of the '{@link #getSpacing() <em>Spacing</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSpacing()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension spacing;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BorderLayoutImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getBorderLayout();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getSpacing() {
-		return spacing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSpacing(Dimension newSpacing, NotificationChain msgs) {
-		Dimension oldSpacing = spacing;
-		spacing = newSpacing;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT__SPACING, oldSpacing, newSpacing);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSpacing(Dimension newSpacing) {
-		if (newSpacing != spacing) {
-			NotificationChain msgs = null;
-			if (spacing != null)
-				msgs = ((InternalEObject)spacing).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.BORDER_LAYOUT__SPACING, null, msgs);
-			if (newSpacing != null)
-				msgs = ((InternalEObject)newSpacing).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.BORDER_LAYOUT__SPACING, null, msgs);
-			msgs = basicSetSpacing(newSpacing, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_LAYOUT__SPACING, newSpacing, newSpacing));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT__SPACING:
-				return basicSetSpacing(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT__SPACING:
-				return getSpacing();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT__SPACING:
-				setSpacing((Dimension)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT__SPACING:
-				setSpacing((Dimension)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_LAYOUT__SPACING:
-				return spacing != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //BorderLayoutImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderRefImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderRefImpl.java
deleted file mode 100644
index 36d1c0ffdaf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/BorderRefImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Border;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderRef;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Border Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.BorderRefImpl#getActual <em>Actual</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BorderRefImpl extends EObjectImpl implements BorderRef {
-	/**
-	 * The cached value of the '{@link #getActual() <em>Actual</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActual()
-	 * @generated
-	 * @ordered
-	 */
-	protected Border actual;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BorderRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getBorderRef();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Border getActual() {
-		if (actual != null && actual.eIsProxy()) {
-			InternalEObject oldActual = (InternalEObject)actual;
-			actual = (Border)eResolveProxy(oldActual);
-			if (actual != oldActual) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.BORDER_REF__ACTUAL, oldActual, actual));
-			}
-		}
-		return actual;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Border basicGetActual() {
-		return actual;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActual(Border newActual) {
-		Border oldActual = actual;
-		actual = newActual;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.BORDER_REF__ACTUAL, oldActual, actual));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_REF__ACTUAL:
-				if (resolve) return getActual();
-				return basicGetActual();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_REF__ACTUAL:
-				setActual((Border)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_REF__ACTUAL:
-				setActual((Border)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.BORDER_REF__ACTUAL:
-				return actual != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //BorderRefImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CanvasImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CanvasImpl.java
deleted file mode 100644
index fb44fdb6c8c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CanvasImpl.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Canvas</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CanvasImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CanvasImpl#getFigures <em>Figures</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CanvasImpl#getNodes <em>Nodes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CanvasImpl#getConnections <em>Connections</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CanvasImpl#getCompartments <em>Compartments</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CanvasImpl#getLabels <em>Labels</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CanvasImpl extends EObjectImpl implements Canvas {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFigures() <em>Figures</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFigures()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FigureGallery> figures;
-
-	/**
-	 * The cached value of the '{@link #getNodes() <em>Nodes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNodes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Node> nodes;
-
-	/**
-	 * The cached value of the '{@link #getConnections() <em>Connections</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getConnections()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Connection> connections;
-
-	/**
-	 * The cached value of the '{@link #getCompartments() <em>Compartments</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompartments()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Compartment> compartments;
-
-	/**
-	 * The cached value of the '{@link #getLabels() <em>Labels</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLabels()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<DiagramLabel> labels;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CanvasImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCanvas();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CANVAS__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<FigureGallery> getFigures() {
-		if (figures == null) {
-			figures = new EObjectContainmentEList<FigureGallery>(FigureGallery.class, this, GMFGraphPackage.CANVAS__FIGURES);
-		}
-		return figures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Node> getNodes() {
-		if (nodes == null) {
-			nodes = new EObjectContainmentEList<Node>(Node.class, this, GMFGraphPackage.CANVAS__NODES);
-		}
-		return nodes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Connection> getConnections() {
-		if (connections == null) {
-			connections = new EObjectContainmentEList<Connection>(Connection.class, this, GMFGraphPackage.CANVAS__CONNECTIONS);
-		}
-		return connections;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Compartment> getCompartments() {
-		if (compartments == null) {
-			compartments = new EObjectContainmentEList<Compartment>(Compartment.class, this, GMFGraphPackage.CANVAS__COMPARTMENTS);
-		}
-		return compartments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<DiagramLabel> getLabels() {
-		if (labels == null) {
-			labels = new EObjectContainmentEList<DiagramLabel>(DiagramLabel.class, this, GMFGraphPackage.CANVAS__LABELS);
-		}
-		return labels;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.CANVAS__FIGURES:
-				return ((InternalEList<?>)getFigures()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.CANVAS__NODES:
-				return ((InternalEList<?>)getNodes()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.CANVAS__CONNECTIONS:
-				return ((InternalEList<?>)getConnections()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.CANVAS__COMPARTMENTS:
-				return ((InternalEList<?>)getCompartments()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.CANVAS__LABELS:
-				return ((InternalEList<?>)getLabels()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CANVAS__NAME:
-				return getName();
-			case GMFGraphPackage.CANVAS__FIGURES:
-				return getFigures();
-			case GMFGraphPackage.CANVAS__NODES:
-				return getNodes();
-			case GMFGraphPackage.CANVAS__CONNECTIONS:
-				return getConnections();
-			case GMFGraphPackage.CANVAS__COMPARTMENTS:
-				return getCompartments();
-			case GMFGraphPackage.CANVAS__LABELS:
-				return getLabels();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CANVAS__NAME:
-				setName((String)newValue);
-				return;
-			case GMFGraphPackage.CANVAS__FIGURES:
-				getFigures().clear();
-				getFigures().addAll((Collection<? extends FigureGallery>)newValue);
-				return;
-			case GMFGraphPackage.CANVAS__NODES:
-				getNodes().clear();
-				getNodes().addAll((Collection<? extends Node>)newValue);
-				return;
-			case GMFGraphPackage.CANVAS__CONNECTIONS:
-				getConnections().clear();
-				getConnections().addAll((Collection<? extends Connection>)newValue);
-				return;
-			case GMFGraphPackage.CANVAS__COMPARTMENTS:
-				getCompartments().clear();
-				getCompartments().addAll((Collection<? extends Compartment>)newValue);
-				return;
-			case GMFGraphPackage.CANVAS__LABELS:
-				getLabels().clear();
-				getLabels().addAll((Collection<? extends DiagramLabel>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CANVAS__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.CANVAS__FIGURES:
-				getFigures().clear();
-				return;
-			case GMFGraphPackage.CANVAS__NODES:
-				getNodes().clear();
-				return;
-			case GMFGraphPackage.CANVAS__CONNECTIONS:
-				getConnections().clear();
-				return;
-			case GMFGraphPackage.CANVAS__COMPARTMENTS:
-				getCompartments().clear();
-				return;
-			case GMFGraphPackage.CANVAS__LABELS:
-				getLabels().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CANVAS__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFGraphPackage.CANVAS__FIGURES:
-				return figures != null && !figures.isEmpty();
-			case GMFGraphPackage.CANVAS__NODES:
-				return nodes != null && !nodes.isEmpty();
-			case GMFGraphPackage.CANVAS__CONNECTIONS:
-				return connections != null && !connections.isEmpty();
-			case GMFGraphPackage.CANVAS__COMPARTMENTS:
-				return compartments != null && !compartments.isEmpty();
-			case GMFGraphPackage.CANVAS__LABELS:
-				return labels != null && !labels.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CanvasImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CenterLayoutImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CenterLayoutImpl.java
deleted file mode 100644
index 5a268a55730..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CenterLayoutImpl.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.CenterLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Center Layout</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class CenterLayoutImpl extends EObjectImpl implements CenterLayout {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CenterLayoutImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCenterLayout();
-	}
-
-} //CenterLayoutImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ChildAccessImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ChildAccessImpl.java
deleted file mode 100644
index 22381a3891a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ChildAccessImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.codegen.util.CodeGenUtil;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Child Access</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ChildAccessImpl#getOwner <em>Owner</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ChildAccessImpl#getAccessor <em>Accessor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ChildAccessImpl#getFigure <em>Figure</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ChildAccessImpl extends EObjectImpl implements ChildAccess {
-	/**
-	 * The default value of the '{@link #getAccessor() <em>Accessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACCESSOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccessor() <em>Accessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected String accessor = ACCESSOR_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFigure() <em>Figure</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFigure()
-	 * @generated
-	 * @ordered
-	 */
-	protected Figure figure;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChildAccessImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getChildAccess();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureDescriptor getOwner() {
-		if (eContainerFeatureID() != GMFGraphPackage.CHILD_ACCESS__OWNER) return null;
-		return (FigureDescriptor)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAccessorGen() {
-		return accessor;
-	}
-
-	public String getAccessor() {
-		if (getAccessorGen() == null || getAccessorGen().trim().length() == 0) {
-			final Figure fig = getFigure();
-			if (fig == null) {
-				return "getFigure" + CodeGenUtil.capName(CodeGenUtil.validJavaIdentifier(String.valueOf((Object) null)));
-			}
-			if (fig.eContainer() instanceof FigureAccessor) {
-				return ((FigureAccessor) fig.eContainer()).getAccessor();
-			}
-			if (fig instanceof FigureRef) { // XXX bad, perhaps, ChildAccess
-				return "getFigure" + CodeGenUtil.capName(CodeGenUtil.validJavaIdentifier(String.valueOf(((FigureRef) fig).getFigure().getName())));
-			}
-			assert fig instanceof RealFigure; // no more options here
-			return "getFigure" + CodeGenUtil.capName(CodeGenUtil.validJavaIdentifier(String.valueOf(((RealFigure) fig).getName())));
-		}
-		return CodeGenUtil.validJavaIdentifier(getAccessorGen());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAccessor(String newAccessor) {
-		String oldAccessor = accessor;
-		accessor = newAccessor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CHILD_ACCESS__ACCESSOR, oldAccessor, accessor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Figure getFigure() {
-		if (figure != null && figure.eIsProxy()) {
-			InternalEObject oldFigure = (InternalEObject)figure;
-			figure = (Figure)eResolveProxy(oldFigure);
-			if (figure != oldFigure) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.CHILD_ACCESS__FIGURE, oldFigure, figure));
-			}
-		}
-		return figure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Figure basicGetFigure() {
-		return figure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFigure(Figure newFigure) {
-		Figure oldFigure = figure;
-		figure = newFigure;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CHILD_ACCESS__FIGURE, oldFigure, figure));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.CHILD_ACCESS__OWNER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return eBasicSetContainer(otherEnd, GMFGraphPackage.CHILD_ACCESS__OWNER, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.CHILD_ACCESS__OWNER:
-				return eBasicSetContainer(null, GMFGraphPackage.CHILD_ACCESS__OWNER, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFGraphPackage.CHILD_ACCESS__OWNER:
-				return eInternalContainer().eInverseRemove(this, GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS, FigureDescriptor.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CHILD_ACCESS__OWNER:
-				return getOwner();
-			case GMFGraphPackage.CHILD_ACCESS__ACCESSOR:
-				return getAccessor();
-			case GMFGraphPackage.CHILD_ACCESS__FIGURE:
-				if (resolve) return getFigure();
-				return basicGetFigure();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CHILD_ACCESS__ACCESSOR:
-				setAccessor((String)newValue);
-				return;
-			case GMFGraphPackage.CHILD_ACCESS__FIGURE:
-				setFigure((Figure)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CHILD_ACCESS__ACCESSOR:
-				setAccessor(ACCESSOR_EDEFAULT);
-				return;
-			case GMFGraphPackage.CHILD_ACCESS__FIGURE:
-				setFigure((Figure)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CHILD_ACCESS__OWNER:
-				return getOwner() != null;
-			case GMFGraphPackage.CHILD_ACCESS__ACCESSOR:
-				return ACCESSOR_EDEFAULT == null ? accessor != null : !ACCESSOR_EDEFAULT.equals(accessor);
-			case GMFGraphPackage.CHILD_ACCESS__FIGURE:
-				return figure != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (accessor: ");
-		result.append(accessor);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ChildAccessImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ColorPinImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ColorPinImpl.java
deleted file mode 100644
index 6455ac1bf1b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ColorPinImpl.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorPin;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Color Pin</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ColorPinImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ColorPinImpl#isBackgroundNotForeground <em>Background Not Foreground</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ColorPinImpl extends EObjectImpl implements ColorPin {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isBackgroundNotForeground() <em>Background Not Foreground</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBackgroundNotForeground()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean BACKGROUND_NOT_FOREGROUND_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isBackgroundNotForeground() <em>Background Not Foreground</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isBackgroundNotForeground()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean backgroundNotForeground = BACKGROUND_NOT_FOREGROUND_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ColorPinImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getColorPin();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COLOR_PIN__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isBackgroundNotForeground() {
-		return backgroundNotForeground;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBackgroundNotForeground(boolean newBackgroundNotForeground) {
-		boolean oldBackgroundNotForeground = backgroundNotForeground;
-		backgroundNotForeground = newBackgroundNotForeground;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COLOR_PIN__BACKGROUND_NOT_FOREGROUND, oldBackgroundNotForeground, backgroundNotForeground));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getOperationName() {
-		return isBackgroundNotForeground() ? "setBackgroundColor" : "setForegroundColor";
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getOperationType() {
-		return "Tuple(red:Integer, green:Integer, blue:Integer)";
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.COLOR_PIN__NAME:
-				return getName();
-			case GMFGraphPackage.COLOR_PIN__BACKGROUND_NOT_FOREGROUND:
-				return isBackgroundNotForeground();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.COLOR_PIN__NAME:
-				setName((String)newValue);
-				return;
-			case GMFGraphPackage.COLOR_PIN__BACKGROUND_NOT_FOREGROUND:
-				setBackgroundNotForeground((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.COLOR_PIN__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.COLOR_PIN__BACKGROUND_NOT_FOREGROUND:
-				setBackgroundNotForeground(BACKGROUND_NOT_FOREGROUND_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.COLOR_PIN__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFGraphPackage.COLOR_PIN__BACKGROUND_NOT_FOREGROUND:
-				return backgroundNotForeground != BACKGROUND_NOT_FOREGROUND_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", backgroundNotForeground: ");
-		result.append(backgroundNotForeground);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ColorPinImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CompartmentImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CompartmentImpl.java
deleted file mode 100644
index fb01689b7f9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CompartmentImpl.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Compartment</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CompartmentImpl#isCollapsible <em>Collapsible</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CompartmentImpl#isNeedsTitle <em>Needs Title</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CompartmentImpl#getAccessor <em>Accessor</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CompartmentImpl extends DiagramElementImpl implements Compartment {
-	/**
-	 * The default value of the '{@link #isCollapsible() <em>Collapsible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCollapsible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean COLLAPSIBLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCollapsible() <em>Collapsible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCollapsible()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean collapsible = COLLAPSIBLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNeedsTitle() <em>Needs Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNeedsTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NEEDS_TITLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNeedsTitle() <em>Needs Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNeedsTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean needsTitle = NEEDS_TITLE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessor() <em>Accessor</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected ChildAccess accessor;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompartmentImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCompartment();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isCollapsible() {
-		return collapsible;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCollapsible(boolean newCollapsible) {
-		boolean oldCollapsible = collapsible;
-		collapsible = newCollapsible;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COMPARTMENT__COLLAPSIBLE, oldCollapsible, collapsible));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNeedsTitle() {
-		return needsTitle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNeedsTitle(boolean newNeedsTitle) {
-		boolean oldNeedsTitle = needsTitle;
-		needsTitle = newNeedsTitle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COMPARTMENT__NEEDS_TITLE, oldNeedsTitle, needsTitle));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess getAccessor() {
-		if (accessor != null && accessor.eIsProxy()) {
-			InternalEObject oldAccessor = (InternalEObject)accessor;
-			accessor = (ChildAccess)eResolveProxy(oldAccessor);
-			if (accessor != oldAccessor) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.COMPARTMENT__ACCESSOR, oldAccessor, accessor));
-			}
-		}
-		return accessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess basicGetAccessor() {
-		return accessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAccessor(ChildAccess newAccessor) {
-		ChildAccess oldAccessor = accessor;
-		accessor = newAccessor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COMPARTMENT__ACCESSOR, oldAccessor, accessor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPARTMENT__COLLAPSIBLE:
-				return isCollapsible();
-			case GMFGraphPackage.COMPARTMENT__NEEDS_TITLE:
-				return isNeedsTitle();
-			case GMFGraphPackage.COMPARTMENT__ACCESSOR:
-				if (resolve) return getAccessor();
-				return basicGetAccessor();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPARTMENT__COLLAPSIBLE:
-				setCollapsible((Boolean)newValue);
-				return;
-			case GMFGraphPackage.COMPARTMENT__NEEDS_TITLE:
-				setNeedsTitle((Boolean)newValue);
-				return;
-			case GMFGraphPackage.COMPARTMENT__ACCESSOR:
-				setAccessor((ChildAccess)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPARTMENT__COLLAPSIBLE:
-				setCollapsible(COLLAPSIBLE_EDEFAULT);
-				return;
-			case GMFGraphPackage.COMPARTMENT__NEEDS_TITLE:
-				setNeedsTitle(NEEDS_TITLE_EDEFAULT);
-				return;
-			case GMFGraphPackage.COMPARTMENT__ACCESSOR:
-				setAccessor((ChildAccess)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPARTMENT__COLLAPSIBLE:
-				return collapsible != COLLAPSIBLE_EDEFAULT;
-			case GMFGraphPackage.COMPARTMENT__NEEDS_TITLE:
-				return needsTitle != NEEDS_TITLE_EDEFAULT;
-			case GMFGraphPackage.COMPARTMENT__ACCESSOR:
-				return accessor != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (collapsible: ");
-		result.append(collapsible);
-		result.append(", needsTitle: ");
-		result.append(needsTitle);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CompartmentImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CompoundBorderImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CompoundBorderImpl.java
deleted file mode 100644
index 2034e0a0e2a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CompoundBorderImpl.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Border;
-import org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Compound Border</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CompoundBorderImpl#getOuter <em>Outer</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CompoundBorderImpl#getInner <em>Inner</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CompoundBorderImpl extends EObjectImpl implements CompoundBorder {
-	/**
-	 * The cached value of the '{@link #getOuter() <em>Outer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOuter()
-	 * @generated
-	 * @ordered
-	 */
-	protected Border outer;
-
-	/**
-	 * The cached value of the '{@link #getInner() <em>Inner</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInner()
-	 * @generated
-	 * @ordered
-	 */
-	protected Border inner;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompoundBorderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCompoundBorder();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Border getOuter() {
-		return outer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOuter(Border newOuter, NotificationChain msgs) {
-		Border oldOuter = outer;
-		outer = newOuter;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COMPOUND_BORDER__OUTER, oldOuter, newOuter);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOuter(Border newOuter) {
-		if (newOuter != outer) {
-			NotificationChain msgs = null;
-			if (outer != null)
-				msgs = ((InternalEObject)outer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.COMPOUND_BORDER__OUTER, null, msgs);
-			if (newOuter != null)
-				msgs = ((InternalEObject)newOuter).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.COMPOUND_BORDER__OUTER, null, msgs);
-			msgs = basicSetOuter(newOuter, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COMPOUND_BORDER__OUTER, newOuter, newOuter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Border getInner() {
-		return inner;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInner(Border newInner, NotificationChain msgs) {
-		Border oldInner = inner;
-		inner = newInner;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COMPOUND_BORDER__INNER, oldInner, newInner);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInner(Border newInner) {
-		if (newInner != inner) {
-			NotificationChain msgs = null;
-			if (inner != null)
-				msgs = ((InternalEObject)inner).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.COMPOUND_BORDER__INNER, null, msgs);
-			if (newInner != null)
-				msgs = ((InternalEObject)newInner).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.COMPOUND_BORDER__INNER, null, msgs);
-			msgs = basicSetInner(newInner, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.COMPOUND_BORDER__INNER, newInner, newInner));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPOUND_BORDER__OUTER:
-				return basicSetOuter(null, msgs);
-			case GMFGraphPackage.COMPOUND_BORDER__INNER:
-				return basicSetInner(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPOUND_BORDER__OUTER:
-				return getOuter();
-			case GMFGraphPackage.COMPOUND_BORDER__INNER:
-				return getInner();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPOUND_BORDER__OUTER:
-				setOuter((Border)newValue);
-				return;
-			case GMFGraphPackage.COMPOUND_BORDER__INNER:
-				setInner((Border)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPOUND_BORDER__OUTER:
-				setOuter((Border)null);
-				return;
-			case GMFGraphPackage.COMPOUND_BORDER__INNER:
-				setInner((Border)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.COMPOUND_BORDER__OUTER:
-				return outer != null;
-			case GMFGraphPackage.COMPOUND_BORDER__INNER:
-				return inner != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //CompoundBorderImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ConnectionImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ConnectionImpl.java
deleted file mode 100644
index ab070306323..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ConnectionImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Connection</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ConnectionImpl extends DiagramElementImpl implements Connection {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConnectionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getConnection();
-	}
-
-} //ConnectionImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ConstantColorImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ConstantColorImpl.java
deleted file mode 100644
index 4d284f092d4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ConstantColorImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorConstants;
-import org.eclipse.papyrus.gmf.gmfgraph.ConstantColor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constant Color</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ConstantColorImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ConstantColorImpl extends EObjectImpl implements ConstantColor {
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ColorConstants VALUE_EDEFAULT = ColorConstants.WHITE_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected ColorConstants value = VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConstantColorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getConstantColor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ColorConstants getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(ColorConstants newValue) {
-		ColorConstants oldValue = value;
-		value = newValue == null ? VALUE_EDEFAULT : newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CONSTANT_COLOR__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CONSTANT_COLOR__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CONSTANT_COLOR__VALUE:
-				setValue((ColorConstants)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CONSTANT_COLOR__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CONSTANT_COLOR__VALUE:
-				return value != VALUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (value: ");
-		result.append(value);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ConstantColorImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomAttributeImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomAttributeImpl.java
deleted file mode 100644
index c724b7b8df4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomAttributeImpl.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Attribute</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomAttributeImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomAttributeImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomAttributeImpl#isDirectAccess <em>Direct Access</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomAttributeImpl#isMultiStatementValue <em>Multi Statement Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomAttributeImpl extends EObjectImpl implements CustomAttribute {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VALUE_EDEFAULT = "null";
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected String value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isDirectAccess() <em>Direct Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDirectAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean DIRECT_ACCESS_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isDirectAccess() <em>Direct Access</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isDirectAccess()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean directAccess = DIRECT_ACCESS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isMultiStatementValue() <em>Multi Statement Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMultiStatementValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MULTI_STATEMENT_VALUE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMultiStatementValue() <em>Multi Statement Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMultiStatementValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean multiStatementValue = MULTI_STATEMENT_VALUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomAttributeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCustomAttribute();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(String newValue) {
-		String oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isDirectAccess() {
-		return directAccess;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDirectAccess(boolean newDirectAccess) {
-		boolean oldDirectAccess = directAccess;
-		directAccess = newDirectAccess;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS, oldDirectAccess, directAccess));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMultiStatementValue() {
-		return multiStatementValue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMultiStatementValue(boolean newMultiStatementValue) {
-		boolean oldMultiStatementValue = multiStatementValue;
-		multiStatementValue = newMultiStatementValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE, oldMultiStatementValue, multiStatementValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
-				return getName();
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
-				return getValue();
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
-				return isDirectAccess();
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
-				return isMultiStatementValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
-				setName((String)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
-				setValue((String)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
-				setDirectAccess((Boolean)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
-				setMultiStatementValue((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
-				setDirectAccess(DIRECT_ACCESS_EDEFAULT);
-				return;
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
-				setMultiStatementValue(MULTI_STATEMENT_VALUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__DIRECT_ACCESS:
-				return directAccess != DIRECT_ACCESS_EDEFAULT;
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE:
-				return multiStatementValue != MULTI_STATEMENT_VALUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", directAccess: ");
-		result.append(directAccess);
-		result.append(", multiStatementValue: ");
-		result.append(multiStatementValue);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CustomAttributeImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomBorderImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomBorderImpl.java
deleted file mode 100644
index 1a83d659ed6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomBorderImpl.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomClass;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Border</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomBorderImpl#getAttributes <em>Attributes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomBorderImpl#getQualifiedClassName <em>Qualified Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomBorderImpl extends EObjectImpl implements CustomBorder {
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<CustomAttribute> attributes;
-
-	/**
-	 * The default value of the '{@link #getQualifiedClassName() <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQualifiedClassName() <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomBorderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCustomBorder();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getQualifiedClassName() {
-		return qualifiedClassName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setQualifiedClassName(String newQualifiedClassName) {
-		String oldQualifiedClassName = qualifiedClassName;
-		qualifiedClassName = newQualifiedClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_BORDER__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<CustomAttribute> getAttributes() {
-		if (attributes == null) {
-			attributes = new EObjectContainmentEList<CustomAttribute>(CustomAttribute.class, this, GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES:
-				return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES:
-				return getAttributes();
-			case GMFGraphPackage.CUSTOM_BORDER__QUALIFIED_CLASS_NAME:
-				return getQualifiedClassName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection<? extends CustomAttribute>)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_BORDER__QUALIFIED_CLASS_NAME:
-				setQualifiedClassName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case GMFGraphPackage.CUSTOM_BORDER__QUALIFIED_CLASS_NAME:
-				setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case GMFGraphPackage.CUSTOM_BORDER__QUALIFIED_CLASS_NAME:
-				return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == CustomAttributeOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES: return GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES;
-				default: return -1;
-			}
-		}
-		if (baseClass == CustomClass.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.CUSTOM_BORDER__QUALIFIED_CLASS_NAME: return GMFGraphPackage.CUSTOM_CLASS__QUALIFIED_CLASS_NAME;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == CustomAttributeOwner.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES: return GMFGraphPackage.CUSTOM_BORDER__ATTRIBUTES;
-				default: return -1;
-			}
-		}
-		if (baseClass == CustomClass.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.CUSTOM_CLASS__QUALIFIED_CLASS_NAME: return GMFGraphPackage.CUSTOM_BORDER__QUALIFIED_CLASS_NAME;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (qualifiedClassName: ");
-		result.append(qualifiedClassName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CustomBorderImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomConnectionImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomConnectionImpl.java
deleted file mode 100644
index 457ae7ebcc4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomConnectionImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Connection</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class CustomConnectionImpl extends CustomFigureImpl implements CustomConnection {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomConnectionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCustomConnection();
-	}
-
-} //CustomConnectionImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomDecorationImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomDecorationImpl.java
deleted file mode 100644
index 1afd5ec256f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomDecorationImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Decoration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class CustomDecorationImpl extends CustomFigureImpl implements CustomDecoration {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomDecorationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCustomDecoration();
-	}
-
-} //CustomDecorationImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomFigureImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomFigureImpl.java
deleted file mode 100644
index 9d0f3984f08..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomFigureImpl.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomClass;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Figure</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomFigureImpl#getQualifiedClassName <em>Qualified Class Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomFigureImpl#getCustomChildren <em>Custom Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomFigureImpl extends RealFigureImpl implements CustomFigure {
-	/**
-	 * The default value of the '{@link #getQualifiedClassName() <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQualifiedClassName() <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getCustomChildren() <em>Custom Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomChildren()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FigureAccessor> customChildren;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomFigureImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCustomFigure();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getQualifiedClassName() {
-		return qualifiedClassName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setQualifiedClassName(String newQualifiedClassName) {
-		String oldQualifiedClassName = qualifiedClassName;
-		qualifiedClassName = newQualifiedClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_FIGURE__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<FigureAccessor> getCustomChildren() {
-		if (customChildren == null) {
-			customChildren = new EObjectContainmentEList<FigureAccessor>(FigureAccessor.class, this, GMFGraphPackage.CUSTOM_FIGURE__CUSTOM_CHILDREN);
-		}
-		return customChildren;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_FIGURE__CUSTOM_CHILDREN:
-				return ((InternalEList<?>)getCustomChildren()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_FIGURE__QUALIFIED_CLASS_NAME:
-				return getQualifiedClassName();
-			case GMFGraphPackage.CUSTOM_FIGURE__CUSTOM_CHILDREN:
-				return getCustomChildren();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_FIGURE__QUALIFIED_CLASS_NAME:
-				setQualifiedClassName((String)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_FIGURE__CUSTOM_CHILDREN:
-				getCustomChildren().clear();
-				getCustomChildren().addAll((Collection<? extends FigureAccessor>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_FIGURE__QUALIFIED_CLASS_NAME:
-				setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.CUSTOM_FIGURE__CUSTOM_CHILDREN:
-				getCustomChildren().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_FIGURE__QUALIFIED_CLASS_NAME:
-				return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
-			case GMFGraphPackage.CUSTOM_FIGURE__CUSTOM_CHILDREN:
-				return customChildren != null && !customChildren.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == CustomClass.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.CUSTOM_FIGURE__QUALIFIED_CLASS_NAME: return GMFGraphPackage.CUSTOM_CLASS__QUALIFIED_CLASS_NAME;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == CustomClass.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.CUSTOM_CLASS__QUALIFIED_CLASS_NAME: return GMFGraphPackage.CUSTOM_FIGURE__QUALIFIED_CLASS_NAME;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (qualifiedClassName: ");
-		result.append(qualifiedClassName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CustomFigureImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomLayoutDataImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomLayoutDataImpl.java
deleted file mode 100644
index 3f41a86c137..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomLayoutDataImpl.java
+++ /dev/null
@@ -1,367 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomClass;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Layoutable;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Layout Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutDataImpl#getOwner <em>Owner</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutDataImpl#getAttributes <em>Attributes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutDataImpl#getQualifiedClassName <em>Qualified Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomLayoutDataImpl extends EObjectImpl implements CustomLayoutData {
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<CustomAttribute> attributes;
-
-	/**
-	 * The default value of the '{@link #getQualifiedClassName() <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQualifiedClassName() <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomLayoutDataImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCustomLayoutData();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Layoutable getOwner() {
-		if (eContainerFeatureID() != GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER) return null;
-		return (Layoutable)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOwner(Layoutable newOwner, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newOwner, GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOwner(Layoutable newOwner) {
-		if (newOwner != eInternalContainer() || (eContainerFeatureID() != GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER && newOwner != null)) {
-			if (EcoreUtil.isAncestor(this, newOwner))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newOwner != null)
-				msgs = ((InternalEObject)newOwner).eInverseAdd(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
-			msgs = basicSetOwner(newOwner, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER, newOwner, newOwner));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getQualifiedClassName() {
-		return qualifiedClassName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setQualifiedClassName(String newQualifiedClassName) {
-		String oldQualifiedClassName = qualifiedClassName;
-		qualifiedClassName = newQualifiedClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<CustomAttribute> getAttributes() {
-		if (attributes == null) {
-			attributes = new EObjectContainmentEList<CustomAttribute>(CustomAttribute.class, this, GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetOwner((Layoutable)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER:
-				return basicSetOwner(null, msgs);
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
-				return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER:
-				return eInternalContainer().eInverseRemove(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER:
-				return getOwner();
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
-				return getAttributes();
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
-				return getQualifiedClassName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER:
-				setOwner((Layoutable)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection<? extends CustomAttribute>)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
-				setQualifiedClassName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER:
-				setOwner((Layoutable)null);
-				return;
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
-				setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__OWNER:
-				return getOwner() != null;
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME:
-				return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == CustomAttributeOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES: return GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES;
-				default: return -1;
-			}
-		}
-		if (baseClass == CustomClass.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME: return GMFGraphPackage.CUSTOM_CLASS__QUALIFIED_CLASS_NAME;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == CustomAttributeOwner.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES: return GMFGraphPackage.CUSTOM_LAYOUT_DATA__ATTRIBUTES;
-				default: return -1;
-			}
-		}
-		if (baseClass == CustomClass.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.CUSTOM_CLASS__QUALIFIED_CLASS_NAME: return GMFGraphPackage.CUSTOM_LAYOUT_DATA__QUALIFIED_CLASS_NAME;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (qualifiedClassName: ");
-		result.append(qualifiedClassName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CustomLayoutDataImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomLayoutImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomLayoutImpl.java
deleted file mode 100644
index 4fa3c840ded..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomLayoutImpl.java
+++ /dev/null
@@ -1,281 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomClass;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Layout</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutImpl#getAttributes <em>Attributes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomLayoutImpl#getQualifiedClassName <em>Qualified Class Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomLayoutImpl extends EObjectImpl implements CustomLayout {
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<CustomAttribute> attributes;
-
-	/**
-	 * The default value of the '{@link #getQualifiedClassName() <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUALIFIED_CLASS_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQualifiedClassName() <em>Qualified Class Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQualifiedClassName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String qualifiedClassName = QUALIFIED_CLASS_NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomLayoutImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCustomLayout();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getQualifiedClassName() {
-		return qualifiedClassName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setQualifiedClassName(String newQualifiedClassName) {
-		String oldQualifiedClassName = qualifiedClassName;
-		qualifiedClassName = newQualifiedClassName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME, oldQualifiedClassName, qualifiedClassName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<CustomAttribute> getAttributes() {
-		if (attributes == null) {
-			attributes = new EObjectContainmentEList<CustomAttribute>(CustomAttribute.class, this, GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
-				return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
-				return getAttributes();
-			case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
-				return getQualifiedClassName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection<? extends CustomAttribute>)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
-				setQualifiedClassName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
-				setQualifiedClassName(QUALIFIED_CLASS_NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME:
-				return QUALIFIED_CLASS_NAME_EDEFAULT == null ? qualifiedClassName != null : !QUALIFIED_CLASS_NAME_EDEFAULT.equals(qualifiedClassName);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == CustomAttributeOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES: return GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES;
-				default: return -1;
-			}
-		}
-		if (baseClass == CustomClass.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME: return GMFGraphPackage.CUSTOM_CLASS__QUALIFIED_CLASS_NAME;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == CustomAttributeOwner.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES: return GMFGraphPackage.CUSTOM_LAYOUT__ATTRIBUTES;
-				default: return -1;
-			}
-		}
-		if (baseClass == CustomClass.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.CUSTOM_CLASS__QUALIFIED_CLASS_NAME: return GMFGraphPackage.CUSTOM_LAYOUT__QUALIFIED_CLASS_NAME;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (qualifiedClassName: ");
-		result.append(qualifiedClassName);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CustomLayoutImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomPinImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomPinImpl.java
deleted file mode 100644
index 3a353ac9fbd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/CustomPinImpl.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomPin;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Custom Pin</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomPinImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomPinImpl#getCustomOperationName <em>Custom Operation Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.CustomPinImpl#getCustomOperationType <em>Custom Operation Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CustomPinImpl extends EObjectImpl implements CustomPin {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCustomOperationName() <em>Custom Operation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomOperationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOM_OPERATION_NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomOperationName() <em>Custom Operation Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomOperationName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String customOperationName = CUSTOM_OPERATION_NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCustomOperationType() <em>Custom Operation Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomOperationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CUSTOM_OPERATION_TYPE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getCustomOperationType() <em>Custom Operation Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCustomOperationType()
-	 * @generated
-	 * @ordered
-	 */
-	protected String customOperationType = CUSTOM_OPERATION_TYPE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CustomPinImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getCustomPin();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_PIN__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCustomOperationName() {
-		return customOperationName;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomOperationName(String newCustomOperationName) {
-		String oldCustomOperationName = customOperationName;
-		customOperationName = newCustomOperationName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_NAME, oldCustomOperationName, customOperationName));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getCustomOperationType() {
-		return customOperationType;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCustomOperationType(String newCustomOperationType) {
-		String oldCustomOperationType = customOperationType;
-		customOperationType = newCustomOperationType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_TYPE, oldCustomOperationType, customOperationType));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getOperationName() {
-		return getCustomOperationName();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getOperationType() {
-		return getCustomOperationType();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_PIN__NAME:
-				return getName();
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_NAME:
-				return getCustomOperationName();
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_TYPE:
-				return getCustomOperationType();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_PIN__NAME:
-				setName((String)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_NAME:
-				setCustomOperationName((String)newValue);
-				return;
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_TYPE:
-				setCustomOperationType((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_PIN__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_NAME:
-				setCustomOperationName(CUSTOM_OPERATION_NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_TYPE:
-				setCustomOperationType(CUSTOM_OPERATION_TYPE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.CUSTOM_PIN__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_NAME:
-				return CUSTOM_OPERATION_NAME_EDEFAULT == null ? customOperationName != null : !CUSTOM_OPERATION_NAME_EDEFAULT.equals(customOperationName);
-			case GMFGraphPackage.CUSTOM_PIN__CUSTOM_OPERATION_TYPE:
-				return CUSTOM_OPERATION_TYPE_EDEFAULT == null ? customOperationType != null : !CUSTOM_OPERATION_TYPE_EDEFAULT.equals(customOperationType);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", customOperationName: ");
-		result.append(customOperationName);
-		result.append(", customOperationType: ");
-		result.append(customOperationType);
-		result.append(')');
-		return result.toString();
-	}
-
-} //CustomPinImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DefaultSizeFacetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DefaultSizeFacetImpl.java
deleted file mode 100644
index c5bda58868d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DefaultSizeFacetImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Default Size Facet</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DefaultSizeFacetImpl#getDefaultSize <em>Default Size</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DefaultSizeFacetImpl extends EObjectImpl implements DefaultSizeFacet {
-	/**
-	 * The cached value of the '{@link #getDefaultSize() <em>Default Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefaultSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension defaultSize;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefaultSizeFacetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getDefaultSizeFacet();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getDefaultSize() {
-		return defaultSize;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDefaultSize(Dimension newDefaultSize, NotificationChain msgs) {
-		Dimension oldDefaultSize = defaultSize;
-		defaultSize = newDefaultSize;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE, oldDefaultSize, newDefaultSize);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefaultSize(Dimension newDefaultSize) {
-		if (newDefaultSize != defaultSize) {
-			NotificationChain msgs = null;
-			if (defaultSize != null)
-				msgs = ((InternalEObject)defaultSize).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE, null, msgs);
-			if (newDefaultSize != null)
-				msgs = ((InternalEObject)newDefaultSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE, null, msgs);
-			msgs = basicSetDefaultSize(newDefaultSize, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE, newDefaultSize, newDefaultSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE:
-				return basicSetDefaultSize(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE:
-				return getDefaultSize();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE:
-				setDefaultSize((Dimension)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE:
-				setDefaultSize((Dimension)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.DEFAULT_SIZE_FACET__DEFAULT_SIZE:
-				return defaultSize != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DefaultSizeFacetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DiagramElementImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DiagramElementImpl.java
deleted file mode 100644
index af3f8cf9c42..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DiagramElementImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.VisualFacet;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diagram Element</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramElementImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramElementImpl#getFigure <em>Figure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramElementImpl#getFacets <em>Facets</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class DiagramElementImpl extends EObjectImpl implements DiagramElement {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFigure() <em>Figure</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFigure()
-	 * @generated
-	 * @ordered
-	 */
-	protected FigureDescriptor figure;
-
-	/**
-	 * The cached value of the '{@link #getFacets() <em>Facets</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFacets()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<VisualFacet> facets;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramElementImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getDiagramElement();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DIAGRAM_ELEMENT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureDescriptor getFigure() {
-		if (figure != null && figure.eIsProxy()) {
-			InternalEObject oldFigure = (InternalEObject)figure;
-			figure = (FigureDescriptor)eResolveProxy(oldFigure);
-			if (figure != oldFigure) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.DIAGRAM_ELEMENT__FIGURE, oldFigure, figure));
-			}
-		}
-		return figure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureDescriptor basicGetFigure() {
-		return figure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFigure(FigureDescriptor newFigure) {
-		FigureDescriptor oldFigure = figure;
-		figure = newFigure;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DIAGRAM_ELEMENT__FIGURE, oldFigure, figure));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<VisualFacet> getFacets() {
-		if (facets == null) {
-			facets = new EObjectContainmentEList<VisualFacet>(VisualFacet.class, this, GMFGraphPackage.DIAGRAM_ELEMENT__FACETS);
-		}
-		return facets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FACETS:
-				return ((InternalEList<?>)getFacets()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_ELEMENT__NAME:
-				return getName();
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FIGURE:
-				if (resolve) return getFigure();
-				return basicGetFigure();
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FACETS:
-				return getFacets();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_ELEMENT__NAME:
-				setName((String)newValue);
-				return;
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FIGURE:
-				setFigure((FigureDescriptor)newValue);
-				return;
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FACETS:
-				getFacets().clear();
-				getFacets().addAll((Collection<? extends VisualFacet>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_ELEMENT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FIGURE:
-				setFigure((FigureDescriptor)null);
-				return;
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FACETS:
-				getFacets().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_ELEMENT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FIGURE:
-				return figure != null;
-			case GMFGraphPackage.DIAGRAM_ELEMENT__FACETS:
-				return facets != null && !facets.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DiagramElementImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DiagramLabelImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DiagramLabelImpl.java
deleted file mode 100644
index 205d9546163..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DiagramLabelImpl.java
+++ /dev/null
@@ -1,324 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diagram Label</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramLabelImpl#isElementIcon <em>Element Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramLabelImpl#getAccessor <em>Accessor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramLabelImpl#getContainer <em>Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DiagramLabelImpl#isExternal <em>External</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DiagramLabelImpl extends NodeImpl implements DiagramLabel {
-	/**
-	 * The default value of the '{@link #isElementIcon() <em>Element Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isElementIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean ELEMENT_ICON_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isElementIcon() <em>Element Icon</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isElementIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean elementIcon = ELEMENT_ICON_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAccessor() <em>Accessor</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected ChildAccess accessor;
-
-	/**
-	 * The cached value of the '{@link #getContainer() <em>Container</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContainer()
-	 * @generated
-	 * @ordered
-	 */
-	protected ChildAccess container;
-
-	/**
-	 * The default value of the '{@link #isExternal() <em>External</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isExternal()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EXTERNAL_EDEFAULT = false;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramLabelImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getDiagramLabel();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isElementIcon() {
-		return elementIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElementIcon(boolean newElementIcon) {
-		boolean oldElementIcon = elementIcon;
-		elementIcon = newElementIcon;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DIAGRAM_LABEL__ELEMENT_ICON, oldElementIcon, elementIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess getAccessor() {
-		if (accessor != null && accessor.eIsProxy()) {
-			InternalEObject oldAccessor = (InternalEObject)accessor;
-			accessor = (ChildAccess)eResolveProxy(oldAccessor);
-			if (accessor != oldAccessor) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.DIAGRAM_LABEL__ACCESSOR, oldAccessor, accessor));
-			}
-		}
-		return accessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess basicGetAccessor() {
-		return accessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAccessor(ChildAccess newAccessor) {
-		ChildAccess oldAccessor = accessor;
-		accessor = newAccessor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DIAGRAM_LABEL__ACCESSOR, oldAccessor, accessor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess getContainer() {
-		if (container != null && container.eIsProxy()) {
-			InternalEObject oldContainer = (InternalEObject)container;
-			container = (ChildAccess)eResolveProxy(oldContainer);
-			if (container != oldContainer) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.DIAGRAM_LABEL__CONTAINER, oldContainer, container));
-			}
-		}
-		return container;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess basicGetContainer() {
-		return container;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainer(ChildAccess newContainer) {
-		ChildAccess oldContainer = container;
-		container = newContainer;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DIAGRAM_LABEL__CONTAINER, oldContainer, container));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public boolean isExternal() {
-		ChildAccess labelAccessor = getAccessor();
-		return labelAccessor == null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_LABEL__ELEMENT_ICON:
-				return isElementIcon();
-			case GMFGraphPackage.DIAGRAM_LABEL__ACCESSOR:
-				if (resolve) return getAccessor();
-				return basicGetAccessor();
-			case GMFGraphPackage.DIAGRAM_LABEL__CONTAINER:
-				if (resolve) return getContainer();
-				return basicGetContainer();
-			case GMFGraphPackage.DIAGRAM_LABEL__EXTERNAL:
-				return isExternal();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_LABEL__ELEMENT_ICON:
-				setElementIcon((Boolean)newValue);
-				return;
-			case GMFGraphPackage.DIAGRAM_LABEL__ACCESSOR:
-				setAccessor((ChildAccess)newValue);
-				return;
-			case GMFGraphPackage.DIAGRAM_LABEL__CONTAINER:
-				setContainer((ChildAccess)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_LABEL__ELEMENT_ICON:
-				setElementIcon(ELEMENT_ICON_EDEFAULT);
-				return;
-			case GMFGraphPackage.DIAGRAM_LABEL__ACCESSOR:
-				setAccessor((ChildAccess)null);
-				return;
-			case GMFGraphPackage.DIAGRAM_LABEL__CONTAINER:
-				setContainer((ChildAccess)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.DIAGRAM_LABEL__ELEMENT_ICON:
-				return elementIcon != ELEMENT_ICON_EDEFAULT;
-			case GMFGraphPackage.DIAGRAM_LABEL__ACCESSOR:
-				return accessor != null;
-			case GMFGraphPackage.DIAGRAM_LABEL__CONTAINER:
-				return container != null;
-			case GMFGraphPackage.DIAGRAM_LABEL__EXTERNAL:
-				return isExternal() != EXTERNAL_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (elementIcon: ");
-		result.append(elementIcon);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DiagramLabelImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DimensionImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DimensionImpl.java
deleted file mode 100644
index 6a7bfecf968..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/DimensionImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Dimension</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DimensionImpl#getDx <em>Dx</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.DimensionImpl#getDy <em>Dy</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DimensionImpl extends EObjectImpl implements Dimension {
-	/**
-	 * The default value of the '{@link #getDx() <em>Dx</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDx()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DX_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getDx() <em>Dx</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDx()
-	 * @generated
-	 * @ordered
-	 */
-	protected int dx = DX_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDy() <em>Dy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDy()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int DY_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getDy() <em>Dy</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDy()
-	 * @generated
-	 * @ordered
-	 */
-	protected int dy = DY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DimensionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getDimension();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getDx() {
-		return dx;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDx(int newDx) {
-		int oldDx = dx;
-		dx = newDx;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DIMENSION__DX, oldDx, dx));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getDy() {
-		return dy;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDy(int newDy) {
-		int oldDy = dy;
-		dy = newDy;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.DIMENSION__DY, oldDy, dy));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.DIMENSION__DX:
-				return getDx();
-			case GMFGraphPackage.DIMENSION__DY:
-				return getDy();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.DIMENSION__DX:
-				setDx((Integer)newValue);
-				return;
-			case GMFGraphPackage.DIMENSION__DY:
-				setDy((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.DIMENSION__DX:
-				setDx(DX_EDEFAULT);
-				return;
-			case GMFGraphPackage.DIMENSION__DY:
-				setDy(DY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.DIMENSION__DX:
-				return dx != DX_EDEFAULT;
-			case GMFGraphPackage.DIMENSION__DY:
-				return dy != DY_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (dx: ");
-		result.append(dx);
-		result.append(", dy: ");
-		result.append(dy);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DimensionImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/EllipseImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/EllipseImpl.java
deleted file mode 100644
index 0a54a89bd05..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/EllipseImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.Ellipse;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ellipse</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class EllipseImpl extends ShapeImpl implements Ellipse {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EllipseImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getEllipse();
-	}
-
-} //EllipseImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureAccessorImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureAccessorImpl.java
deleted file mode 100644
index 7971ced0392..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureAccessorImpl.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Figure Accessor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureAccessorImpl#getAccessor <em>Accessor</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureAccessorImpl#getTypedFigure <em>Typed Figure</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FigureAccessorImpl extends EObjectImpl implements FigureAccessor {
-	/**
-	 * The default value of the '{@link #getAccessor() <em>Accessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ACCESSOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAccessor() <em>Accessor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessor()
-	 * @generated
-	 * @ordered
-	 */
-	protected String accessor = ACCESSOR_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getTypedFigure() <em>Typed Figure</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTypedFigure()
-	 * @generated
-	 * @ordered
-	 */
-	protected RealFigure typedFigure;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FigureAccessorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getFigureAccessor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAccessor() {
-		return accessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAccessor(String newAccessor) {
-		String oldAccessor = accessor;
-		accessor = newAccessor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_ACCESSOR__ACCESSOR, oldAccessor, accessor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RealFigure getTypedFigure() {
-		return typedFigure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTypedFigure(RealFigure newTypedFigure, NotificationChain msgs) {
-		RealFigure oldTypedFigure = typedFigure;
-		typedFigure = newTypedFigure;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE, oldTypedFigure, newTypedFigure);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTypedFigure(RealFigure newTypedFigure) {
-		if (newTypedFigure != typedFigure) {
-			NotificationChain msgs = null;
-			if (typedFigure != null)
-				msgs = ((InternalEObject)typedFigure).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE, null, msgs);
-			if (newTypedFigure != null)
-				msgs = ((InternalEObject)newTypedFigure).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE, null, msgs);
-			msgs = basicSetTypedFigure(newTypedFigure, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE, newTypedFigure, newTypedFigure));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE:
-				return basicSetTypedFigure(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_ACCESSOR__ACCESSOR:
-				return getAccessor();
-			case GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE:
-				return getTypedFigure();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_ACCESSOR__ACCESSOR:
-				setAccessor((String)newValue);
-				return;
-			case GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE:
-				setTypedFigure((RealFigure)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_ACCESSOR__ACCESSOR:
-				setAccessor(ACCESSOR_EDEFAULT);
-				return;
-			case GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE:
-				setTypedFigure((RealFigure)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_ACCESSOR__ACCESSOR:
-				return ACCESSOR_EDEFAULT == null ? accessor != null : !ACCESSOR_EDEFAULT.equals(accessor);
-			case GMFGraphPackage.FIGURE_ACCESSOR__TYPED_FIGURE:
-				return typedFigure != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (accessor: ");
-		result.append(accessor);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FigureAccessorImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureDescriptorImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureDescriptorImpl.java
deleted file mode 100644
index 9ecd80cf767..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureDescriptorImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Figure Descriptor</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureDescriptorImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureDescriptorImpl#getActualFigure <em>Actual Figure</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureDescriptorImpl#getAccessors <em>Accessors</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FigureDescriptorImpl extends EObjectImpl implements FigureDescriptor {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getActualFigure() <em>Actual Figure</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActualFigure()
-	 * @generated
-	 * @ordered
-	 */
-	protected Figure actualFigure;
-
-	/**
-	 * The cached value of the '{@link #getAccessors() <em>Accessors</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAccessors()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ChildAccess> accessors;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FigureDescriptorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getFigureDescriptor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_DESCRIPTOR__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Figure getActualFigure() {
-		return actualFigure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetActualFigure(Figure newActualFigure, NotificationChain msgs) {
-		Figure oldActualFigure = actualFigure;
-		actualFigure = newActualFigure;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE, oldActualFigure, newActualFigure);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActualFigure(Figure newActualFigure) {
-		if (newActualFigure != actualFigure) {
-			NotificationChain msgs = null;
-			if (actualFigure != null)
-				msgs = ((InternalEObject)actualFigure).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE, null, msgs);
-			if (newActualFigure != null)
-				msgs = ((InternalEObject)newActualFigure).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE, null, msgs);
-			msgs = basicSetActualFigure(newActualFigure, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE, newActualFigure, newActualFigure));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ChildAccess> getAccessors() {
-		if (accessors == null) {
-			accessors = new EObjectContainmentWithInverseEList<ChildAccess>(ChildAccess.class, this, GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS, GMFGraphPackage.CHILD_ACCESS__OWNER);
-		}
-		return accessors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getAccessors()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE:
-				return basicSetActualFigure(null, msgs);
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS:
-				return ((InternalEList<?>)getAccessors()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__NAME:
-				return getName();
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE:
-				return getActualFigure();
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS:
-				return getAccessors();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__NAME:
-				setName((String)newValue);
-				return;
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE:
-				setActualFigure((Figure)newValue);
-				return;
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS:
-				getAccessors().clear();
-				getAccessors().addAll((Collection<? extends ChildAccess>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE:
-				setActualFigure((Figure)null);
-				return;
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS:
-				getAccessors().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACTUAL_FIGURE:
-				return actualFigure != null;
-			case GMFGraphPackage.FIGURE_DESCRIPTOR__ACCESSORS:
-				return accessors != null && !accessors.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FigureDescriptorImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureGalleryImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureGalleryImpl.java
deleted file mode 100644
index 477efbe66ca..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureGalleryImpl.java
+++ /dev/null
@@ -1,408 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.Border;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Layout;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Figure Gallery</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureGalleryImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureGalleryImpl#getFigures <em>Figures</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureGalleryImpl#getDescriptors <em>Descriptors</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureGalleryImpl#getBorders <em>Borders</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureGalleryImpl#getLayouts <em>Layouts</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureGalleryImpl#getImplementationBundle <em>Implementation Bundle</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FigureGalleryImpl extends EObjectImpl implements FigureGallery {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getFigures() <em>Figures</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFigures()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<RealFigure> figures;
-
-	/**
-	 * The cached value of the '{@link #getDescriptors() <em>Descriptors</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescriptors()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FigureDescriptor> descriptors;
-
-	/**
-	 * The cached value of the '{@link #getBorders() <em>Borders</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBorders()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Border> borders;
-
-	/**
-	 * The cached value of the '{@link #getLayouts() <em>Layouts</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLayouts()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Layout> layouts;
-
-	/**
-	 * The default value of the '{@link #getImplementationBundle() <em>Implementation Bundle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplementationBundle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IMPLEMENTATION_BUNDLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getImplementationBundle() <em>Implementation Bundle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getImplementationBundle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String implementationBundle = IMPLEMENTATION_BUNDLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FigureGalleryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getFigureGallery();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_GALLERY__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<RealFigure> getFigures() {
-		if (figures == null) {
-			figures = new EObjectContainmentEList<RealFigure>(RealFigure.class, this, GMFGraphPackage.FIGURE_GALLERY__FIGURES);
-		}
-		return figures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<FigureDescriptor> getDescriptors() {
-		if (descriptors == null) {
-			descriptors = new EObjectContainmentEList<FigureDescriptor>(FigureDescriptor.class, this, GMFGraphPackage.FIGURE_GALLERY__DESCRIPTORS);
-		}
-		return descriptors;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Border> getBorders() {
-		if (borders == null) {
-			borders = new EObjectContainmentEList<Border>(Border.class, this, GMFGraphPackage.FIGURE_GALLERY__BORDERS);
-		}
-		return borders;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Layout> getLayouts() {
-		if (layouts == null) {
-			layouts = new EObjectContainmentEList<Layout>(Layout.class, this, GMFGraphPackage.FIGURE_GALLERY__LAYOUTS);
-		}
-		return layouts;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getImplementationBundleGen() {
-		return implementationBundle;
-	}
-
-	public String getImplementationBundle() {
-		String value = getImplementationBundleGen();
-		if (value != null && value.trim().length() > 0) {
-			return value.trim();
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setImplementationBundle(String newImplementationBundle) {
-		String oldImplementationBundle = implementationBundle;
-		implementationBundle = newImplementationBundle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_GALLERY__IMPLEMENTATION_BUNDLE, oldImplementationBundle, implementationBundle));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_GALLERY__FIGURES:
-				return ((InternalEList<?>)getFigures()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.FIGURE_GALLERY__DESCRIPTORS:
-				return ((InternalEList<?>)getDescriptors()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.FIGURE_GALLERY__BORDERS:
-				return ((InternalEList<?>)getBorders()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.FIGURE_GALLERY__LAYOUTS:
-				return ((InternalEList<?>)getLayouts()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_GALLERY__NAME:
-				return getName();
-			case GMFGraphPackage.FIGURE_GALLERY__FIGURES:
-				return getFigures();
-			case GMFGraphPackage.FIGURE_GALLERY__DESCRIPTORS:
-				return getDescriptors();
-			case GMFGraphPackage.FIGURE_GALLERY__BORDERS:
-				return getBorders();
-			case GMFGraphPackage.FIGURE_GALLERY__LAYOUTS:
-				return getLayouts();
-			case GMFGraphPackage.FIGURE_GALLERY__IMPLEMENTATION_BUNDLE:
-				return getImplementationBundle();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_GALLERY__NAME:
-				setName((String)newValue);
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__FIGURES:
-				getFigures().clear();
-				getFigures().addAll((Collection<? extends RealFigure>)newValue);
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__DESCRIPTORS:
-				getDescriptors().clear();
-				getDescriptors().addAll((Collection<? extends FigureDescriptor>)newValue);
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__BORDERS:
-				getBorders().clear();
-				getBorders().addAll((Collection<? extends Border>)newValue);
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__LAYOUTS:
-				getLayouts().clear();
-				getLayouts().addAll((Collection<? extends Layout>)newValue);
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__IMPLEMENTATION_BUNDLE:
-				setImplementationBundle((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_GALLERY__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__FIGURES:
-				getFigures().clear();
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__DESCRIPTORS:
-				getDescriptors().clear();
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__BORDERS:
-				getBorders().clear();
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__LAYOUTS:
-				getLayouts().clear();
-				return;
-			case GMFGraphPackage.FIGURE_GALLERY__IMPLEMENTATION_BUNDLE:
-				setImplementationBundle(IMPLEMENTATION_BUNDLE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_GALLERY__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFGraphPackage.FIGURE_GALLERY__FIGURES:
-				return figures != null && !figures.isEmpty();
-			case GMFGraphPackage.FIGURE_GALLERY__DESCRIPTORS:
-				return descriptors != null && !descriptors.isEmpty();
-			case GMFGraphPackage.FIGURE_GALLERY__BORDERS:
-				return borders != null && !borders.isEmpty();
-			case GMFGraphPackage.FIGURE_GALLERY__LAYOUTS:
-				return layouts != null && !layouts.isEmpty();
-			case GMFGraphPackage.FIGURE_GALLERY__IMPLEMENTATION_BUNDLE:
-				return IMPLEMENTATION_BUNDLE_EDEFAULT == null ? implementationBundle != null : !IMPLEMENTATION_BUNDLE_EDEFAULT.equals(implementationBundle);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", implementationBundle: ");
-		result.append(implementationBundle);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FigureGalleryImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureRefImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureRefImpl.java
deleted file mode 100644
index e3c6aa986c0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FigureRefImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Figure Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FigureRefImpl#getFigure <em>Figure</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FigureRefImpl extends AbstractFigureImpl implements FigureRef {
-	/**
-	 * The cached value of the '{@link #getFigure() <em>Figure</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFigure()
-	 * @generated
-	 * @ordered
-	 */
-	protected RealFigure figure;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FigureRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getFigureRef();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RealFigure getFigure() {
-		if (figure != null && figure.eIsProxy()) {
-			InternalEObject oldFigure = (InternalEObject)figure;
-			figure = (RealFigure)eResolveProxy(oldFigure);
-			if (figure != oldFigure) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.FIGURE_REF__FIGURE, oldFigure, figure));
-			}
-		}
-		return figure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RealFigure basicGetFigure() {
-		return figure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFigure(RealFigure newFigure) {
-		RealFigure oldFigure = figure;
-		figure = newFigure;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FIGURE_REF__FIGURE, oldFigure, figure));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_REF__FIGURE:
-				if (resolve) return getFigure();
-				return basicGetFigure();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_REF__FIGURE:
-				setFigure((RealFigure)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_REF__FIGURE:
-				setFigure((RealFigure)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FIGURE_REF__FIGURE:
-				return figure != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //FigureRefImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FlowLayoutImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FlowLayoutImpl.java
deleted file mode 100644
index f3ac7027981..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/FlowLayoutImpl.java
+++ /dev/null
@@ -1,503 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Flow Layout</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl#isVertical <em>Vertical</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl#isMatchMinorSize <em>Match Minor Size</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl#isForceSingleLine <em>Force Single Line</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl#getMajorAlignment <em>Major Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl#getMinorAlignment <em>Minor Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl#getMajorSpacing <em>Major Spacing</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.FlowLayoutImpl#getMinorSpacing <em>Minor Spacing</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FlowLayoutImpl extends EObjectImpl implements FlowLayout {
-	/**
-	 * The default value of the '{@link #isVertical() <em>Vertical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVertical()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean VERTICAL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isVertical() <em>Vertical</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isVertical()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean vertical = VERTICAL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isMatchMinorSize() <em>Match Minor Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMatchMinorSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean MATCH_MINOR_SIZE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isMatchMinorSize() <em>Match Minor Size</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isMatchMinorSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean matchMinorSize = MATCH_MINOR_SIZE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isForceSingleLine() <em>Force Single Line</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isForceSingleLine()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FORCE_SINGLE_LINE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isForceSingleLine() <em>Force Single Line</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isForceSingleLine()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean forceSingleLine = FORCE_SINGLE_LINE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMajorAlignment() <em>Major Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMajorAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Alignment MAJOR_ALIGNMENT_EDEFAULT = Alignment.BEGINNING_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getMajorAlignment() <em>Major Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMajorAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected Alignment majorAlignment = MAJOR_ALIGNMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMinorAlignment() <em>Minor Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinorAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Alignment MINOR_ALIGNMENT_EDEFAULT = Alignment.BEGINNING_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getMinorAlignment() <em>Minor Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinorAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected Alignment minorAlignment = MINOR_ALIGNMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMajorSpacing() <em>Major Spacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMajorSpacing()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MAJOR_SPACING_EDEFAULT = 5;
-
-	/**
-	 * The cached value of the '{@link #getMajorSpacing() <em>Major Spacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMajorSpacing()
-	 * @generated
-	 * @ordered
-	 */
-	protected int majorSpacing = MAJOR_SPACING_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMinorSpacing() <em>Minor Spacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinorSpacing()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int MINOR_SPACING_EDEFAULT = 5;
-
-	/**
-	 * The cached value of the '{@link #getMinorSpacing() <em>Minor Spacing</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMinorSpacing()
-	 * @generated
-	 * @ordered
-	 */
-	protected int minorSpacing = MINOR_SPACING_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FlowLayoutImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getFlowLayout();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isVertical() {
-		return vertical;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVertical(boolean newVertical) {
-		boolean oldVertical = vertical;
-		vertical = newVertical;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__VERTICAL, oldVertical, vertical));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isMatchMinorSize() {
-		return matchMinorSize;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMatchMinorSize(boolean newMatchMinorSize) {
-		boolean oldMatchMinorSize = matchMinorSize;
-		matchMinorSize = newMatchMinorSize;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE, oldMatchMinorSize, matchMinorSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isForceSingleLine() {
-		return forceSingleLine;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setForceSingleLine(boolean newForceSingleLine) {
-		boolean oldForceSingleLine = forceSingleLine;
-		forceSingleLine = newForceSingleLine;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE, oldForceSingleLine, forceSingleLine));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Alignment getMajorAlignment() {
-		return majorAlignment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMajorAlignment(Alignment newMajorAlignment) {
-		Alignment oldMajorAlignment = majorAlignment;
-		majorAlignment = newMajorAlignment == null ? MAJOR_ALIGNMENT_EDEFAULT : newMajorAlignment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT, oldMajorAlignment, majorAlignment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Alignment getMinorAlignment() {
-		return minorAlignment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMinorAlignment(Alignment newMinorAlignment) {
-		Alignment oldMinorAlignment = minorAlignment;
-		minorAlignment = newMinorAlignment == null ? MINOR_ALIGNMENT_EDEFAULT : newMinorAlignment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT, oldMinorAlignment, minorAlignment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getMajorSpacing() {
-		return majorSpacing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMajorSpacing(int newMajorSpacing) {
-		int oldMajorSpacing = majorSpacing;
-		majorSpacing = newMajorSpacing;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING, oldMajorSpacing, majorSpacing));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getMinorSpacing() {
-		return minorSpacing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMinorSpacing(int newMinorSpacing) {
-		int oldMinorSpacing = minorSpacing;
-		minorSpacing = newMinorSpacing;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING, oldMinorSpacing, minorSpacing));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
-				return isVertical();
-			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
-				return isMatchMinorSize();
-			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
-				return isForceSingleLine();
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
-				return getMajorAlignment();
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
-				return getMinorAlignment();
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
-				return getMajorSpacing();
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
-				return getMinorSpacing();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
-				setVertical((Boolean)newValue);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
-				setMatchMinorSize((Boolean)newValue);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
-				setForceSingleLine((Boolean)newValue);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
-				setMajorAlignment((Alignment)newValue);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
-				setMinorAlignment((Alignment)newValue);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
-				setMajorSpacing((Integer)newValue);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
-				setMinorSpacing((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
-				setVertical(VERTICAL_EDEFAULT);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
-				setMatchMinorSize(MATCH_MINOR_SIZE_EDEFAULT);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
-				setForceSingleLine(FORCE_SINGLE_LINE_EDEFAULT);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
-				setMajorAlignment(MAJOR_ALIGNMENT_EDEFAULT);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
-				setMinorAlignment(MINOR_ALIGNMENT_EDEFAULT);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
-				setMajorSpacing(MAJOR_SPACING_EDEFAULT);
-				return;
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
-				setMinorSpacing(MINOR_SPACING_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.FLOW_LAYOUT__VERTICAL:
-				return vertical != VERTICAL_EDEFAULT;
-			case GMFGraphPackage.FLOW_LAYOUT__MATCH_MINOR_SIZE:
-				return matchMinorSize != MATCH_MINOR_SIZE_EDEFAULT;
-			case GMFGraphPackage.FLOW_LAYOUT__FORCE_SINGLE_LINE:
-				return forceSingleLine != FORCE_SINGLE_LINE_EDEFAULT;
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_ALIGNMENT:
-				return majorAlignment != MAJOR_ALIGNMENT_EDEFAULT;
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_ALIGNMENT:
-				return minorAlignment != MINOR_ALIGNMENT_EDEFAULT;
-			case GMFGraphPackage.FLOW_LAYOUT__MAJOR_SPACING:
-				return majorSpacing != MAJOR_SPACING_EDEFAULT;
-			case GMFGraphPackage.FLOW_LAYOUT__MINOR_SPACING:
-				return minorSpacing != MINOR_SPACING_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (vertical: ");
-		result.append(vertical);
-		result.append(", matchMinorSize: ");
-		result.append(matchMinorSize);
-		result.append(", forceSingleLine: ");
-		result.append(forceSingleLine);
-		result.append(", majorAlignment: ");
-		result.append(majorAlignment);
-		result.append(", minorAlignment: ");
-		result.append(minorAlignment);
-		result.append(", majorSpacing: ");
-		result.append(majorSpacing);
-		result.append(", minorSpacing: ");
-		result.append(minorSpacing);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FlowLayoutImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GMFGraphFactoryImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GMFGraphFactoryImpl.java
deleted file mode 100644
index e661706936a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GMFGraphFactoryImpl.java
+++ /dev/null
@@ -1,1009 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.BasicFont;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.CenterLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorConstants;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorPin;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.ConstantColor;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomPin;
-import org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.Direction;
-import org.eclipse.papyrus.gmf.gmfgraph.Ellipse;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.FontStyle;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GradientFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.Insets;
-import org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.Label;
-import org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutRef;
-import org.eclipse.papyrus.gmf.gmfgraph.LineBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.LineKind;
-import org.eclipse.papyrus.gmf.gmfgraph.MarginBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-import org.eclipse.papyrus.gmf.gmfgraph.Polygon;
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.RGBColor;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D;
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType;
-import org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon;
-import org.eclipse.papyrus.gmf.gmfgraph.StackLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.VisiblePin;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFGraphFactoryImpl extends EFactoryImpl implements GMFGraphFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static GMFGraphFactory init() {
-		try {
-			GMFGraphFactory theGMFGraphFactory = (GMFGraphFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/gmf/2020/GraphicalDefinition"); 
-			if (theGMFGraphFactory != null) {
-				return theGMFGraphFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new GMFGraphFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case GMFGraphPackage.CANVAS: return createCanvas();
-			case GMFGraphPackage.FIGURE_GALLERY: return createFigureGallery();
-			case GMFGraphPackage.NODE: return createNode();
-			case GMFGraphPackage.CONNECTION: return createConnection();
-			case GMFGraphPackage.COMPARTMENT: return createCompartment();
-			case GMFGraphPackage.DIAGRAM_LABEL: return createDiagramLabel();
-			case GMFGraphPackage.GENERAL_FACET: return createGeneralFacet();
-			case GMFGraphPackage.ALIGNMENT_FACET: return createAlignmentFacet();
-			case GMFGraphPackage.GRADIENT_FACET: return createGradientFacet();
-			case GMFGraphPackage.LABEL_OFFSET_FACET: return createLabelOffsetFacet();
-			case GMFGraphPackage.DEFAULT_SIZE_FACET: return createDefaultSizeFacet();
-			case GMFGraphPackage.FIGURE_DESCRIPTOR: return createFigureDescriptor();
-			case GMFGraphPackage.CHILD_ACCESS: return createChildAccess();
-			case GMFGraphPackage.FIGURE_REF: return createFigureRef();
-			case GMFGraphPackage.LABEL: return createLabel();
-			case GMFGraphPackage.LABELED_CONTAINER: return createLabeledContainer();
-			case GMFGraphPackage.VERTICAL_LABEL: return createVerticalLabel();
-			case GMFGraphPackage.RECTANGLE: return createRectangle();
-			case GMFGraphPackage.INVISIBLE_RECTANGLE: return createInvisibleRectangle();
-			case GMFGraphPackage.ROUNDED_RECTANGLE: return createRoundedRectangle();
-			case GMFGraphPackage.ELLIPSE: return createEllipse();
-			case GMFGraphPackage.POLYLINE: return createPolyline();
-			case GMFGraphPackage.POLYGON: return createPolygon();
-			case GMFGraphPackage.SCALABLE_POLYGON: return createScalablePolygon();
-			case GMFGraphPackage.POLYLINE_CONNECTION: return createPolylineConnection();
-			case GMFGraphPackage.POLYLINE_DECORATION: return createPolylineDecoration();
-			case GMFGraphPackage.POLYGON_DECORATION: return createPolygonDecoration();
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE: return createCustomAttribute();
-			case GMFGraphPackage.FIGURE_ACCESSOR: return createFigureAccessor();
-			case GMFGraphPackage.CUSTOM_FIGURE: return createCustomFigure();
-			case GMFGraphPackage.CUSTOM_DECORATION: return createCustomDecoration();
-			case GMFGraphPackage.CUSTOM_CONNECTION: return createCustomConnection();
-			case GMFGraphPackage.RGB_COLOR: return createRGBColor();
-			case GMFGraphPackage.CONSTANT_COLOR: return createConstantColor();
-			case GMFGraphPackage.BASIC_FONT: return createBasicFont();
-			case GMFGraphPackage.POINT: return createPoint();
-			case GMFGraphPackage.DIMENSION: return createDimension();
-			case GMFGraphPackage.INSETS: return createInsets();
-			case GMFGraphPackage.BORDER_REF: return createBorderRef();
-			case GMFGraphPackage.LINE_BORDER: return createLineBorder();
-			case GMFGraphPackage.MARGIN_BORDER: return createMarginBorder();
-			case GMFGraphPackage.COMPOUND_BORDER: return createCompoundBorder();
-			case GMFGraphPackage.CUSTOM_BORDER: return createCustomBorder();
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA: return createCustomLayoutData();
-			case GMFGraphPackage.GRID_LAYOUT_DATA: return createGridLayoutData();
-			case GMFGraphPackage.BORDER_LAYOUT_DATA: return createBorderLayoutData();
-			case GMFGraphPackage.LAYOUT_REF: return createLayoutRef();
-			case GMFGraphPackage.CUSTOM_LAYOUT: return createCustomLayout();
-			case GMFGraphPackage.GRID_LAYOUT: return createGridLayout();
-			case GMFGraphPackage.BORDER_LAYOUT: return createBorderLayout();
-			case GMFGraphPackage.FLOW_LAYOUT: return createFlowLayout();
-			case GMFGraphPackage.XY_LAYOUT: return createXYLayout();
-			case GMFGraphPackage.XY_LAYOUT_DATA: return createXYLayoutData();
-			case GMFGraphPackage.STACK_LAYOUT: return createStackLayout();
-			case GMFGraphPackage.CENTER_LAYOUT: return createCenterLayout();
-			case GMFGraphPackage.SVG_FIGURE: return createSVGFigure();
-			case GMFGraphPackage.SVG_PROPERTY: return createSVGProperty();
-			case GMFGraphPackage.RECTANGLE2_D: return createRectangle2D();
-			case GMFGraphPackage.CUSTOM_PIN: return createCustomPin();
-			case GMFGraphPackage.COLOR_PIN: return createColorPin();
-			case GMFGraphPackage.VISIBLE_PIN: return createVisiblePin();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case GMFGraphPackage.COLOR_CONSTANTS:
-				return createColorConstantsFromString(eDataType, initialValue);
-			case GMFGraphPackage.FONT_STYLE:
-				return createFontStyleFromString(eDataType, initialValue);
-			case GMFGraphPackage.DIRECTION:
-				return createDirectionFromString(eDataType, initialValue);
-			case GMFGraphPackage.LINE_KIND:
-				return createLineKindFromString(eDataType, initialValue);
-			case GMFGraphPackage.ALIGNMENT:
-				return createAlignmentFromString(eDataType, initialValue);
-			case GMFGraphPackage.SVG_PROPERTY_TYPE:
-				return createSVGPropertyTypeFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case GMFGraphPackage.COLOR_CONSTANTS:
-				return convertColorConstantsToString(eDataType, instanceValue);
-			case GMFGraphPackage.FONT_STYLE:
-				return convertFontStyleToString(eDataType, instanceValue);
-			case GMFGraphPackage.DIRECTION:
-				return convertDirectionToString(eDataType, instanceValue);
-			case GMFGraphPackage.LINE_KIND:
-				return convertLineKindToString(eDataType, instanceValue);
-			case GMFGraphPackage.ALIGNMENT:
-				return convertAlignmentToString(eDataType, instanceValue);
-			case GMFGraphPackage.SVG_PROPERTY_TYPE:
-				return convertSVGPropertyTypeToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Canvas createCanvas() {
-		CanvasImpl canvas = new CanvasImpl();
-		return canvas;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureGallery createFigureGallery() {
-		FigureGalleryImpl figureGallery = new FigureGalleryImpl();
-		return figureGallery;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Node createNode() {
-		NodeImpl node = new NodeImpl();
-		return node;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess createChildAccess() {
-		ChildAccessImpl childAccess = new ChildAccessImpl();
-		return childAccess;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Connection createConnection() {
-		ConnectionImpl connection = new ConnectionImpl();
-		return connection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Compartment createCompartment() {
-		CompartmentImpl compartment = new CompartmentImpl();
-		return compartment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramLabel createDiagramLabel() {
-		DiagramLabelImpl diagramLabel = new DiagramLabelImpl();
-		return diagramLabel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GeneralFacet createGeneralFacet() {
-		GeneralFacetImpl generalFacet = new GeneralFacetImpl();
-		return generalFacet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AlignmentFacet createAlignmentFacet() {
-		AlignmentFacetImpl alignmentFacet = new AlignmentFacetImpl();
-		return alignmentFacet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GradientFacet createGradientFacet() {
-		GradientFacetImpl gradientFacet = new GradientFacetImpl();
-		return gradientFacet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelOffsetFacet createLabelOffsetFacet() {
-		LabelOffsetFacetImpl labelOffsetFacet = new LabelOffsetFacetImpl();
-		return labelOffsetFacet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DefaultSizeFacet createDefaultSizeFacet() {
-		DefaultSizeFacetImpl defaultSizeFacet = new DefaultSizeFacetImpl();
-		return defaultSizeFacet;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureDescriptor createFigureDescriptor() {
-		FigureDescriptorImpl figureDescriptor = new FigureDescriptorImpl();
-		return figureDescriptor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureRef createFigureRef() {
-		FigureRefImpl figureRef = new FigureRefImpl();
-		return figureRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Label createLabel() {
-		LabelImpl label = new LabelImpl();
-		return label;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabeledContainer createLabeledContainer() {
-		LabeledContainerImpl labeledContainer = new LabeledContainerImpl();
-		return labeledContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VerticalLabel createVerticalLabel() {
-		VerticalLabelImpl verticalLabel = new VerticalLabelImpl();
-		return verticalLabel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rectangle createRectangle() {
-		RectangleImpl rectangle = new RectangleImpl();
-		return rectangle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public InvisibleRectangle createInvisibleRectangle() {
-		InvisibleRectangleImpl invisibleRectangle = new InvisibleRectangleImpl();
-		return invisibleRectangle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RoundedRectangle createRoundedRectangle() {
-		RoundedRectangleImpl roundedRectangle = new RoundedRectangleImpl();
-		return roundedRectangle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Ellipse createEllipse() {
-		EllipseImpl ellipse = new EllipseImpl();
-		return ellipse;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Polyline createPolyline() {
-		PolylineImpl polyline = new PolylineImpl();
-		return polyline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Polygon createPolygon() {
-		PolygonImpl polygon = new PolygonImpl();
-		return polygon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ScalablePolygon createScalablePolygon() {
-		ScalablePolygonImpl scalablePolygon = new ScalablePolygonImpl();
-		return scalablePolygon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolylineConnection createPolylineConnection() {
-		PolylineConnectionImpl polylineConnection = new PolylineConnectionImpl();
-		return polylineConnection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolylineDecoration createPolylineDecoration() {
-		PolylineDecorationImpl polylineDecoration = new PolylineDecorationImpl();
-		return polylineDecoration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PolygonDecoration createPolygonDecoration() {
-		PolygonDecorationImpl polygonDecoration = new PolygonDecorationImpl();
-		return polygonDecoration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomFigure createCustomFigure() {
-		CustomFigureImpl customFigure = new CustomFigureImpl();
-		return customFigure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomDecoration createCustomDecoration() {
-		CustomDecorationImpl customDecoration = new CustomDecorationImpl();
-		return customDecoration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomConnection createCustomConnection() {
-		CustomConnectionImpl customConnection = new CustomConnectionImpl();
-		return customConnection;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public RGBColor createRGBColor() {
-		RGBColorImpl rgbColor = new RGBColorImpl();
-		return rgbColor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConstantColor createConstantColor() {
-		ConstantColorImpl constantColor = new ConstantColorImpl();
-		return constantColor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BasicFont createBasicFont() {
-		BasicFontImpl basicFont = new BasicFontImpl();
-		return basicFont;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point createPoint() {
-		PointImpl point = new PointImpl();
-		return point;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension createDimension() {
-		DimensionImpl dimension = new DimensionImpl();
-		return dimension;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Insets createInsets() {
-		InsetsImpl insets = new InsetsImpl();
-		return insets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BorderRef createBorderRef() {
-		BorderRefImpl borderRef = new BorderRefImpl();
-		return borderRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LineBorder createLineBorder() {
-		LineBorderImpl lineBorder = new LineBorderImpl();
-		return lineBorder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MarginBorder createMarginBorder() {
-		MarginBorderImpl marginBorder = new MarginBorderImpl();
-		return marginBorder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompoundBorder createCompoundBorder() {
-		CompoundBorderImpl compoundBorder = new CompoundBorderImpl();
-		return compoundBorder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomBorder createCustomBorder() {
-		CustomBorderImpl customBorder = new CustomBorderImpl();
-		return customBorder;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomLayoutData createCustomLayoutData() {
-		CustomLayoutDataImpl customLayoutData = new CustomLayoutDataImpl();
-		return customLayoutData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GridLayoutData createGridLayoutData() {
-		GridLayoutDataImpl gridLayoutData = new GridLayoutDataImpl();
-		return gridLayoutData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BorderLayoutData createBorderLayoutData() {
-		BorderLayoutDataImpl borderLayoutData = new BorderLayoutDataImpl();
-		return borderLayoutData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LayoutRef createLayoutRef() {
-		LayoutRefImpl layoutRef = new LayoutRefImpl();
-		return layoutRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomLayout createCustomLayout() {
-		CustomLayoutImpl customLayout = new CustomLayoutImpl();
-		return customLayout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GridLayout createGridLayout() {
-		GridLayoutImpl gridLayout = new GridLayoutImpl();
-		return gridLayout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BorderLayout createBorderLayout() {
-		BorderLayoutImpl borderLayout = new BorderLayoutImpl();
-		return borderLayout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomAttribute createCustomAttribute() {
-		CustomAttributeImpl customAttribute = new CustomAttributeImpl();
-		return customAttribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FigureAccessor createFigureAccessor() {
-		FigureAccessorImpl figureAccessor = new FigureAccessorImpl();
-		return figureAccessor;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FlowLayout createFlowLayout() {
-		FlowLayoutImpl flowLayout = new FlowLayoutImpl();
-		return flowLayout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XYLayout createXYLayout() {
-		XYLayoutImpl xyLayout = new XYLayoutImpl();
-		return xyLayout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public XYLayoutData createXYLayoutData() {
-		XYLayoutDataImpl xyLayoutData = new XYLayoutDataImpl();
-		return xyLayoutData;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StackLayout createStackLayout() {
-		StackLayoutImpl stackLayout = new StackLayoutImpl();
-		return stackLayout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CenterLayout createCenterLayout() {
-		CenterLayoutImpl centerLayout = new CenterLayoutImpl();
-		return centerLayout;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SVGFigure createSVGFigure() {
-		SVGFigureImpl svgFigure = new SVGFigureImpl();
-		return svgFigure;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SVGProperty createSVGProperty() {
-		SVGPropertyImpl svgProperty = new SVGPropertyImpl();
-		return svgProperty;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rectangle2D createRectangle2D() {
-		Rectangle2DImpl rectangle2D = new Rectangle2DImpl();
-		return rectangle2D;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CustomPin createCustomPin() {
-		CustomPinImpl customPin = new CustomPinImpl();
-		return customPin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ColorPin createColorPin() {
-		ColorPinImpl colorPin = new ColorPinImpl();
-		return colorPin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VisiblePin createVisiblePin() {
-		VisiblePinImpl visiblePin = new VisiblePinImpl();
-		return visiblePin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ColorConstants createColorConstantsFromString(EDataType eDataType, String initialValue) {
-		ColorConstants result = ColorConstants.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertColorConstantsToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FontStyle createFontStyleFromString(EDataType eDataType, String initialValue) {
-		FontStyle result = FontStyle.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertFontStyleToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Direction createDirectionFromString(EDataType eDataType, String initialValue) {
-		Direction result = Direction.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertDirectionToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LineKind createLineKindFromString(EDataType eDataType, String initialValue) {
-		LineKind result = LineKind.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLineKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Alignment createAlignmentFromString(EDataType eDataType, String initialValue) {
-		Alignment result = Alignment.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAlignmentToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SVGPropertyType createSVGPropertyTypeFromString(EDataType eDataType, String initialValue) {
-		SVGPropertyType result = SVGPropertyType.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSVGPropertyTypeToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphPackage getGMFGraphPackage() {
-		return (GMFGraphPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static GMFGraphPackage getPackage() {
-		return GMFGraphPackage.eINSTANCE;
-	}
-
-} //GMFGraphFactoryImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GMFGraphPackageImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GMFGraphPackageImpl.java
deleted file mode 100644
index 3be4d5a6b28..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GMFGraphPackageImpl.java
+++ /dev/null
@@ -1,3648 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractNode;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.BasicFont;
-import org.eclipse.papyrus.gmf.gmfgraph.Border;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.CenterLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Color;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorConstants;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorPin;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.ConstantColor;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomClass;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomPin;
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.Direction;
-import org.eclipse.papyrus.gmf.gmfgraph.Ellipse;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.Font;
-import org.eclipse.papyrus.gmf.gmfgraph.FontStyle;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GradientFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.Identity;
-import org.eclipse.papyrus.gmf.gmfgraph.Insets;
-import org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.Label;
-import org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer;
-import org.eclipse.papyrus.gmf.gmfgraph.Layout;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Layoutable;
-import org.eclipse.papyrus.gmf.gmfgraph.LineBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.LineKind;
-import org.eclipse.papyrus.gmf.gmfgraph.MarginBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.Pin;
-import org.eclipse.papyrus.gmf.gmfgraph.PinOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-import org.eclipse.papyrus.gmf.gmfgraph.Polygon;
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.RGBColor;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D;
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType;
-import org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon;
-import org.eclipse.papyrus.gmf.gmfgraph.Shape;
-import org.eclipse.papyrus.gmf.gmfgraph.StackLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.VisiblePin;
-import org.eclipse.papyrus.gmf.gmfgraph.VisualFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFGraphPackageImpl extends EPackageImpl implements GMFGraphPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass canvasEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass figureGalleryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass identityEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass diagramElementEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractNodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass nodeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass childAccessEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass realFigureEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass compartmentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass diagramLabelEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass visualFacetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass generalFacetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass alignmentFacetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass gradientFacetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass labelOffsetFacetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass defaultSizeFacetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass figureEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass figureDescriptorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractFigureEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass figureRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass connectionFigureEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass decorationFigureEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass shapeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass labelEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass labeledContainerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass verticalLabelEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass rectangleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass invisibleRectangleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass roundedRectangleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ellipseEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass polylineEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass polygonEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass scalablePolygonEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass polylineConnectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass polylineDecorationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass polygonDecorationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customAttributeOwnerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customClassEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customFigureEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customDecorationEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customConnectionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass colorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass rgbColorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass constantColorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass fontEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass basicFontEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass pointEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass dimensionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass insetsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass borderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass borderRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass lineBorderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass marginBorderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass compoundBorderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customBorderEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass layoutDataEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customLayoutDataEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass gridLayoutDataEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass borderLayoutDataEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass layoutableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass layoutEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass layoutRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customLayoutEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass gridLayoutEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass borderLayoutEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customAttributeEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass figureAccessorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass flowLayoutEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xyLayoutEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass xyLayoutDataEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass stackLayoutEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass centerLayoutEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass svgFigureEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass svgPropertyEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass rectangle2DEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass pinEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass customPinEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass colorPinEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass visiblePinEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass pinOwnerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum colorConstantsEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum fontStyleEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum directionEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum lineKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum alignmentEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum svgPropertyTypeEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private GMFGraphPackageImpl() {
-		super(eNS_URI, GMFGraphFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link GMFGraphPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static GMFGraphPackage init() {
-		if (isInited) return (GMFGraphPackage)EPackage.Registry.INSTANCE.getEPackage(GMFGraphPackage.eNS_URI);
-
-		// Obtain or create and register package
-		GMFGraphPackageImpl theGMFGraphPackage = (GMFGraphPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof GMFGraphPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new GMFGraphPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theGMFGraphPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theGMFGraphPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theGMFGraphPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(GMFGraphPackage.eNS_URI, theGMFGraphPackage);
-		return theGMFGraphPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCanvas() {
-		return canvasEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvas_Figures() {
-		return (EReference)canvasEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvas_Nodes() {
-		return (EReference)canvasEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvas_Connections() {
-		return (EReference)canvasEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvas_Compartments() {
-		return (EReference)canvasEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvas_Labels() {
-		return (EReference)canvasEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFigureGallery() {
-		return figureGalleryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigureGallery_Figures() {
-		return (EReference)figureGalleryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigureGallery_Descriptors() {
-		return (EReference)figureGalleryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigureGallery_Borders() {
-		return (EReference)figureGalleryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigureGallery_Layouts() {
-		return (EReference)figureGalleryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFigureGallery_ImplementationBundle() {
-		return (EAttribute)figureGalleryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getIdentity() {
-		return identityEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getIdentity_Name() {
-		return (EAttribute)identityEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiagramElement() {
-		return diagramElementEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramElement_Figure() {
-		return (EReference)diagramElementEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramElement_Facets() {
-		return (EReference)diagramElementEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractNode() {
-		return abstractNodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNode() {
-		return nodeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNode_ResizeConstraint() {
-		return (EAttribute)nodeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNode_AffixedParentSide() {
-		return (EAttribute)nodeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNode_ContentPane() {
-		return (EReference)nodeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getChildAccess() {
-		return childAccessEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildAccess_Owner() {
-		return (EReference)childAccessEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getChildAccess_Accessor() {
-		return (EAttribute)childAccessEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildAccess_Figure() {
-		return (EReference)childAccessEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRealFigure() {
-		return realFigureEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRealFigure_Name() {
-		return (EAttribute)realFigureEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getRealFigure_Children() {
-		return (EReference)realFigureEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConnection() {
-		return connectionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCompartment() {
-		return compartmentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompartment_Collapsible() {
-		return (EAttribute)compartmentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCompartment_NeedsTitle() {
-		return (EAttribute)compartmentEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCompartment_Accessor() {
-		return (EReference)compartmentEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiagramLabel() {
-		return diagramLabelEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDiagramLabel_ElementIcon() {
-		return (EAttribute)diagramLabelEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramLabel_Accessor() {
-		return (EReference)diagramLabelEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramLabel_Container() {
-		return (EReference)diagramLabelEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDiagramLabel_External() {
-		return (EAttribute)diagramLabelEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getVisualFacet() {
-		return visualFacetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGeneralFacet() {
-		return generalFacetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGeneralFacet_Identifier() {
-		return (EAttribute)generalFacetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGeneralFacet_Data() {
-		return (EAttribute)generalFacetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAlignmentFacet() {
-		return alignmentFacetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAlignmentFacet_Alignment() {
-		return (EAttribute)alignmentFacetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGradientFacet() {
-		return gradientFacetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGradientFacet_Direction() {
-		return (EAttribute)gradientFacetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLabelOffsetFacet() {
-		return labelOffsetFacetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLabelOffsetFacet_X() {
-		return (EAttribute)labelOffsetFacetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLabelOffsetFacet_Y() {
-		return (EAttribute)labelOffsetFacetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDefaultSizeFacet() {
-		return defaultSizeFacetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDefaultSizeFacet_DefaultSize() {
-		return (EReference)defaultSizeFacetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFigure() {
-		return figureEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_Descriptor() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_ForegroundColor() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_BackgroundColor() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_MaximumSize() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_MinimumSize() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_PreferredSize() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_Font() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_Insets() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_Border() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(8);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_Location() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(9);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigure_Size() {
-		return (EReference)figureEClass.getEStructuralFeatures().get(10);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFigureDescriptor() {
-		return figureDescriptorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigureDescriptor_ActualFigure() {
-		return (EReference)figureDescriptorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigureDescriptor_Accessors() {
-		return (EReference)figureDescriptorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractFigure() {
-		return abstractFigureEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFigureRef() {
-		return figureRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigureRef_Figure() {
-		return (EReference)figureRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConnectionFigure() {
-		return connectionFigureEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDecorationFigure() {
-		return decorationFigureEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getShape() {
-		return shapeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getShape_Outline() {
-		return (EAttribute)shapeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getShape_Fill() {
-		return (EAttribute)shapeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getShape_LineWidth() {
-		return (EAttribute)shapeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getShape_LineKind() {
-		return (EAttribute)shapeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getShape_XorFill() {
-		return (EAttribute)shapeEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getShape_XorOutline() {
-		return (EAttribute)shapeEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getShape_ResolvedChildren() {
-		return (EReference)shapeEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLabel() {
-		return labelEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLabel_Text() {
-		return (EAttribute)labelEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLabeledContainer() {
-		return labeledContainerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getVerticalLabel() {
-		return verticalLabelEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getVerticalLabel_Text() {
-		return (EAttribute)verticalLabelEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRectangle() {
-		return rectangleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInvisibleRectangle() {
-		return invisibleRectangleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRoundedRectangle() {
-		return roundedRectangleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoundedRectangle_CornerWidth() {
-		return (EAttribute)roundedRectangleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRoundedRectangle_CornerHeight() {
-		return (EAttribute)roundedRectangleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEllipse() {
-		return ellipseEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPolyline() {
-		return polylineEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPolyline_Template() {
-		return (EReference)polylineEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPolygon() {
-		return polygonEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getScalablePolygon() {
-		return scalablePolygonEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPolylineConnection() {
-		return polylineConnectionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPolylineConnection_SourceDecoration() {
-		return (EReference)polylineConnectionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPolylineConnection_TargetDecoration() {
-		return (EReference)polylineConnectionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPolylineDecoration() {
-		return polylineDecorationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPolygonDecoration() {
-		return polygonDecorationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomAttributeOwner() {
-		return customAttributeOwnerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCustomAttributeOwner_Attributes() {
-		return (EReference)customAttributeOwnerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomClass() {
-		return customClassEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomClass_QualifiedClassName() {
-		return (EAttribute)customClassEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomFigure() {
-		return customFigureEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCustomFigure_CustomChildren() {
-		return (EReference)customFigureEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomDecoration() {
-		return customDecorationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomConnection() {
-		return customConnectionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getColor() {
-		return colorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRGBColor() {
-		return rgbColorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRGBColor_Red() {
-		return (EAttribute)rgbColorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRGBColor_Green() {
-		return (EAttribute)rgbColorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRGBColor_Blue() {
-		return (EAttribute)rgbColorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConstantColor() {
-		return constantColorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getConstantColor_Value() {
-		return (EAttribute)constantColorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFont() {
-		return fontEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBasicFont() {
-		return basicFontEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBasicFont_FaceName() {
-		return (EAttribute)basicFontEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBasicFont_Height() {
-		return (EAttribute)basicFontEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBasicFont_Style() {
-		return (EAttribute)basicFontEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getFontStyle() {
-		return fontStyleEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPoint() {
-		return pointEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPoint_X() {
-		return (EAttribute)pointEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPoint_Y() {
-		return (EAttribute)pointEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDimension() {
-		return dimensionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDimension_Dx() {
-		return (EAttribute)dimensionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDimension_Dy() {
-		return (EAttribute)dimensionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getInsets() {
-		return insetsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInsets_Top() {
-		return (EAttribute)insetsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInsets_Left() {
-		return (EAttribute)insetsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInsets_Bottom() {
-		return (EAttribute)insetsEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getInsets_Right() {
-		return (EAttribute)insetsEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBorder() {
-		return borderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBorderRef() {
-		return borderRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBorderRef_Actual() {
-		return (EReference)borderRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLineBorder() {
-		return lineBorderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLineBorder_Color() {
-		return (EReference)lineBorderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLineBorder_Width() {
-		return (EAttribute)lineBorderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMarginBorder() {
-		return marginBorderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMarginBorder_Insets() {
-		return (EReference)marginBorderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCompoundBorder() {
-		return compoundBorderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCompoundBorder_Outer() {
-		return (EReference)compoundBorderEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCompoundBorder_Inner() {
-		return (EReference)compoundBorderEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomBorder() {
-		return customBorderEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLayoutData() {
-		return layoutDataEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLayoutData_Owner() {
-		return (EReference)layoutDataEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomLayoutData() {
-		return customLayoutDataEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGridLayoutData() {
-		return gridLayoutDataEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayoutData_GrabExcessHorizontalSpace() {
-		return (EAttribute)gridLayoutDataEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayoutData_GrabExcessVerticalSpace() {
-		return (EAttribute)gridLayoutDataEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayoutData_VerticalAlignment() {
-		return (EAttribute)gridLayoutDataEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayoutData_HorizontalAlignment() {
-		return (EAttribute)gridLayoutDataEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayoutData_VerticalSpan() {
-		return (EAttribute)gridLayoutDataEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayoutData_HorizontalSpan() {
-		return (EAttribute)gridLayoutDataEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayoutData_HorizontalIndent() {
-		return (EAttribute)gridLayoutDataEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGridLayoutData_SizeHint() {
-		return (EReference)gridLayoutDataEClass.getEStructuralFeatures().get(7);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBorderLayoutData() {
-		return borderLayoutDataEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBorderLayoutData_Alignment() {
-		return (EAttribute)borderLayoutDataEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBorderLayoutData_Vertical() {
-		return (EAttribute)borderLayoutDataEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLayoutable() {
-		return layoutableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLayoutable_LayoutData() {
-		return (EReference)layoutableEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLayoutable_Layout() {
-		return (EReference)layoutableEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLayout() {
-		return layoutEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLayoutRef() {
-		return layoutRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLayoutRef_Actual() {
-		return (EReference)layoutRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomLayout() {
-		return customLayoutEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGridLayout() {
-		return gridLayoutEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayout_NumColumns() {
-		return (EAttribute)gridLayoutEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGridLayout_EqualWidth() {
-		return (EAttribute)gridLayoutEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGridLayout_Margins() {
-		return (EReference)gridLayoutEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getGridLayout_Spacing() {
-		return (EReference)gridLayoutEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBorderLayout() {
-		return borderLayoutEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getBorderLayout_Spacing() {
-		return (EReference)borderLayoutEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomAttribute() {
-		return customAttributeEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomAttribute_Name() {
-		return (EAttribute)customAttributeEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomAttribute_Value() {
-		return (EAttribute)customAttributeEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomAttribute_DirectAccess() {
-		return (EAttribute)customAttributeEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomAttribute_MultiStatementValue() {
-		return (EAttribute)customAttributeEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFigureAccessor() {
-		return figureAccessorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFigureAccessor_Accessor() {
-		return (EAttribute)figureAccessorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFigureAccessor_TypedFigure() {
-		return (EReference)figureAccessorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFlowLayout() {
-		return flowLayoutEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFlowLayout_Vertical() {
-		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFlowLayout_MatchMinorSize() {
-		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFlowLayout_ForceSingleLine() {
-		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFlowLayout_MajorAlignment() {
-		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFlowLayout_MinorAlignment() {
-		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFlowLayout_MajorSpacing() {
-		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFlowLayout_MinorSpacing() {
-		return (EAttribute)flowLayoutEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getXYLayout() {
-		return xyLayoutEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getXYLayoutData() {
-		return xyLayoutDataEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getXYLayoutData_TopLeft() {
-		return (EReference)xyLayoutDataEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getXYLayoutData_Size() {
-		return (EReference)xyLayoutDataEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getStackLayout() {
-		return stackLayoutEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCenterLayout() {
-		return centerLayoutEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSVGFigure() {
-		return svgFigureEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGFigure_DocumentURI() {
-		return (EAttribute)svgFigureEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSVGFigure_Properties() {
-		return (EReference)svgFigureEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getSVGFigure_AreaOfInterest() {
-		return (EReference)svgFigureEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGFigure_NoCanvasWidth() {
-		return (EAttribute)svgFigureEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGFigure_NoCanvasHeight() {
-		return (EAttribute)svgFigureEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSVGProperty() {
-		return svgPropertyEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGProperty_Query() {
-		return (EAttribute)svgPropertyEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGProperty_Attribute() {
-		return (EAttribute)svgPropertyEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGProperty_Type() {
-		return (EAttribute)svgPropertyEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGProperty_Getter() {
-		return (EAttribute)svgPropertyEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGProperty_Setter() {
-		return (EAttribute)svgPropertyEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSVGProperty_CallSuper() {
-		return (EAttribute)svgPropertyEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRectangle2D() {
-		return rectangle2DEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRectangle2D_X() {
-		return (EAttribute)rectangle2DEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRectangle2D_Y() {
-		return (EAttribute)rectangle2DEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRectangle2D_Width() {
-		return (EAttribute)rectangle2DEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRectangle2D_Height() {
-		return (EAttribute)rectangle2DEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPin() {
-		return pinEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCustomPin() {
-		return customPinEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomPin_CustomOperationName() {
-		return (EAttribute)customPinEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getCustomPin_CustomOperationType() {
-		return (EAttribute)customPinEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getColorPin() {
-		return colorPinEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getColorPin_BackgroundNotForeground() {
-		return (EAttribute)colorPinEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getVisiblePin() {
-		return visiblePinEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPinOwner() {
-		return pinOwnerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPinOwner_Pins() {
-		return (EReference)pinOwnerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getColorConstants() {
-		return colorConstantsEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getDirection() {
-		return directionEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getLineKind() {
-		return lineKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getAlignment() {
-		return alignmentEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getSVGPropertyType() {
-		return svgPropertyTypeEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphFactory getGMFGraphFactory() {
-		return (GMFGraphFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		canvasEClass = createEClass(CANVAS);
-		createEReference(canvasEClass, CANVAS__FIGURES);
-		createEReference(canvasEClass, CANVAS__NODES);
-		createEReference(canvasEClass, CANVAS__CONNECTIONS);
-		createEReference(canvasEClass, CANVAS__COMPARTMENTS);
-		createEReference(canvasEClass, CANVAS__LABELS);
-
-		figureGalleryEClass = createEClass(FIGURE_GALLERY);
-		createEReference(figureGalleryEClass, FIGURE_GALLERY__FIGURES);
-		createEReference(figureGalleryEClass, FIGURE_GALLERY__DESCRIPTORS);
-		createEReference(figureGalleryEClass, FIGURE_GALLERY__BORDERS);
-		createEReference(figureGalleryEClass, FIGURE_GALLERY__LAYOUTS);
-		createEAttribute(figureGalleryEClass, FIGURE_GALLERY__IMPLEMENTATION_BUNDLE);
-
-		identityEClass = createEClass(IDENTITY);
-		createEAttribute(identityEClass, IDENTITY__NAME);
-
-		diagramElementEClass = createEClass(DIAGRAM_ELEMENT);
-		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__FIGURE);
-		createEReference(diagramElementEClass, DIAGRAM_ELEMENT__FACETS);
-
-		abstractNodeEClass = createEClass(ABSTRACT_NODE);
-
-		nodeEClass = createEClass(NODE);
-		createEAttribute(nodeEClass, NODE__RESIZE_CONSTRAINT);
-		createEAttribute(nodeEClass, NODE__AFFIXED_PARENT_SIDE);
-		createEReference(nodeEClass, NODE__CONTENT_PANE);
-
-		connectionEClass = createEClass(CONNECTION);
-
-		compartmentEClass = createEClass(COMPARTMENT);
-		createEAttribute(compartmentEClass, COMPARTMENT__COLLAPSIBLE);
-		createEAttribute(compartmentEClass, COMPARTMENT__NEEDS_TITLE);
-		createEReference(compartmentEClass, COMPARTMENT__ACCESSOR);
-
-		diagramLabelEClass = createEClass(DIAGRAM_LABEL);
-		createEAttribute(diagramLabelEClass, DIAGRAM_LABEL__ELEMENT_ICON);
-		createEReference(diagramLabelEClass, DIAGRAM_LABEL__ACCESSOR);
-		createEReference(diagramLabelEClass, DIAGRAM_LABEL__CONTAINER);
-		createEAttribute(diagramLabelEClass, DIAGRAM_LABEL__EXTERNAL);
-
-		visualFacetEClass = createEClass(VISUAL_FACET);
-
-		generalFacetEClass = createEClass(GENERAL_FACET);
-		createEAttribute(generalFacetEClass, GENERAL_FACET__IDENTIFIER);
-		createEAttribute(generalFacetEClass, GENERAL_FACET__DATA);
-
-		alignmentFacetEClass = createEClass(ALIGNMENT_FACET);
-		createEAttribute(alignmentFacetEClass, ALIGNMENT_FACET__ALIGNMENT);
-
-		gradientFacetEClass = createEClass(GRADIENT_FACET);
-		createEAttribute(gradientFacetEClass, GRADIENT_FACET__DIRECTION);
-
-		labelOffsetFacetEClass = createEClass(LABEL_OFFSET_FACET);
-		createEAttribute(labelOffsetFacetEClass, LABEL_OFFSET_FACET__X);
-		createEAttribute(labelOffsetFacetEClass, LABEL_OFFSET_FACET__Y);
-
-		defaultSizeFacetEClass = createEClass(DEFAULT_SIZE_FACET);
-		createEReference(defaultSizeFacetEClass, DEFAULT_SIZE_FACET__DEFAULT_SIZE);
-
-		figureEClass = createEClass(FIGURE);
-		createEReference(figureEClass, FIGURE__DESCRIPTOR);
-		createEReference(figureEClass, FIGURE__FOREGROUND_COLOR);
-		createEReference(figureEClass, FIGURE__BACKGROUND_COLOR);
-		createEReference(figureEClass, FIGURE__MAXIMUM_SIZE);
-		createEReference(figureEClass, FIGURE__MINIMUM_SIZE);
-		createEReference(figureEClass, FIGURE__PREFERRED_SIZE);
-		createEReference(figureEClass, FIGURE__FONT);
-		createEReference(figureEClass, FIGURE__INSETS);
-		createEReference(figureEClass, FIGURE__BORDER);
-		createEReference(figureEClass, FIGURE__LOCATION);
-		createEReference(figureEClass, FIGURE__SIZE);
-
-		abstractFigureEClass = createEClass(ABSTRACT_FIGURE);
-
-		figureDescriptorEClass = createEClass(FIGURE_DESCRIPTOR);
-		createEReference(figureDescriptorEClass, FIGURE_DESCRIPTOR__ACTUAL_FIGURE);
-		createEReference(figureDescriptorEClass, FIGURE_DESCRIPTOR__ACCESSORS);
-
-		childAccessEClass = createEClass(CHILD_ACCESS);
-		createEReference(childAccessEClass, CHILD_ACCESS__OWNER);
-		createEAttribute(childAccessEClass, CHILD_ACCESS__ACCESSOR);
-		createEReference(childAccessEClass, CHILD_ACCESS__FIGURE);
-
-		realFigureEClass = createEClass(REAL_FIGURE);
-		createEAttribute(realFigureEClass, REAL_FIGURE__NAME);
-		createEReference(realFigureEClass, REAL_FIGURE__CHILDREN);
-
-		figureRefEClass = createEClass(FIGURE_REF);
-		createEReference(figureRefEClass, FIGURE_REF__FIGURE);
-
-		connectionFigureEClass = createEClass(CONNECTION_FIGURE);
-
-		decorationFigureEClass = createEClass(DECORATION_FIGURE);
-
-		shapeEClass = createEClass(SHAPE);
-		createEAttribute(shapeEClass, SHAPE__OUTLINE);
-		createEAttribute(shapeEClass, SHAPE__FILL);
-		createEAttribute(shapeEClass, SHAPE__LINE_WIDTH);
-		createEAttribute(shapeEClass, SHAPE__LINE_KIND);
-		createEAttribute(shapeEClass, SHAPE__XOR_FILL);
-		createEAttribute(shapeEClass, SHAPE__XOR_OUTLINE);
-		createEReference(shapeEClass, SHAPE__RESOLVED_CHILDREN);
-
-		labelEClass = createEClass(LABEL);
-		createEAttribute(labelEClass, LABEL__TEXT);
-
-		labeledContainerEClass = createEClass(LABELED_CONTAINER);
-
-		verticalLabelEClass = createEClass(VERTICAL_LABEL);
-		createEAttribute(verticalLabelEClass, VERTICAL_LABEL__TEXT);
-
-		rectangleEClass = createEClass(RECTANGLE);
-
-		invisibleRectangleEClass = createEClass(INVISIBLE_RECTANGLE);
-
-		roundedRectangleEClass = createEClass(ROUNDED_RECTANGLE);
-		createEAttribute(roundedRectangleEClass, ROUNDED_RECTANGLE__CORNER_WIDTH);
-		createEAttribute(roundedRectangleEClass, ROUNDED_RECTANGLE__CORNER_HEIGHT);
-
-		ellipseEClass = createEClass(ELLIPSE);
-
-		polylineEClass = createEClass(POLYLINE);
-		createEReference(polylineEClass, POLYLINE__TEMPLATE);
-
-		polygonEClass = createEClass(POLYGON);
-
-		scalablePolygonEClass = createEClass(SCALABLE_POLYGON);
-
-		polylineConnectionEClass = createEClass(POLYLINE_CONNECTION);
-		createEReference(polylineConnectionEClass, POLYLINE_CONNECTION__SOURCE_DECORATION);
-		createEReference(polylineConnectionEClass, POLYLINE_CONNECTION__TARGET_DECORATION);
-
-		polylineDecorationEClass = createEClass(POLYLINE_DECORATION);
-
-		polygonDecorationEClass = createEClass(POLYGON_DECORATION);
-
-		customAttributeOwnerEClass = createEClass(CUSTOM_ATTRIBUTE_OWNER);
-		createEReference(customAttributeOwnerEClass, CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES);
-
-		customClassEClass = createEClass(CUSTOM_CLASS);
-		createEAttribute(customClassEClass, CUSTOM_CLASS__QUALIFIED_CLASS_NAME);
-
-		customAttributeEClass = createEClass(CUSTOM_ATTRIBUTE);
-		createEAttribute(customAttributeEClass, CUSTOM_ATTRIBUTE__NAME);
-		createEAttribute(customAttributeEClass, CUSTOM_ATTRIBUTE__VALUE);
-		createEAttribute(customAttributeEClass, CUSTOM_ATTRIBUTE__DIRECT_ACCESS);
-		createEAttribute(customAttributeEClass, CUSTOM_ATTRIBUTE__MULTI_STATEMENT_VALUE);
-
-		figureAccessorEClass = createEClass(FIGURE_ACCESSOR);
-		createEAttribute(figureAccessorEClass, FIGURE_ACCESSOR__ACCESSOR);
-		createEReference(figureAccessorEClass, FIGURE_ACCESSOR__TYPED_FIGURE);
-
-		customFigureEClass = createEClass(CUSTOM_FIGURE);
-		createEReference(customFigureEClass, CUSTOM_FIGURE__CUSTOM_CHILDREN);
-
-		customDecorationEClass = createEClass(CUSTOM_DECORATION);
-
-		customConnectionEClass = createEClass(CUSTOM_CONNECTION);
-
-		colorEClass = createEClass(COLOR);
-
-		rgbColorEClass = createEClass(RGB_COLOR);
-		createEAttribute(rgbColorEClass, RGB_COLOR__RED);
-		createEAttribute(rgbColorEClass, RGB_COLOR__GREEN);
-		createEAttribute(rgbColorEClass, RGB_COLOR__BLUE);
-
-		constantColorEClass = createEClass(CONSTANT_COLOR);
-		createEAttribute(constantColorEClass, CONSTANT_COLOR__VALUE);
-
-		fontEClass = createEClass(FONT);
-
-		basicFontEClass = createEClass(BASIC_FONT);
-		createEAttribute(basicFontEClass, BASIC_FONT__FACE_NAME);
-		createEAttribute(basicFontEClass, BASIC_FONT__HEIGHT);
-		createEAttribute(basicFontEClass, BASIC_FONT__STYLE);
-
-		pointEClass = createEClass(POINT);
-		createEAttribute(pointEClass, POINT__X);
-		createEAttribute(pointEClass, POINT__Y);
-
-		dimensionEClass = createEClass(DIMENSION);
-		createEAttribute(dimensionEClass, DIMENSION__DX);
-		createEAttribute(dimensionEClass, DIMENSION__DY);
-
-		insetsEClass = createEClass(INSETS);
-		createEAttribute(insetsEClass, INSETS__TOP);
-		createEAttribute(insetsEClass, INSETS__LEFT);
-		createEAttribute(insetsEClass, INSETS__BOTTOM);
-		createEAttribute(insetsEClass, INSETS__RIGHT);
-
-		borderEClass = createEClass(BORDER);
-
-		borderRefEClass = createEClass(BORDER_REF);
-		createEReference(borderRefEClass, BORDER_REF__ACTUAL);
-
-		lineBorderEClass = createEClass(LINE_BORDER);
-		createEReference(lineBorderEClass, LINE_BORDER__COLOR);
-		createEAttribute(lineBorderEClass, LINE_BORDER__WIDTH);
-
-		marginBorderEClass = createEClass(MARGIN_BORDER);
-		createEReference(marginBorderEClass, MARGIN_BORDER__INSETS);
-
-		compoundBorderEClass = createEClass(COMPOUND_BORDER);
-		createEReference(compoundBorderEClass, COMPOUND_BORDER__OUTER);
-		createEReference(compoundBorderEClass, COMPOUND_BORDER__INNER);
-
-		customBorderEClass = createEClass(CUSTOM_BORDER);
-
-		layoutDataEClass = createEClass(LAYOUT_DATA);
-		createEReference(layoutDataEClass, LAYOUT_DATA__OWNER);
-
-		customLayoutDataEClass = createEClass(CUSTOM_LAYOUT_DATA);
-
-		gridLayoutDataEClass = createEClass(GRID_LAYOUT_DATA);
-		createEAttribute(gridLayoutDataEClass, GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE);
-		createEAttribute(gridLayoutDataEClass, GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE);
-		createEAttribute(gridLayoutDataEClass, GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT);
-		createEAttribute(gridLayoutDataEClass, GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT);
-		createEAttribute(gridLayoutDataEClass, GRID_LAYOUT_DATA__VERTICAL_SPAN);
-		createEAttribute(gridLayoutDataEClass, GRID_LAYOUT_DATA__HORIZONTAL_SPAN);
-		createEAttribute(gridLayoutDataEClass, GRID_LAYOUT_DATA__HORIZONTAL_INDENT);
-		createEReference(gridLayoutDataEClass, GRID_LAYOUT_DATA__SIZE_HINT);
-
-		borderLayoutDataEClass = createEClass(BORDER_LAYOUT_DATA);
-		createEAttribute(borderLayoutDataEClass, BORDER_LAYOUT_DATA__ALIGNMENT);
-		createEAttribute(borderLayoutDataEClass, BORDER_LAYOUT_DATA__VERTICAL);
-
-		layoutableEClass = createEClass(LAYOUTABLE);
-		createEReference(layoutableEClass, LAYOUTABLE__LAYOUT_DATA);
-		createEReference(layoutableEClass, LAYOUTABLE__LAYOUT);
-
-		layoutEClass = createEClass(LAYOUT);
-
-		layoutRefEClass = createEClass(LAYOUT_REF);
-		createEReference(layoutRefEClass, LAYOUT_REF__ACTUAL);
-
-		customLayoutEClass = createEClass(CUSTOM_LAYOUT);
-
-		gridLayoutEClass = createEClass(GRID_LAYOUT);
-		createEAttribute(gridLayoutEClass, GRID_LAYOUT__NUM_COLUMNS);
-		createEAttribute(gridLayoutEClass, GRID_LAYOUT__EQUAL_WIDTH);
-		createEReference(gridLayoutEClass, GRID_LAYOUT__MARGINS);
-		createEReference(gridLayoutEClass, GRID_LAYOUT__SPACING);
-
-		borderLayoutEClass = createEClass(BORDER_LAYOUT);
-		createEReference(borderLayoutEClass, BORDER_LAYOUT__SPACING);
-
-		flowLayoutEClass = createEClass(FLOW_LAYOUT);
-		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__VERTICAL);
-		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MATCH_MINOR_SIZE);
-		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__FORCE_SINGLE_LINE);
-		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MAJOR_ALIGNMENT);
-		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MINOR_ALIGNMENT);
-		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MAJOR_SPACING);
-		createEAttribute(flowLayoutEClass, FLOW_LAYOUT__MINOR_SPACING);
-
-		xyLayoutEClass = createEClass(XY_LAYOUT);
-
-		xyLayoutDataEClass = createEClass(XY_LAYOUT_DATA);
-		createEReference(xyLayoutDataEClass, XY_LAYOUT_DATA__TOP_LEFT);
-		createEReference(xyLayoutDataEClass, XY_LAYOUT_DATA__SIZE);
-
-		stackLayoutEClass = createEClass(STACK_LAYOUT);
-
-		centerLayoutEClass = createEClass(CENTER_LAYOUT);
-
-		svgFigureEClass = createEClass(SVG_FIGURE);
-		createEAttribute(svgFigureEClass, SVG_FIGURE__DOCUMENT_URI);
-		createEReference(svgFigureEClass, SVG_FIGURE__PROPERTIES);
-		createEReference(svgFigureEClass, SVG_FIGURE__AREA_OF_INTEREST);
-		createEAttribute(svgFigureEClass, SVG_FIGURE__NO_CANVAS_WIDTH);
-		createEAttribute(svgFigureEClass, SVG_FIGURE__NO_CANVAS_HEIGHT);
-
-		svgPropertyEClass = createEClass(SVG_PROPERTY);
-		createEAttribute(svgPropertyEClass, SVG_PROPERTY__QUERY);
-		createEAttribute(svgPropertyEClass, SVG_PROPERTY__ATTRIBUTE);
-		createEAttribute(svgPropertyEClass, SVG_PROPERTY__TYPE);
-		createEAttribute(svgPropertyEClass, SVG_PROPERTY__GETTER);
-		createEAttribute(svgPropertyEClass, SVG_PROPERTY__SETTER);
-		createEAttribute(svgPropertyEClass, SVG_PROPERTY__CALL_SUPER);
-
-		rectangle2DEClass = createEClass(RECTANGLE2_D);
-		createEAttribute(rectangle2DEClass, RECTANGLE2_D__X);
-		createEAttribute(rectangle2DEClass, RECTANGLE2_D__Y);
-		createEAttribute(rectangle2DEClass, RECTANGLE2_D__WIDTH);
-		createEAttribute(rectangle2DEClass, RECTANGLE2_D__HEIGHT);
-
-		pinEClass = createEClass(PIN);
-
-		customPinEClass = createEClass(CUSTOM_PIN);
-		createEAttribute(customPinEClass, CUSTOM_PIN__CUSTOM_OPERATION_NAME);
-		createEAttribute(customPinEClass, CUSTOM_PIN__CUSTOM_OPERATION_TYPE);
-
-		colorPinEClass = createEClass(COLOR_PIN);
-		createEAttribute(colorPinEClass, COLOR_PIN__BACKGROUND_NOT_FOREGROUND);
-
-		visiblePinEClass = createEClass(VISIBLE_PIN);
-
-		pinOwnerEClass = createEClass(PIN_OWNER);
-		createEReference(pinOwnerEClass, PIN_OWNER__PINS);
-
-		// Create enums
-		colorConstantsEEnum = createEEnum(COLOR_CONSTANTS);
-		fontStyleEEnum = createEEnum(FONT_STYLE);
-		directionEEnum = createEEnum(DIRECTION);
-		lineKindEEnum = createEEnum(LINE_KIND);
-		alignmentEEnum = createEEnum(ALIGNMENT);
-		svgPropertyTypeEEnum = createEEnum(SVG_PROPERTY_TYPE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		canvasEClass.getESuperTypes().add(this.getIdentity());
-		figureGalleryEClass.getESuperTypes().add(this.getIdentity());
-		diagramElementEClass.getESuperTypes().add(this.getIdentity());
-		abstractNodeEClass.getESuperTypes().add(this.getDiagramElement());
-		nodeEClass.getESuperTypes().add(this.getAbstractNode());
-		connectionEClass.getESuperTypes().add(this.getDiagramElement());
-		compartmentEClass.getESuperTypes().add(this.getDiagramElement());
-		diagramLabelEClass.getESuperTypes().add(this.getNode());
-		generalFacetEClass.getESuperTypes().add(this.getVisualFacet());
-		alignmentFacetEClass.getESuperTypes().add(this.getVisualFacet());
-		gradientFacetEClass.getESuperTypes().add(this.getVisualFacet());
-		labelOffsetFacetEClass.getESuperTypes().add(this.getVisualFacet());
-		defaultSizeFacetEClass.getESuperTypes().add(this.getVisualFacet());
-		figureEClass.getESuperTypes().add(this.getLayoutable());
-		abstractFigureEClass.getESuperTypes().add(this.getFigure());
-		figureDescriptorEClass.getESuperTypes().add(this.getIdentity());
-		realFigureEClass.getESuperTypes().add(this.getAbstractFigure());
-		realFigureEClass.getESuperTypes().add(this.getPinOwner());
-		realFigureEClass.getESuperTypes().add(this.getCustomAttributeOwner());
-		figureRefEClass.getESuperTypes().add(this.getAbstractFigure());
-		connectionFigureEClass.getESuperTypes().add(this.getRealFigure());
-		decorationFigureEClass.getESuperTypes().add(this.getRealFigure());
-		shapeEClass.getESuperTypes().add(this.getRealFigure());
-		labelEClass.getESuperTypes().add(this.getRealFigure());
-		labeledContainerEClass.getESuperTypes().add(this.getRealFigure());
-		verticalLabelEClass.getESuperTypes().add(this.getRealFigure());
-		rectangleEClass.getESuperTypes().add(this.getShape());
-		invisibleRectangleEClass.getESuperTypes().add(this.getRealFigure());
-		roundedRectangleEClass.getESuperTypes().add(this.getShape());
-		ellipseEClass.getESuperTypes().add(this.getShape());
-		polylineEClass.getESuperTypes().add(this.getShape());
-		polygonEClass.getESuperTypes().add(this.getPolyline());
-		scalablePolygonEClass.getESuperTypes().add(this.getPolygon());
-		polylineConnectionEClass.getESuperTypes().add(this.getPolyline());
-		polylineConnectionEClass.getESuperTypes().add(this.getConnectionFigure());
-		polylineDecorationEClass.getESuperTypes().add(this.getPolyline());
-		polylineDecorationEClass.getESuperTypes().add(this.getDecorationFigure());
-		polygonDecorationEClass.getESuperTypes().add(this.getPolygon());
-		polygonDecorationEClass.getESuperTypes().add(this.getDecorationFigure());
-		customClassEClass.getESuperTypes().add(this.getCustomAttributeOwner());
-		customFigureEClass.getESuperTypes().add(this.getRealFigure());
-		customFigureEClass.getESuperTypes().add(this.getCustomClass());
-		customDecorationEClass.getESuperTypes().add(this.getCustomFigure());
-		customDecorationEClass.getESuperTypes().add(this.getDecorationFigure());
-		customConnectionEClass.getESuperTypes().add(this.getCustomFigure());
-		customConnectionEClass.getESuperTypes().add(this.getConnectionFigure());
-		rgbColorEClass.getESuperTypes().add(this.getColor());
-		constantColorEClass.getESuperTypes().add(this.getColor());
-		basicFontEClass.getESuperTypes().add(this.getFont());
-		borderRefEClass.getESuperTypes().add(this.getBorder());
-		lineBorderEClass.getESuperTypes().add(this.getBorder());
-		marginBorderEClass.getESuperTypes().add(this.getBorder());
-		compoundBorderEClass.getESuperTypes().add(this.getBorder());
-		customBorderEClass.getESuperTypes().add(this.getBorder());
-		customBorderEClass.getESuperTypes().add(this.getCustomClass());
-		customLayoutDataEClass.getESuperTypes().add(this.getLayoutData());
-		customLayoutDataEClass.getESuperTypes().add(this.getCustomClass());
-		gridLayoutDataEClass.getESuperTypes().add(this.getLayoutData());
-		borderLayoutDataEClass.getESuperTypes().add(this.getLayoutData());
-		layoutRefEClass.getESuperTypes().add(this.getLayout());
-		customLayoutEClass.getESuperTypes().add(this.getLayout());
-		customLayoutEClass.getESuperTypes().add(this.getCustomClass());
-		gridLayoutEClass.getESuperTypes().add(this.getLayout());
-		borderLayoutEClass.getESuperTypes().add(this.getLayout());
-		flowLayoutEClass.getESuperTypes().add(this.getLayout());
-		xyLayoutEClass.getESuperTypes().add(this.getLayout());
-		xyLayoutDataEClass.getESuperTypes().add(this.getLayoutData());
-		stackLayoutEClass.getESuperTypes().add(this.getLayout());
-		centerLayoutEClass.getESuperTypes().add(this.getLayout());
-		svgFigureEClass.getESuperTypes().add(this.getRealFigure());
-		pinEClass.getESuperTypes().add(this.getIdentity());
-		customPinEClass.getESuperTypes().add(this.getPin());
-		colorPinEClass.getESuperTypes().add(this.getPin());
-		visiblePinEClass.getESuperTypes().add(this.getPin());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(canvasEClass, Canvas.class, "Canvas", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCanvas_Figures(), this.getFigureGallery(), null, "figures", null, 0, -1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvas_Nodes(), this.getNode(), null, "nodes", null, 0, -1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvas_Connections(), this.getConnection(), null, "connections", null, 0, -1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvas_Compartments(), this.getCompartment(), null, "compartments", null, 0, -1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvas_Labels(), this.getDiagramLabel(), null, "labels", null, 0, -1, Canvas.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(figureGalleryEClass, FigureGallery.class, "FigureGallery", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFigureGallery_Figures(), this.getRealFigure(), null, "figures", null, 0, -1, FigureGallery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigureGallery_Descriptors(), this.getFigureDescriptor(), null, "descriptors", null, 0, -1, FigureGallery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigureGallery_Borders(), this.getBorder(), null, "borders", null, 0, -1, FigureGallery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigureGallery_Layouts(), this.getLayout(), null, "layouts", null, 0, -1, FigureGallery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFigureGallery_ImplementationBundle(), ecorePackage.getEString(), "implementationBundle", null, 0, 1, FigureGallery.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(identityEClass, Identity.class, "Identity", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getIdentity_Name(), ecorePackage.getEString(), "name", null, 1, 1, Identity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(diagramElementEClass, DiagramElement.class, "DiagramElement", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDiagramElement_Figure(), this.getFigureDescriptor(), null, "figure", null, 1, 1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDiagramElement_Facets(), this.getVisualFacet(), null, "facets", null, 0, -1, DiagramElement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractNodeEClass, AbstractNode.class, "AbstractNode", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(nodeEClass, Node.class, "Node", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNode_ResizeConstraint(), this.getDirection(), "resizeConstraint", "NSEW", 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getNode_AffixedParentSide(), this.getDirection(), "affixedParentSide", "NONE", 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getNode_ContentPane(), this.getChildAccess(), null, "contentPane", null, 0, 1, Node.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(connectionEClass, Connection.class, "Connection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(compartmentEClass, Compartment.class, "Compartment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCompartment_Collapsible(), ecorePackage.getEBoolean(), "collapsible", null, 0, 1, Compartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCompartment_NeedsTitle(), ecorePackage.getEBoolean(), "needsTitle", null, 0, 1, Compartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCompartment_Accessor(), this.getChildAccess(), null, "accessor", null, 0, 1, Compartment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(diagramLabelEClass, DiagramLabel.class, "DiagramLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDiagramLabel_ElementIcon(), ecorePackage.getEBoolean(), "elementIcon", "true", 0, 1, DiagramLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDiagramLabel_Accessor(), this.getChildAccess(), null, "accessor", null, 0, 1, DiagramLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getDiagramLabel_Container(), this.getChildAccess(), null, "container", null, 0, 1, DiagramLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDiagramLabel_External(), ecorePackage.getEBoolean(), "external", null, 0, 1, DiagramLabel.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(visualFacetEClass, VisualFacet.class, "VisualFacet", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(generalFacetEClass, GeneralFacet.class, "GeneralFacet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGeneralFacet_Identifier(), ecorePackage.getEString(), "identifier", null, 0, 1, GeneralFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGeneralFacet_Data(), ecorePackage.getEString(), "data", null, 0, 1, GeneralFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(alignmentFacetEClass, AlignmentFacet.class, "AlignmentFacet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAlignmentFacet_Alignment(), this.getAlignment(), "alignment", null, 0, 1, AlignmentFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(gradientFacetEClass, GradientFacet.class, "GradientFacet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGradientFacet_Direction(), this.getDirection(), "direction", null, 0, 1, GradientFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(labelOffsetFacetEClass, LabelOffsetFacet.class, "LabelOffsetFacet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLabelOffsetFacet_X(), ecorePackage.getEInt(), "x", null, 0, 1, LabelOffsetFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLabelOffsetFacet_Y(), ecorePackage.getEInt(), "y", null, 0, 1, LabelOffsetFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(defaultSizeFacetEClass, DefaultSizeFacet.class, "DefaultSizeFacet", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDefaultSizeFacet_DefaultSize(), this.getDimension(), null, "defaultSize", null, 0, 1, DefaultSizeFacet.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(figureEClass, Figure.class, "Figure", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFigure_Descriptor(), this.getFigureDescriptor(), null, "descriptor", null, 0, 1, Figure.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_ForegroundColor(), this.getColor(), null, "foregroundColor", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_BackgroundColor(), this.getColor(), null, "backgroundColor", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_MaximumSize(), this.getDimension(), null, "maximumSize", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_MinimumSize(), this.getDimension(), null, "minimumSize", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_PreferredSize(), this.getDimension(), null, "preferredSize", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_Font(), this.getFont(), null, "font", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_Insets(), this.getInsets(), null, "insets", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_Border(), this.getBorder(), null, "border", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_Location(), this.getPoint(), null, "location", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigure_Size(), this.getPoint(), null, "size", null, 0, 1, Figure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractFigureEClass, AbstractFigure.class, "AbstractFigure", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(figureDescriptorEClass, FigureDescriptor.class, "FigureDescriptor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFigureDescriptor_ActualFigure(), this.getFigure(), null, "actualFigure", null, 1, 1, FigureDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigureDescriptor_Accessors(), this.getChildAccess(), this.getChildAccess_Owner(), "accessors", null, 0, -1, FigureDescriptor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(childAccessEClass, ChildAccess.class, "ChildAccess", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getChildAccess_Owner(), this.getFigureDescriptor(), this.getFigureDescriptor_Accessors(), "owner", null, 1, 1, ChildAccess.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getChildAccess_Accessor(), ecorePackage.getEString(), "accessor", null, 0, 1, ChildAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChildAccess_Figure(), this.getFigure(), null, "figure", null, 1, 1, ChildAccess.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(realFigureEClass, RealFigure.class, "RealFigure", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRealFigure_Name(), ecorePackage.getEString(), "name", null, 0, 1, RealFigure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getRealFigure_Children(), this.getFigure(), null, "children", null, 0, -1, RealFigure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(figureRefEClass, FigureRef.class, "FigureRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFigureRef_Figure(), this.getRealFigure(), null, "figure", null, 1, 1, FigureRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(connectionFigureEClass, ConnectionFigure.class, "ConnectionFigure", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(decorationFigureEClass, DecorationFigure.class, "DecorationFigure", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(shapeEClass, Shape.class, "Shape", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getShape_Outline(), ecorePackage.getEBoolean(), "outline", "true", 0, 1, Shape.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getShape_Fill(), ecorePackage.getEBoolean(), "fill", "true", 0, 1, Shape.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getShape_LineWidth(), ecorePackage.getEInt(), "lineWidth", "1", 0, 1, Shape.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getShape_LineKind(), this.getLineKind(), "lineKind", null, 0, 1, Shape.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getShape_XorFill(), ecorePackage.getEBoolean(), "xorFill", null, 0, 1, Shape.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getShape_XorOutline(), ecorePackage.getEBoolean(), "xorOutline", null, 0, 1, Shape.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getShape_ResolvedChildren(), this.getFigure(), null, "resolvedChildren", null, 0, -1, Shape.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(labelEClass, Label.class, "Label", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getLabel_Text(), ecorePackage.getEString(), "text", null, 0, 1, Label.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(labeledContainerEClass, LabeledContainer.class, "LabeledContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(verticalLabelEClass, VerticalLabel.class, "VerticalLabel", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getVerticalLabel_Text(), ecorePackage.getEString(), "text", null, 0, 1, VerticalLabel.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(rectangleEClass, Rectangle.class, "Rectangle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(invisibleRectangleEClass, InvisibleRectangle.class, "InvisibleRectangle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(roundedRectangleEClass, RoundedRectangle.class, "RoundedRectangle", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRoundedRectangle_CornerWidth(), ecorePackage.getEInt(), "cornerWidth", "8", 0, 1, RoundedRectangle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRoundedRectangle_CornerHeight(), ecorePackage.getEInt(), "cornerHeight", "8", 0, 1, RoundedRectangle.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ellipseEClass, Ellipse.class, "Ellipse", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(polylineEClass, Polyline.class, "Polyline", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPolyline_Template(), this.getPoint(), null, "template", null, 0, -1, Polyline.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(polygonEClass, Polygon.class, "Polygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(scalablePolygonEClass, ScalablePolygon.class, "ScalablePolygon", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(polylineConnectionEClass, PolylineConnection.class, "PolylineConnection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPolylineConnection_SourceDecoration(), this.getDecorationFigure(), null, "sourceDecoration", null, 0, 1, PolylineConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getPolylineConnection_TargetDecoration(), this.getDecorationFigure(), null, "targetDecoration", null, 0, 1, PolylineConnection.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(polylineDecorationEClass, PolylineDecoration.class, "PolylineDecoration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(polygonDecorationEClass, PolygonDecoration.class, "PolygonDecoration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(customAttributeOwnerEClass, CustomAttributeOwner.class, "CustomAttributeOwner", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCustomAttributeOwner_Attributes(), this.getCustomAttribute(), null, "attributes", null, 0, -1, CustomAttributeOwner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(customClassEClass, CustomClass.class, "CustomClass", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCustomClass_QualifiedClassName(), ecorePackage.getEString(), "qualifiedClassName", null, 0, 1, CustomClass.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(customAttributeEClass, CustomAttribute.class, "CustomAttribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCustomAttribute_Name(), ecorePackage.getEString(), "name", null, 1, 1, CustomAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCustomAttribute_Value(), ecorePackage.getEString(), "value", "null", 1, 1, CustomAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCustomAttribute_DirectAccess(), ecorePackage.getEBoolean(), "directAccess", "false", 1, 1, CustomAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCustomAttribute_MultiStatementValue(), ecorePackage.getEBoolean(), "multiStatementValue", "false", 1, 1, CustomAttribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(figureAccessorEClass, FigureAccessor.class, "FigureAccessor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFigureAccessor_Accessor(), ecorePackage.getEString(), "accessor", null, 1, 1, FigureAccessor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFigureAccessor_TypedFigure(), this.getRealFigure(), null, "typedFigure", null, 1, 1, FigureAccessor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(customFigureEClass, CustomFigure.class, "CustomFigure", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCustomFigure_CustomChildren(), this.getFigureAccessor(), null, "customChildren", null, 0, -1, CustomFigure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(customDecorationEClass, CustomDecoration.class, "CustomDecoration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(customConnectionEClass, CustomConnection.class, "CustomConnection", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(colorEClass, Color.class, "Color", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(rgbColorEClass, RGBColor.class, "RGBColor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRGBColor_Red(), ecorePackage.getEInt(), "red", null, 1, 1, RGBColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRGBColor_Green(), ecorePackage.getEInt(), "green", null, 1, 1, RGBColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRGBColor_Blue(), ecorePackage.getEInt(), "blue", null, 1, 1, RGBColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(constantColorEClass, ConstantColor.class, "ConstantColor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getConstantColor_Value(), this.getColorConstants(), "value", null, 1, 1, ConstantColor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(fontEClass, Font.class, "Font", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(basicFontEClass, BasicFont.class, "BasicFont", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBasicFont_FaceName(), ecorePackage.getEString(), "faceName", null, 0, 1, BasicFont.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBasicFont_Height(), ecorePackage.getEInt(), "height", "9", 0, 1, BasicFont.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBasicFont_Style(), this.getFontStyle(), "style", "NORMAL", 0, 1, BasicFont.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(pointEClass, Point.class, "Point", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPoint_X(), ecorePackage.getEInt(), "x", null, 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getPoint_Y(), ecorePackage.getEInt(), "y", null, 0, 1, Point.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(dimensionEClass, Dimension.class, "Dimension", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDimension_Dx(), ecorePackage.getEInt(), "dx", null, 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDimension_Dy(), ecorePackage.getEInt(), "dy", null, 0, 1, Dimension.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(insetsEClass, Insets.class, "Insets", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getInsets_Top(), ecorePackage.getEInt(), "top", null, 0, 1, Insets.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInsets_Left(), ecorePackage.getEInt(), "left", null, 0, 1, Insets.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInsets_Bottom(), ecorePackage.getEInt(), "bottom", null, 0, 1, Insets.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getInsets_Right(), ecorePackage.getEInt(), "right", null, 0, 1, Insets.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(borderEClass, Border.class, "Border", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(borderRefEClass, BorderRef.class, "BorderRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBorderRef_Actual(), this.getBorder(), null, "actual", null, 1, 1, BorderRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(lineBorderEClass, LineBorder.class, "LineBorder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLineBorder_Color(), this.getColor(), null, "color", null, 0, 1, LineBorder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLineBorder_Width(), ecorePackage.getEInt(), "width", "1", 0, 1, LineBorder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(marginBorderEClass, MarginBorder.class, "MarginBorder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMarginBorder_Insets(), this.getInsets(), null, "insets", null, 0, 1, MarginBorder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(compoundBorderEClass, CompoundBorder.class, "CompoundBorder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCompoundBorder_Outer(), this.getBorder(), null, "outer", null, 0, 1, CompoundBorder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCompoundBorder_Inner(), this.getBorder(), null, "inner", null, 0, 1, CompoundBorder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(customBorderEClass, CustomBorder.class, "CustomBorder", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(layoutDataEClass, LayoutData.class, "LayoutData", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLayoutData_Owner(), this.getLayoutable(), this.getLayoutable_LayoutData(), "owner", null, 1, 1, LayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(customLayoutDataEClass, CustomLayoutData.class, "CustomLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(gridLayoutDataEClass, GridLayoutData.class, "GridLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGridLayoutData_GrabExcessHorizontalSpace(), ecorePackage.getEBoolean(), "grabExcessHorizontalSpace", "false", 1, 1, GridLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGridLayoutData_GrabExcessVerticalSpace(), ecorePackage.getEBoolean(), "grabExcessVerticalSpace", "false", 1, 1, GridLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGridLayoutData_VerticalAlignment(), this.getAlignment(), "verticalAlignment", "CENTER", 1, 1, GridLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGridLayoutData_HorizontalAlignment(), this.getAlignment(), "horizontalAlignment", "CENTER", 1, 1, GridLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGridLayoutData_VerticalSpan(), ecorePackage.getEInt(), "verticalSpan", "1", 1, 1, GridLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGridLayoutData_HorizontalSpan(), ecorePackage.getEInt(), "horizontalSpan", "1", 1, 1, GridLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGridLayoutData_HorizontalIndent(), ecorePackage.getEInt(), "horizontalIndent", null, 1, 1, GridLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getGridLayoutData_SizeHint(), this.getDimension(), null, "sizeHint", null, 0, 1, GridLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(borderLayoutDataEClass, BorderLayoutData.class, "BorderLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBorderLayoutData_Alignment(), this.getAlignment(), "alignment", "CENTER", 1, 1, BorderLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBorderLayoutData_Vertical(), ecorePackage.getEBoolean(), "vertical", "false", 0, 1, BorderLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(layoutableEClass, Layoutable.class, "Layoutable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLayoutable_LayoutData(), this.getLayoutData(), this.getLayoutData_Owner(), "layoutData", null, 0, 1, Layoutable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLayoutable_Layout(), this.getLayout(), null, "layout", null, 0, 1, Layoutable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(layoutEClass, Layout.class, "Layout", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(layoutRefEClass, LayoutRef.class, "LayoutRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLayoutRef_Actual(), this.getLayout(), null, "actual", null, 1, 1, LayoutRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(customLayoutEClass, CustomLayout.class, "CustomLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(gridLayoutEClass, GridLayout.class, "GridLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGridLayout_NumColumns(), ecorePackage.getEInt(), "numColumns", "1", 1, 1, GridLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getGridLayout_EqualWidth(), ecorePackage.getEBoolean(), "equalWidth", "true", 1, 1, GridLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getGridLayout_Margins(), this.getDimension(), null, "margins", null, 0, 1, GridLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getGridLayout_Spacing(), this.getDimension(), null, "spacing", null, 0, 1, GridLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(borderLayoutEClass, BorderLayout.class, "BorderLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getBorderLayout_Spacing(), this.getDimension(), null, "spacing", null, 0, 1, BorderLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(flowLayoutEClass, FlowLayout.class, "FlowLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFlowLayout_Vertical(), ecorePackage.getEBoolean(), "vertical", "false", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFlowLayout_MatchMinorSize(), ecorePackage.getEBoolean(), "matchMinorSize", "false", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFlowLayout_ForceSingleLine(), ecorePackage.getEBoolean(), "forceSingleLine", "false", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFlowLayout_MajorAlignment(), this.getAlignment(), "majorAlignment", "BEGINNING", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFlowLayout_MinorAlignment(), this.getAlignment(), "minorAlignment", "BEGINNING", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFlowLayout_MajorSpacing(), ecorePackage.getEInt(), "majorSpacing", "5", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFlowLayout_MinorSpacing(), ecorePackage.getEInt(), "minorSpacing", "5", 0, 1, FlowLayout.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(xyLayoutEClass, XYLayout.class, "XYLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(xyLayoutDataEClass, XYLayoutData.class, "XYLayoutData", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getXYLayoutData_TopLeft(), this.getPoint(), null, "topLeft", null, 1, 1, XYLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getXYLayoutData_Size(), this.getDimension(), null, "size", null, 1, 1, XYLayoutData.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(stackLayoutEClass, StackLayout.class, "StackLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(centerLayoutEClass, CenterLayout.class, "CenterLayout", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(svgFigureEClass, SVGFigure.class, "SVGFigure", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSVGFigure_DocumentURI(), ecorePackage.getEString(), "documentURI", null, 0, 1, SVGFigure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSVGFigure_Properties(), this.getSVGProperty(), null, "properties", null, 0, -1, SVGFigure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getSVGFigure_AreaOfInterest(), this.getRectangle2D(), null, "areaOfInterest", null, 0, 1, SVGFigure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSVGFigure_NoCanvasWidth(), ecorePackage.getEBoolean(), "noCanvasWidth", null, 0, 1, SVGFigure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSVGFigure_NoCanvasHeight(), ecorePackage.getEBoolean(), "noCanvasHeight", null, 0, 1, SVGFigure.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(svgPropertyEClass, SVGProperty.class, "SVGProperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSVGProperty_Query(), ecorePackage.getEString(), "query", null, 0, 1, SVGProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSVGProperty_Attribute(), ecorePackage.getEString(), "attribute", null, 0, 1, SVGProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSVGProperty_Type(), this.getSVGPropertyType(), "type", null, 0, 1, SVGProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSVGProperty_Getter(), ecorePackage.getEString(), "getter", null, 0, 1, SVGProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSVGProperty_Setter(), ecorePackage.getEString(), "setter", null, 0, 1, SVGProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getSVGProperty_CallSuper(), ecorePackage.getEBoolean(), "callSuper", null, 0, 1, SVGProperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(rectangle2DEClass, Rectangle2D.class, "Rectangle2D", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRectangle2D_X(), ecorePackage.getEFloat(), "x", null, 0, 1, Rectangle2D.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRectangle2D_Y(), ecorePackage.getEFloat(), "y", null, 0, 1, Rectangle2D.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRectangle2D_Width(), ecorePackage.getEFloat(), "width", null, 0, 1, Rectangle2D.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRectangle2D_Height(), ecorePackage.getEFloat(), "height", null, 0, 1, Rectangle2D.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(pinEClass, Pin.class, "Pin", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		addEOperation(pinEClass, ecorePackage.getEString(), "getOperationName", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		addEOperation(pinEClass, ecorePackage.getEString(), "getOperationType", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(customPinEClass, CustomPin.class, "CustomPin", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getCustomPin_CustomOperationName(), ecorePackage.getEString(), "customOperationName", null, 0, 1, CustomPin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getCustomPin_CustomOperationType(), ecorePackage.getEString(), "customOperationType", null, 0, 1, CustomPin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(colorPinEClass, ColorPin.class, "ColorPin", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getColorPin_BackgroundNotForeground(), ecorePackage.getEBoolean(), "backgroundNotForeground", null, 0, 1, ColorPin.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(visiblePinEClass, VisiblePin.class, "VisiblePin", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(pinOwnerEClass, PinOwner.class, "PinOwner", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPinOwner_Pins(), this.getPin(), null, "pins", null, 0, -1, PinOwner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(colorConstantsEEnum, ColorConstants.class, "ColorConstants");
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.WHITE_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.BLACK_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.LIGHT_GRAY_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.GRAY_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.DARK_GRAY_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.RED_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.ORANGE_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.YELLOW_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.GREEN_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.LIGHT_GREEN_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.DARK_GREEN_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.CYAN_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.LIGHT_BLUE_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.BLUE_LITERAL);
-		addEEnumLiteral(colorConstantsEEnum, ColorConstants.DARK_BLUE_LITERAL);
-
-		initEEnum(fontStyleEEnum, FontStyle.class, "FontStyle");
-		addEEnumLiteral(fontStyleEEnum, FontStyle.NORMAL_LITERAL);
-		addEEnumLiteral(fontStyleEEnum, FontStyle.BOLD_LITERAL);
-		addEEnumLiteral(fontStyleEEnum, FontStyle.ITALIC_LITERAL);
-
-		initEEnum(directionEEnum, Direction.class, "Direction");
-		addEEnumLiteral(directionEEnum, Direction.NONE_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.NORTH_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.SOUTH_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.WEST_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.EAST_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.NORTH_EAST_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.NORTH_WEST_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.SOUTH_EAST_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.SOUTH_WEST_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.NORTH_SOUTH_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.EAST_WEST_LITERAL);
-		addEEnumLiteral(directionEEnum, Direction.NSEW_LITERAL);
-
-		initEEnum(lineKindEEnum, LineKind.class, "LineKind");
-		addEEnumLiteral(lineKindEEnum, LineKind.LINE_SOLID_LITERAL);
-		addEEnumLiteral(lineKindEEnum, LineKind.LINE_DASH_LITERAL);
-		addEEnumLiteral(lineKindEEnum, LineKind.LINE_DOT_LITERAL);
-		addEEnumLiteral(lineKindEEnum, LineKind.LINE_DASHDOT_LITERAL);
-		addEEnumLiteral(lineKindEEnum, LineKind.LINE_DASHDOTDOT_LITERAL);
-		addEEnumLiteral(lineKindEEnum, LineKind.LINE_CUSTOM_LITERAL);
-
-		initEEnum(alignmentEEnum, Alignment.class, "Alignment");
-		addEEnumLiteral(alignmentEEnum, Alignment.BEGINNING_LITERAL);
-		addEEnumLiteral(alignmentEEnum, Alignment.CENTER_LITERAL);
-		addEEnumLiteral(alignmentEEnum, Alignment.END_LITERAL);
-		addEEnumLiteral(alignmentEEnum, Alignment.FILL_LITERAL);
-
-		initEEnum(svgPropertyTypeEEnum, SVGPropertyType.class, "SVGPropertyType");
-		addEEnumLiteral(svgPropertyTypeEEnum, SVGPropertyType.STRING);
-		addEEnumLiteral(svgPropertyTypeEEnum, SVGPropertyType.COLOR);
-		addEEnumLiteral(svgPropertyTypeEEnum, SVGPropertyType.FLOAT);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //GMFGraphPackageImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GeneralFacetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GeneralFacetImpl.java
deleted file mode 100644
index dcd9ebe5b7a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GeneralFacetImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>General Facet</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GeneralFacetImpl#getIdentifier <em>Identifier</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GeneralFacetImpl#getData <em>Data</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GeneralFacetImpl extends EObjectImpl implements GeneralFacet {
-	/**
-	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IDENTIFIER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected String identifier = IDENTIFIER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getData() <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getData()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DATA_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getData() <em>Data</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getData()
-	 * @generated
-	 * @ordered
-	 */
-	protected String data = DATA_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GeneralFacetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getGeneralFacet();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getIdentifier() {
-		return identifier;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIdentifier(String newIdentifier) {
-		String oldIdentifier = identifier;
-		identifier = newIdentifier;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GENERAL_FACET__IDENTIFIER, oldIdentifier, identifier));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getData() {
-		return data;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setData(String newData) {
-		String oldData = data;
-		data = newData;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GENERAL_FACET__DATA, oldData, data));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.GENERAL_FACET__IDENTIFIER:
-				return getIdentifier();
-			case GMFGraphPackage.GENERAL_FACET__DATA:
-				return getData();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.GENERAL_FACET__IDENTIFIER:
-				setIdentifier((String)newValue);
-				return;
-			case GMFGraphPackage.GENERAL_FACET__DATA:
-				setData((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.GENERAL_FACET__IDENTIFIER:
-				setIdentifier(IDENTIFIER_EDEFAULT);
-				return;
-			case GMFGraphPackage.GENERAL_FACET__DATA:
-				setData(DATA_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.GENERAL_FACET__IDENTIFIER:
-				return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-			case GMFGraphPackage.GENERAL_FACET__DATA:
-				return DATA_EDEFAULT == null ? data != null : !DATA_EDEFAULT.equals(data);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (identifier: ");
-		result.append(identifier);
-		result.append(", data: ");
-		result.append(data);
-		result.append(')');
-		return result.toString();
-	}
-
-} //GeneralFacetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GradientFacetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GradientFacetImpl.java
deleted file mode 100644
index cfaed6787aa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GradientFacetImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Direction;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GradientFacet;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Gradient Facet</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GradientFacetImpl#getDirection <em>Direction</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GradientFacetImpl extends EObjectImpl implements GradientFacet {
-	/**
-	 * The default value of the '{@link #getDirection() <em>Direction</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDirection()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Direction DIRECTION_EDEFAULT = Direction.NONE_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getDirection() <em>Direction</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDirection()
-	 * @generated
-	 * @ordered
-	 */
-	protected Direction direction = DIRECTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GradientFacetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getGradientFacet();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Direction getDirection() {
-		return direction;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDirection(Direction newDirection) {
-		Direction oldDirection = direction;
-		direction = newDirection == null ? DIRECTION_EDEFAULT : newDirection;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRADIENT_FACET__DIRECTION, oldDirection, direction));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.GRADIENT_FACET__DIRECTION:
-				return getDirection();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.GRADIENT_FACET__DIRECTION:
-				setDirection((Direction)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.GRADIENT_FACET__DIRECTION:
-				setDirection(DIRECTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.GRADIENT_FACET__DIRECTION:
-				return direction != DIRECTION_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (direction: ");
-		result.append(direction);
-		result.append(')');
-		return result.toString();
-	}
-
-} //GradientFacetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GridLayoutDataImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GridLayoutDataImpl.java
deleted file mode 100644
index c0d928d898b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GridLayoutDataImpl.java
+++ /dev/null
@@ -1,670 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.gmfgraph.Alignment;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.Layoutable;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Grid Layout Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#getOwner <em>Owner</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#isGrabExcessHorizontalSpace <em>Grab Excess Horizontal Space</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#isGrabExcessVerticalSpace <em>Grab Excess Vertical Space</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#getVerticalAlignment <em>Vertical Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#getHorizontalAlignment <em>Horizontal Alignment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#getVerticalSpan <em>Vertical Span</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#getHorizontalSpan <em>Horizontal Span</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#getHorizontalIndent <em>Horizontal Indent</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutDataImpl#getSizeHint <em>Size Hint</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GridLayoutDataImpl extends EObjectImpl implements GridLayoutData {
-	/**
-	 * The default value of the '{@link #isGrabExcessHorizontalSpace() <em>Grab Excess Horizontal Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isGrabExcessHorizontalSpace()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean GRAB_EXCESS_HORIZONTAL_SPACE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isGrabExcessHorizontalSpace() <em>Grab Excess Horizontal Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isGrabExcessHorizontalSpace()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean grabExcessHorizontalSpace = GRAB_EXCESS_HORIZONTAL_SPACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isGrabExcessVerticalSpace() <em>Grab Excess Vertical Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isGrabExcessVerticalSpace()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean GRAB_EXCESS_VERTICAL_SPACE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isGrabExcessVerticalSpace() <em>Grab Excess Vertical Space</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isGrabExcessVerticalSpace()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean grabExcessVerticalSpace = GRAB_EXCESS_VERTICAL_SPACE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVerticalAlignment() <em>Vertical Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVerticalAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Alignment VERTICAL_ALIGNMENT_EDEFAULT = Alignment.CENTER_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getVerticalAlignment() <em>Vertical Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVerticalAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected Alignment verticalAlignment = VERTICAL_ALIGNMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHorizontalAlignment() <em>Horizontal Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHorizontalAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Alignment HORIZONTAL_ALIGNMENT_EDEFAULT = Alignment.CENTER_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getHorizontalAlignment() <em>Horizontal Alignment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHorizontalAlignment()
-	 * @generated
-	 * @ordered
-	 */
-	protected Alignment horizontalAlignment = HORIZONTAL_ALIGNMENT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getVerticalSpan() <em>Vertical Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVerticalSpan()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int VERTICAL_SPAN_EDEFAULT = 1;
-
-	/**
-	 * The cached value of the '{@link #getVerticalSpan() <em>Vertical Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVerticalSpan()
-	 * @generated
-	 * @ordered
-	 */
-	protected int verticalSpan = VERTICAL_SPAN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHorizontalSpan() <em>Horizontal Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHorizontalSpan()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HORIZONTAL_SPAN_EDEFAULT = 1;
-
-	/**
-	 * The cached value of the '{@link #getHorizontalSpan() <em>Horizontal Span</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHorizontalSpan()
-	 * @generated
-	 * @ordered
-	 */
-	protected int horizontalSpan = HORIZONTAL_SPAN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHorizontalIndent() <em>Horizontal Indent</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHorizontalIndent()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HORIZONTAL_INDENT_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getHorizontalIndent() <em>Horizontal Indent</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHorizontalIndent()
-	 * @generated
-	 * @ordered
-	 */
-	protected int horizontalIndent = HORIZONTAL_INDENT_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getSizeHint() <em>Size Hint</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSizeHint()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension sizeHint;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GridLayoutDataImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getGridLayoutData();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isGrabExcessHorizontalSpace() {
-		return grabExcessHorizontalSpace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGrabExcessHorizontalSpace(boolean newGrabExcessHorizontalSpace) {
-		boolean oldGrabExcessHorizontalSpace = grabExcessHorizontalSpace;
-		grabExcessHorizontalSpace = newGrabExcessHorizontalSpace;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE, oldGrabExcessHorizontalSpace, grabExcessHorizontalSpace));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isGrabExcessVerticalSpace() {
-		return grabExcessVerticalSpace;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGrabExcessVerticalSpace(boolean newGrabExcessVerticalSpace) {
-		boolean oldGrabExcessVerticalSpace = grabExcessVerticalSpace;
-		grabExcessVerticalSpace = newGrabExcessVerticalSpace;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE, oldGrabExcessVerticalSpace, grabExcessVerticalSpace));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Alignment getVerticalAlignment() {
-		return verticalAlignment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVerticalAlignment(Alignment newVerticalAlignment) {
-		Alignment oldVerticalAlignment = verticalAlignment;
-		verticalAlignment = newVerticalAlignment == null ? VERTICAL_ALIGNMENT_EDEFAULT : newVerticalAlignment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT, oldVerticalAlignment, verticalAlignment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Alignment getHorizontalAlignment() {
-		return horizontalAlignment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHorizontalAlignment(Alignment newHorizontalAlignment) {
-		Alignment oldHorizontalAlignment = horizontalAlignment;
-		horizontalAlignment = newHorizontalAlignment == null ? HORIZONTAL_ALIGNMENT_EDEFAULT : newHorizontalAlignment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT, oldHorizontalAlignment, horizontalAlignment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getVerticalSpan() {
-		return verticalSpan;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setVerticalSpan(int newVerticalSpan) {
-		int oldVerticalSpan = verticalSpan;
-		verticalSpan = newVerticalSpan;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN, oldVerticalSpan, verticalSpan));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHorizontalSpan() {
-		return horizontalSpan;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHorizontalSpan(int newHorizontalSpan) {
-		int oldHorizontalSpan = horizontalSpan;
-		horizontalSpan = newHorizontalSpan;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN, oldHorizontalSpan, horizontalSpan));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHorizontalIndent() {
-		return horizontalIndent;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHorizontalIndent(int newHorizontalIndent) {
-		int oldHorizontalIndent = horizontalIndent;
-		horizontalIndent = newHorizontalIndent;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT, oldHorizontalIndent, horizontalIndent));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getSizeHint() {
-		return sizeHint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSizeHint(Dimension newSizeHint, NotificationChain msgs) {
-		Dimension oldSizeHint = sizeHint;
-		sizeHint = newSizeHint;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT, oldSizeHint, newSizeHint);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSizeHint(Dimension newSizeHint) {
-		if (newSizeHint != sizeHint) {
-			NotificationChain msgs = null;
-			if (sizeHint != null)
-				msgs = ((InternalEObject)sizeHint).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT, null, msgs);
-			if (newSizeHint != null)
-				msgs = ((InternalEObject)newSizeHint).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT, null, msgs);
-			msgs = basicSetSizeHint(newSizeHint, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT, newSizeHint, newSizeHint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetOwner((Layoutable)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
-				return basicSetOwner(null, msgs);
-			case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
-				return basicSetSizeHint(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
-				return eInternalContainer().eInverseRemove(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
-				return getOwner();
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
-				return isGrabExcessHorizontalSpace();
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
-				return isGrabExcessVerticalSpace();
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
-				return getVerticalAlignment();
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
-				return getHorizontalAlignment();
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
-				return getVerticalSpan();
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
-				return getHorizontalSpan();
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
-				return getHorizontalIndent();
-			case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
-				return getSizeHint();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
-				setOwner((Layoutable)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
-				setGrabExcessHorizontalSpace((Boolean)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
-				setGrabExcessVerticalSpace((Boolean)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
-				setVerticalAlignment((Alignment)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
-				setHorizontalAlignment((Alignment)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
-				setVerticalSpan((Integer)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
-				setHorizontalSpan((Integer)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
-				setHorizontalIndent((Integer)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
-				setSizeHint((Dimension)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
-				setOwner((Layoutable)null);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
-				setGrabExcessHorizontalSpace(GRAB_EXCESS_HORIZONTAL_SPACE_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
-				setGrabExcessVerticalSpace(GRAB_EXCESS_VERTICAL_SPACE_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
-				setVerticalAlignment(VERTICAL_ALIGNMENT_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
-				setHorizontalAlignment(HORIZONTAL_ALIGNMENT_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
-				setVerticalSpan(VERTICAL_SPAN_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
-				setHorizontalSpan(HORIZONTAL_SPAN_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
-				setHorizontalIndent(HORIZONTAL_INDENT_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
-				setSizeHint((Dimension)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT_DATA__OWNER:
-				return getOwner() != null;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_HORIZONTAL_SPACE:
-				return grabExcessHorizontalSpace != GRAB_EXCESS_HORIZONTAL_SPACE_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__GRAB_EXCESS_VERTICAL_SPACE:
-				return grabExcessVerticalSpace != GRAB_EXCESS_VERTICAL_SPACE_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_ALIGNMENT:
-				return verticalAlignment != VERTICAL_ALIGNMENT_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_ALIGNMENT:
-				return horizontalAlignment != HORIZONTAL_ALIGNMENT_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__VERTICAL_SPAN:
-				return verticalSpan != VERTICAL_SPAN_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_SPAN:
-				return horizontalSpan != HORIZONTAL_SPAN_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__HORIZONTAL_INDENT:
-				return horizontalIndent != HORIZONTAL_INDENT_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT_DATA__SIZE_HINT:
-				return sizeHint != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (grabExcessHorizontalSpace: ");
-		result.append(grabExcessHorizontalSpace);
-		result.append(", grabExcessVerticalSpace: ");
-		result.append(grabExcessVerticalSpace);
-		result.append(", verticalAlignment: ");
-		result.append(verticalAlignment);
-		result.append(", horizontalAlignment: ");
-		result.append(horizontalAlignment);
-		result.append(", verticalSpan: ");
-		result.append(verticalSpan);
-		result.append(", horizontalSpan: ");
-		result.append(horizontalSpan);
-		result.append(", horizontalIndent: ");
-		result.append(horizontalIndent);
-		result.append(')');
-		return result.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Layoutable getOwner() {
-		if (eContainerFeatureID() != GMFGraphPackage.GRID_LAYOUT_DATA__OWNER) return null;
-		return (Layoutable)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOwner(Layoutable newOwner, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newOwner, GMFGraphPackage.GRID_LAYOUT_DATA__OWNER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOwner(Layoutable newOwner) {
-		if (newOwner != eInternalContainer() || (eContainerFeatureID() != GMFGraphPackage.GRID_LAYOUT_DATA__OWNER && newOwner != null)) {
-			if (EcoreUtil.isAncestor(this, newOwner))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newOwner != null)
-				msgs = ((InternalEObject)newOwner).eInverseAdd(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
-			msgs = basicSetOwner(newOwner, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT_DATA__OWNER, newOwner, newOwner));
-	}
-
-} //GridLayoutDataImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GridLayoutImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GridLayoutImpl.java
deleted file mode 100644
index fd28ad1a4f9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/GridLayoutImpl.java
+++ /dev/null
@@ -1,379 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayout;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Grid Layout</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutImpl#getNumColumns <em>Num Columns</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutImpl#isEqualWidth <em>Equal Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutImpl#getMargins <em>Margins</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.GridLayoutImpl#getSpacing <em>Spacing</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GridLayoutImpl extends EObjectImpl implements GridLayout {
-	/**
-	 * The default value of the '{@link #getNumColumns() <em>Num Columns</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int NUM_COLUMNS_EDEFAULT = 1;
-
-	/**
-	 * The cached value of the '{@link #getNumColumns() <em>Num Columns</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNumColumns()
-	 * @generated
-	 * @ordered
-	 */
-	protected int numColumns = NUM_COLUMNS_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isEqualWidth() <em>Equal Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEqualWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean EQUAL_WIDTH_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isEqualWidth() <em>Equal Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isEqualWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean equalWidth = EQUAL_WIDTH_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getMargins() <em>Margins</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMargins()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension margins;
-
-	/**
-	 * The cached value of the '{@link #getSpacing() <em>Spacing</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSpacing()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension spacing;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GridLayoutImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getGridLayout();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getNumColumns() {
-		return numColumns;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNumColumns(int newNumColumns) {
-		int oldNumColumns = numColumns;
-		numColumns = newNumColumns;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS, oldNumColumns, numColumns));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isEqualWidth() {
-		return equalWidth;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEqualWidth(boolean newEqualWidth) {
-		boolean oldEqualWidth = equalWidth;
-		equalWidth = newEqualWidth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH, oldEqualWidth, equalWidth));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getMargins() {
-		return margins;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMargins(Dimension newMargins, NotificationChain msgs) {
-		Dimension oldMargins = margins;
-		margins = newMargins;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__MARGINS, oldMargins, newMargins);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMargins(Dimension newMargins) {
-		if (newMargins != margins) {
-			NotificationChain msgs = null;
-			if (margins != null)
-				msgs = ((InternalEObject)margins).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT__MARGINS, null, msgs);
-			if (newMargins != null)
-				msgs = ((InternalEObject)newMargins).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT__MARGINS, null, msgs);
-			msgs = basicSetMargins(newMargins, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__MARGINS, newMargins, newMargins));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getSpacing() {
-		return spacing;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSpacing(Dimension newSpacing, NotificationChain msgs) {
-		Dimension oldSpacing = spacing;
-		spacing = newSpacing;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__SPACING, oldSpacing, newSpacing);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSpacing(Dimension newSpacing) {
-		if (newSpacing != spacing) {
-			NotificationChain msgs = null;
-			if (spacing != null)
-				msgs = ((InternalEObject)spacing).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT__SPACING, null, msgs);
-			if (newSpacing != null)
-				msgs = ((InternalEObject)newSpacing).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.GRID_LAYOUT__SPACING, null, msgs);
-			msgs = basicSetSpacing(newSpacing, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.GRID_LAYOUT__SPACING, newSpacing, newSpacing));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT__MARGINS:
-				return basicSetMargins(null, msgs);
-			case GMFGraphPackage.GRID_LAYOUT__SPACING:
-				return basicSetSpacing(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
-				return getNumColumns();
-			case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
-				return isEqualWidth();
-			case GMFGraphPackage.GRID_LAYOUT__MARGINS:
-				return getMargins();
-			case GMFGraphPackage.GRID_LAYOUT__SPACING:
-				return getSpacing();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
-				setNumColumns((Integer)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
-				setEqualWidth((Boolean)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT__MARGINS:
-				setMargins((Dimension)newValue);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT__SPACING:
-				setSpacing((Dimension)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
-				setNumColumns(NUM_COLUMNS_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
-				setEqualWidth(EQUAL_WIDTH_EDEFAULT);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT__MARGINS:
-				setMargins((Dimension)null);
-				return;
-			case GMFGraphPackage.GRID_LAYOUT__SPACING:
-				setSpacing((Dimension)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.GRID_LAYOUT__NUM_COLUMNS:
-				return numColumns != NUM_COLUMNS_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT__EQUAL_WIDTH:
-				return equalWidth != EQUAL_WIDTH_EDEFAULT;
-			case GMFGraphPackage.GRID_LAYOUT__MARGINS:
-				return margins != null;
-			case GMFGraphPackage.GRID_LAYOUT__SPACING:
-				return spacing != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (numColumns: ");
-		result.append(numColumns);
-		result.append(", equalWidth: ");
-		result.append(equalWidth);
-		result.append(')');
-		return result.toString();
-	}
-
-} //GridLayoutImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/InsetsImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/InsetsImpl.java
deleted file mode 100644
index e23807a0e46..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/InsetsImpl.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Insets;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Insets</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.InsetsImpl#getTop <em>Top</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.InsetsImpl#getLeft <em>Left</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.InsetsImpl#getBottom <em>Bottom</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.InsetsImpl#getRight <em>Right</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class InsetsImpl extends EObjectImpl implements Insets {
-	/**
-	 * The default value of the '{@link #getTop() <em>Top</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTop()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int TOP_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getTop() <em>Top</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTop()
-	 * @generated
-	 * @ordered
-	 */
-	protected int top = TOP_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLeft() <em>Left</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLeft()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int LEFT_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getLeft() <em>Left</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLeft()
-	 * @generated
-	 * @ordered
-	 */
-	protected int left = LEFT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBottom() <em>Bottom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBottom()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int BOTTOM_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getBottom() <em>Bottom</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBottom()
-	 * @generated
-	 * @ordered
-	 */
-	protected int bottom = BOTTOM_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getRight() <em>Right</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRight()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int RIGHT_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getRight() <em>Right</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRight()
-	 * @generated
-	 * @ordered
-	 */
-	protected int right = RIGHT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InsetsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getInsets();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getTop() {
-		return top;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTop(int newTop) {
-		int oldTop = top;
-		top = newTop;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.INSETS__TOP, oldTop, top));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getLeft() {
-		return left;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLeft(int newLeft) {
-		int oldLeft = left;
-		left = newLeft;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.INSETS__LEFT, oldLeft, left));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getBottom() {
-		return bottom;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBottom(int newBottom) {
-		int oldBottom = bottom;
-		bottom = newBottom;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.INSETS__BOTTOM, oldBottom, bottom));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getRight() {
-		return right;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRight(int newRight) {
-		int oldRight = right;
-		right = newRight;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.INSETS__RIGHT, oldRight, right));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.INSETS__TOP:
-				return getTop();
-			case GMFGraphPackage.INSETS__LEFT:
-				return getLeft();
-			case GMFGraphPackage.INSETS__BOTTOM:
-				return getBottom();
-			case GMFGraphPackage.INSETS__RIGHT:
-				return getRight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.INSETS__TOP:
-				setTop((Integer)newValue);
-				return;
-			case GMFGraphPackage.INSETS__LEFT:
-				setLeft((Integer)newValue);
-				return;
-			case GMFGraphPackage.INSETS__BOTTOM:
-				setBottom((Integer)newValue);
-				return;
-			case GMFGraphPackage.INSETS__RIGHT:
-				setRight((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.INSETS__TOP:
-				setTop(TOP_EDEFAULT);
-				return;
-			case GMFGraphPackage.INSETS__LEFT:
-				setLeft(LEFT_EDEFAULT);
-				return;
-			case GMFGraphPackage.INSETS__BOTTOM:
-				setBottom(BOTTOM_EDEFAULT);
-				return;
-			case GMFGraphPackage.INSETS__RIGHT:
-				setRight(RIGHT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.INSETS__TOP:
-				return top != TOP_EDEFAULT;
-			case GMFGraphPackage.INSETS__LEFT:
-				return left != LEFT_EDEFAULT;
-			case GMFGraphPackage.INSETS__BOTTOM:
-				return bottom != BOTTOM_EDEFAULT;
-			case GMFGraphPackage.INSETS__RIGHT:
-				return right != RIGHT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (top: ");
-		result.append(top);
-		result.append(", left: ");
-		result.append(left);
-		result.append(", bottom: ");
-		result.append(bottom);
-		result.append(", right: ");
-		result.append(right);
-		result.append(')');
-		return result.toString();
-	}
-
-} //InsetsImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/InvisibleRectangleImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/InvisibleRectangleImpl.java
deleted file mode 100644
index 59a1124f370..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/InvisibleRectangleImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Invisible Rectangle</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class InvisibleRectangleImpl extends RealFigureImpl implements InvisibleRectangle {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected InvisibleRectangleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getInvisibleRectangle();
-	}
-
-} //InvisibleRectangleImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabelImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabelImpl.java
deleted file mode 100644
index ef70acae54d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabelImpl.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Label;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Label</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LabelImpl#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LabelImpl extends RealFigureImpl implements Label {
-	/**
-	 * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TEXT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected String text = TEXT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabelImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getLabel();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setText(String newText) {
-		String oldText = text;
-		text = newText;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LABEL__TEXT, oldText, text));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.LABEL__TEXT:
-				return getText();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.LABEL__TEXT:
-				setText((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.LABEL__TEXT:
-				setText(TEXT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.LABEL__TEXT:
-				return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (text: ");
-		result.append(text);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LabelImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabelOffsetFacetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabelOffsetFacetImpl.java
deleted file mode 100644
index a0fb08db370..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabelOffsetFacetImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Label Offset Facet</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LabelOffsetFacetImpl#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LabelOffsetFacetImpl#getY <em>Y</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LabelOffsetFacetImpl extends EObjectImpl implements LabelOffsetFacet {
-	/**
-	 * The default value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getX()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int X_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getX()
-	 * @generated
-	 * @ordered
-	 */
-	protected int x = X_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getY()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int Y_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getY()
-	 * @generated
-	 * @ordered
-	 */
-	protected int y = Y_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabelOffsetFacetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getLabelOffsetFacet();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getX() {
-		return x;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setX(int newX) {
-		int oldX = x;
-		x = newX;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LABEL_OFFSET_FACET__X, oldX, x));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getY() {
-		return y;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setY(int newY) {
-		int oldY = y;
-		y = newY;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LABEL_OFFSET_FACET__Y, oldY, y));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.LABEL_OFFSET_FACET__X:
-				return getX();
-			case GMFGraphPackage.LABEL_OFFSET_FACET__Y:
-				return getY();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.LABEL_OFFSET_FACET__X:
-				setX((Integer)newValue);
-				return;
-			case GMFGraphPackage.LABEL_OFFSET_FACET__Y:
-				setY((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.LABEL_OFFSET_FACET__X:
-				setX(X_EDEFAULT);
-				return;
-			case GMFGraphPackage.LABEL_OFFSET_FACET__Y:
-				setY(Y_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.LABEL_OFFSET_FACET__X:
-				return x != X_EDEFAULT;
-			case GMFGraphPackage.LABEL_OFFSET_FACET__Y:
-				return y != Y_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (x: ");
-		result.append(x);
-		result.append(", y: ");
-		result.append(y);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LabelOffsetFacetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabeledContainerImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabeledContainerImpl.java
deleted file mode 100644
index 3272831b349..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LabeledContainerImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Labeled Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class LabeledContainerImpl extends RealFigureImpl implements LabeledContainer {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabeledContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getLabeledContainer();
-	}
-
-} //LabeledContainerImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LayoutRefImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LayoutRefImpl.java
deleted file mode 100644
index f1d94bb7de1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LayoutRefImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Layout;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutRef;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Layout Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LayoutRefImpl#getActual <em>Actual</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LayoutRefImpl extends EObjectImpl implements LayoutRef {
-	/**
-	 * The cached value of the '{@link #getActual() <em>Actual</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActual()
-	 * @generated
-	 * @ordered
-	 */
-	protected Layout actual;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LayoutRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getLayoutRef();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Layout getActual() {
-		if (actual != null && actual.eIsProxy()) {
-			InternalEObject oldActual = (InternalEObject)actual;
-			actual = (Layout)eResolveProxy(oldActual);
-			if (actual != oldActual) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.LAYOUT_REF__ACTUAL, oldActual, actual));
-			}
-		}
-		return actual;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Layout basicGetActual() {
-		return actual;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActual(Layout newActual) {
-		Layout oldActual = actual;
-		actual = newActual;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LAYOUT_REF__ACTUAL, oldActual, actual));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.LAYOUT_REF__ACTUAL:
-				if (resolve) return getActual();
-				return basicGetActual();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.LAYOUT_REF__ACTUAL:
-				setActual((Layout)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.LAYOUT_REF__ACTUAL:
-				setActual((Layout)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.LAYOUT_REF__ACTUAL:
-				return actual != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //LayoutRefImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LineBorderImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LineBorderImpl.java
deleted file mode 100644
index 6357691f6f5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/LineBorderImpl.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Color;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.LineBorder;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Line Border</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LineBorderImpl#getColor <em>Color</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.LineBorderImpl#getWidth <em>Width</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LineBorderImpl extends EObjectImpl implements LineBorder {
-	/**
-	 * The cached value of the '{@link #getColor() <em>Color</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getColor()
-	 * @generated
-	 * @ordered
-	 */
-	protected Color color;
-
-	/**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int WIDTH_EDEFAULT = 1;
-
-	/**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected int width = WIDTH_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LineBorderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getLineBorder();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Color getColor() {
-		return color;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetColor(Color newColor, NotificationChain msgs) {
-		Color oldColor = color;
-		color = newColor;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LINE_BORDER__COLOR, oldColor, newColor);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setColor(Color newColor) {
-		if (newColor != color) {
-			NotificationChain msgs = null;
-			if (color != null)
-				msgs = ((InternalEObject)color).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.LINE_BORDER__COLOR, null, msgs);
-			if (newColor != null)
-				msgs = ((InternalEObject)newColor).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.LINE_BORDER__COLOR, null, msgs);
-			msgs = basicSetColor(newColor, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LINE_BORDER__COLOR, newColor, newColor));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getWidth() {
-		return width;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWidth(int newWidth) {
-		int oldWidth = width;
-		width = newWidth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.LINE_BORDER__WIDTH, oldWidth, width));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.LINE_BORDER__COLOR:
-				return basicSetColor(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.LINE_BORDER__COLOR:
-				return getColor();
-			case GMFGraphPackage.LINE_BORDER__WIDTH:
-				return getWidth();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.LINE_BORDER__COLOR:
-				setColor((Color)newValue);
-				return;
-			case GMFGraphPackage.LINE_BORDER__WIDTH:
-				setWidth((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.LINE_BORDER__COLOR:
-				setColor((Color)null);
-				return;
-			case GMFGraphPackage.LINE_BORDER__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.LINE_BORDER__COLOR:
-				return color != null;
-			case GMFGraphPackage.LINE_BORDER__WIDTH:
-				return width != WIDTH_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (width: ");
-		result.append(width);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LineBorderImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/MarginBorderImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/MarginBorderImpl.java
deleted file mode 100644
index df8eaa09edd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/MarginBorderImpl.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Insets;
-import org.eclipse.papyrus.gmf.gmfgraph.MarginBorder;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Margin Border</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.MarginBorderImpl#getInsets <em>Insets</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MarginBorderImpl extends EObjectImpl implements MarginBorder {
-	/**
-	 * The cached value of the '{@link #getInsets() <em>Insets</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInsets()
-	 * @generated
-	 * @ordered
-	 */
-	protected Insets insets;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MarginBorderImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getMarginBorder();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Insets getInsets() {
-		return insets;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetInsets(Insets newInsets, NotificationChain msgs) {
-		Insets oldInsets = insets;
-		insets = newInsets;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.MARGIN_BORDER__INSETS, oldInsets, newInsets);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setInsets(Insets newInsets) {
-		if (newInsets != insets) {
-			NotificationChain msgs = null;
-			if (insets != null)
-				msgs = ((InternalEObject)insets).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.MARGIN_BORDER__INSETS, null, msgs);
-			if (newInsets != null)
-				msgs = ((InternalEObject)newInsets).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.MARGIN_BORDER__INSETS, null, msgs);
-			msgs = basicSetInsets(newInsets, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.MARGIN_BORDER__INSETS, newInsets, newInsets));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.MARGIN_BORDER__INSETS:
-				return basicSetInsets(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.MARGIN_BORDER__INSETS:
-				return getInsets();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.MARGIN_BORDER__INSETS:
-				setInsets((Insets)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.MARGIN_BORDER__INSETS:
-				setInsets((Insets)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.MARGIN_BORDER__INSETS:
-				return insets != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MarginBorderImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/NodeImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/NodeImpl.java
deleted file mode 100644
index e45326abfe9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/NodeImpl.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Direction;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Node</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.NodeImpl#getResizeConstraint <em>Resize Constraint</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.NodeImpl#getAffixedParentSide <em>Affixed Parent Side</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.NodeImpl#getContentPane <em>Content Pane</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NodeImpl extends AbstractNodeImpl implements Node {
-	/**
-	 * The default value of the '{@link #getResizeConstraint() <em>Resize Constraint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResizeConstraint()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Direction RESIZE_CONSTRAINT_EDEFAULT = Direction.NSEW_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getResizeConstraint() <em>Resize Constraint</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getResizeConstraint()
-	 * @generated
-	 * @ordered
-	 */
-	protected Direction resizeConstraint = RESIZE_CONSTRAINT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAffixedParentSide() <em>Affixed Parent Side</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAffixedParentSide()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Direction AFFIXED_PARENT_SIDE_EDEFAULT = Direction.NONE_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getAffixedParentSide() <em>Affixed Parent Side</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAffixedParentSide()
-	 * @generated
-	 * @ordered
-	 */
-	protected Direction affixedParentSide = AFFIXED_PARENT_SIDE_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getContentPane() <em>Content Pane</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContentPane()
-	 * @generated
-	 * @ordered
-	 */
-	protected ChildAccess contentPane;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NodeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getNode();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Direction getResizeConstraint() {
-		return resizeConstraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setResizeConstraint(Direction newResizeConstraint) {
-		Direction oldResizeConstraint = resizeConstraint;
-		resizeConstraint = newResizeConstraint == null ? RESIZE_CONSTRAINT_EDEFAULT : newResizeConstraint;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.NODE__RESIZE_CONSTRAINT, oldResizeConstraint, resizeConstraint));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Direction getAffixedParentSide() {
-		return affixedParentSide;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAffixedParentSide(Direction newAffixedParentSide) {
-		Direction oldAffixedParentSide = affixedParentSide;
-		affixedParentSide = newAffixedParentSide == null ? AFFIXED_PARENT_SIDE_EDEFAULT : newAffixedParentSide;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.NODE__AFFIXED_PARENT_SIDE, oldAffixedParentSide, affixedParentSide));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess getContentPane() {
-		if (contentPane != null && contentPane.eIsProxy()) {
-			InternalEObject oldContentPane = (InternalEObject)contentPane;
-			contentPane = (ChildAccess)eResolveProxy(oldContentPane);
-			if (contentPane != oldContentPane) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.NODE__CONTENT_PANE, oldContentPane, contentPane));
-			}
-		}
-		return contentPane;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildAccess basicGetContentPane() {
-		return contentPane;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContentPane(ChildAccess newContentPane) {
-		ChildAccess oldContentPane = contentPane;
-		contentPane = newContentPane;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.NODE__CONTENT_PANE, oldContentPane, contentPane));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.NODE__RESIZE_CONSTRAINT:
-				return getResizeConstraint();
-			case GMFGraphPackage.NODE__AFFIXED_PARENT_SIDE:
-				return getAffixedParentSide();
-			case GMFGraphPackage.NODE__CONTENT_PANE:
-				if (resolve) return getContentPane();
-				return basicGetContentPane();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.NODE__RESIZE_CONSTRAINT:
-				setResizeConstraint((Direction)newValue);
-				return;
-			case GMFGraphPackage.NODE__AFFIXED_PARENT_SIDE:
-				setAffixedParentSide((Direction)newValue);
-				return;
-			case GMFGraphPackage.NODE__CONTENT_PANE:
-				setContentPane((ChildAccess)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.NODE__RESIZE_CONSTRAINT:
-				setResizeConstraint(RESIZE_CONSTRAINT_EDEFAULT);
-				return;
-			case GMFGraphPackage.NODE__AFFIXED_PARENT_SIDE:
-				setAffixedParentSide(AFFIXED_PARENT_SIDE_EDEFAULT);
-				return;
-			case GMFGraphPackage.NODE__CONTENT_PANE:
-				setContentPane((ChildAccess)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.NODE__RESIZE_CONSTRAINT:
-				return resizeConstraint != RESIZE_CONSTRAINT_EDEFAULT;
-			case GMFGraphPackage.NODE__AFFIXED_PARENT_SIDE:
-				return affixedParentSide != AFFIXED_PARENT_SIDE_EDEFAULT;
-			case GMFGraphPackage.NODE__CONTENT_PANE:
-				return contentPane != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (resizeConstraint: ");
-		result.append(resizeConstraint);
-		result.append(", affixedParentSide: ");
-		result.append(affixedParentSide);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NodeImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PointImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PointImpl.java
deleted file mode 100644
index c8ac431fe49..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PointImpl.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Point</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PointImpl#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PointImpl#getY <em>Y</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PointImpl extends EObjectImpl implements Point {
-	/**
-	 * The default value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getX()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int X_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getX()
-	 * @generated
-	 * @ordered
-	 */
-	protected int x = X_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getY()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int Y_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getY()
-	 * @generated
-	 * @ordered
-	 */
-	protected int y = Y_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PointImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getPoint();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getX() {
-		return x;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setX(int newX) {
-		int oldX = x;
-		x = newX;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.POINT__X, oldX, x));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getY() {
-		return y;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setY(int newY) {
-		int oldY = y;
-		y = newY;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.POINT__Y, oldY, y));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.POINT__X:
-				return getX();
-			case GMFGraphPackage.POINT__Y:
-				return getY();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.POINT__X:
-				setX((Integer)newValue);
-				return;
-			case GMFGraphPackage.POINT__Y:
-				setY((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.POINT__X:
-				setX(X_EDEFAULT);
-				return;
-			case GMFGraphPackage.POINT__Y:
-				setY(Y_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.POINT__X:
-				return x != X_EDEFAULT;
-			case GMFGraphPackage.POINT__Y:
-				return y != Y_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (x: ");
-		result.append(x);
-		result.append(", y: ");
-		result.append(y);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PointImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolygonDecorationImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolygonDecorationImpl.java
deleted file mode 100644
index cff697b97d1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolygonDecorationImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Polygon Decoration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PolygonDecorationImpl extends PolygonImpl implements PolygonDecoration {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolygonDecorationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getPolygonDecoration();
-	}
-
-} //PolygonDecorationImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolygonImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolygonImpl.java
deleted file mode 100644
index d55d475dfcb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolygonImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Polygon;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Polygon</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PolygonImpl extends PolylineImpl implements Polygon {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolygonImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getPolygon();
-	}
-
-} //PolygonImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineConnectionImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineConnectionImpl.java
deleted file mode 100644
index 61563345de3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineConnectionImpl.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Polyline Connection</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineConnectionImpl#getSourceDecoration <em>Source Decoration</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineConnectionImpl#getTargetDecoration <em>Target Decoration</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PolylineConnectionImpl extends PolylineImpl implements PolylineConnection {
-	/**
-	 * The cached value of the '{@link #getSourceDecoration() <em>Source Decoration</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSourceDecoration()
-	 * @generated
-	 * @ordered
-	 */
-	protected DecorationFigure sourceDecoration;
-
-	/**
-	 * The cached value of the '{@link #getTargetDecoration() <em>Target Decoration</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetDecoration()
-	 * @generated
-	 * @ordered
-	 */
-	protected DecorationFigure targetDecoration;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolylineConnectionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getPolylineConnection();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DecorationFigure getSourceDecoration() {
-		if (sourceDecoration != null && sourceDecoration.eIsProxy()) {
-			InternalEObject oldSourceDecoration = (InternalEObject)sourceDecoration;
-			sourceDecoration = (DecorationFigure)eResolveProxy(oldSourceDecoration);
-			if (sourceDecoration != oldSourceDecoration) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.POLYLINE_CONNECTION__SOURCE_DECORATION, oldSourceDecoration, sourceDecoration));
-			}
-		}
-		return sourceDecoration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DecorationFigure basicGetSourceDecoration() {
-		return sourceDecoration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSourceDecoration(DecorationFigure newSourceDecoration) {
-		DecorationFigure oldSourceDecoration = sourceDecoration;
-		sourceDecoration = newSourceDecoration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.POLYLINE_CONNECTION__SOURCE_DECORATION, oldSourceDecoration, sourceDecoration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DecorationFigure getTargetDecoration() {
-		if (targetDecoration != null && targetDecoration.eIsProxy()) {
-			InternalEObject oldTargetDecoration = (InternalEObject)targetDecoration;
-			targetDecoration = (DecorationFigure)eResolveProxy(oldTargetDecoration);
-			if (targetDecoration != oldTargetDecoration) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGraphPackage.POLYLINE_CONNECTION__TARGET_DECORATION, oldTargetDecoration, targetDecoration));
-			}
-		}
-		return targetDecoration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DecorationFigure basicGetTargetDecoration() {
-		return targetDecoration;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTargetDecoration(DecorationFigure newTargetDecoration) {
-		DecorationFigure oldTargetDecoration = targetDecoration;
-		targetDecoration = newTargetDecoration;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.POLYLINE_CONNECTION__TARGET_DECORATION, oldTargetDecoration, targetDecoration));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE_CONNECTION__SOURCE_DECORATION:
-				if (resolve) return getSourceDecoration();
-				return basicGetSourceDecoration();
-			case GMFGraphPackage.POLYLINE_CONNECTION__TARGET_DECORATION:
-				if (resolve) return getTargetDecoration();
-				return basicGetTargetDecoration();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE_CONNECTION__SOURCE_DECORATION:
-				setSourceDecoration((DecorationFigure)newValue);
-				return;
-			case GMFGraphPackage.POLYLINE_CONNECTION__TARGET_DECORATION:
-				setTargetDecoration((DecorationFigure)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE_CONNECTION__SOURCE_DECORATION:
-				setSourceDecoration((DecorationFigure)null);
-				return;
-			case GMFGraphPackage.POLYLINE_CONNECTION__TARGET_DECORATION:
-				setTargetDecoration((DecorationFigure)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE_CONNECTION__SOURCE_DECORATION:
-				return sourceDecoration != null;
-			case GMFGraphPackage.POLYLINE_CONNECTION__TARGET_DECORATION:
-				return targetDecoration != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PolylineConnectionImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineDecorationImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineDecorationImpl.java
deleted file mode 100644
index 945968a4e8a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineDecorationImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Polyline Decoration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PolylineDecorationImpl extends PolylineImpl implements PolylineDecoration {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolylineDecorationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getPolylineDecoration();
-	}
-
-} //PolylineDecorationImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineImpl.java
deleted file mode 100644
index 00da3932ca8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/PolylineImpl.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Polyline</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.PolylineImpl#getTemplate <em>Template</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PolylineImpl extends ShapeImpl implements Polyline {
-	/**
-	 * The cached value of the '{@link #getTemplate() <em>Template</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTemplate()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Point> template;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PolylineImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getPolyline();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Point> getTemplate() {
-		if (template == null) {
-			template = new EObjectContainmentEList<Point>(Point.class, this, GMFGraphPackage.POLYLINE__TEMPLATE);
-		}
-		return template;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE__TEMPLATE:
-				return ((InternalEList<?>)getTemplate()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE__TEMPLATE:
-				return getTemplate();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE__TEMPLATE:
-				getTemplate().clear();
-				getTemplate().addAll((Collection<? extends Point>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE__TEMPLATE:
-				getTemplate().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.POLYLINE__TEMPLATE:
-				return template != null && !template.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PolylineImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RGBColorImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RGBColorImpl.java
deleted file mode 100644
index c3ad8663e37..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RGBColorImpl.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RGBColor;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>RGB Color</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RGBColorImpl#getRed <em>Red</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RGBColorImpl#getGreen <em>Green</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RGBColorImpl#getBlue <em>Blue</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RGBColorImpl extends EObjectImpl implements RGBColor {
-	/**
-	 * The default value of the '{@link #getRed() <em>Red</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int RED_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getRed() <em>Red</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRed()
-	 * @generated
-	 * @ordered
-	 */
-	protected int red = RED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getGreen() <em>Green</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGreen()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int GREEN_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getGreen() <em>Green</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGreen()
-	 * @generated
-	 * @ordered
-	 */
-	protected int green = GREEN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBlue() <em>Blue</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBlue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int BLUE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getBlue() <em>Blue</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBlue()
-	 * @generated
-	 * @ordered
-	 */
-	protected int blue = BLUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RGBColorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getRGBColor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getRed() {
-		return red;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRed(int newRed) {
-		int oldRed = red;
-		red = newRed;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.RGB_COLOR__RED, oldRed, red));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getGreen() {
-		return green;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGreen(int newGreen) {
-		int oldGreen = green;
-		green = newGreen;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.RGB_COLOR__GREEN, oldGreen, green));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getBlue() {
-		return blue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBlue(int newBlue) {
-		int oldBlue = blue;
-		blue = newBlue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.RGB_COLOR__BLUE, oldBlue, blue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.RGB_COLOR__RED:
-				return getRed();
-			case GMFGraphPackage.RGB_COLOR__GREEN:
-				return getGreen();
-			case GMFGraphPackage.RGB_COLOR__BLUE:
-				return getBlue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.RGB_COLOR__RED:
-				setRed((Integer)newValue);
-				return;
-			case GMFGraphPackage.RGB_COLOR__GREEN:
-				setGreen((Integer)newValue);
-				return;
-			case GMFGraphPackage.RGB_COLOR__BLUE:
-				setBlue((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.RGB_COLOR__RED:
-				setRed(RED_EDEFAULT);
-				return;
-			case GMFGraphPackage.RGB_COLOR__GREEN:
-				setGreen(GREEN_EDEFAULT);
-				return;
-			case GMFGraphPackage.RGB_COLOR__BLUE:
-				setBlue(BLUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.RGB_COLOR__RED:
-				return red != RED_EDEFAULT;
-			case GMFGraphPackage.RGB_COLOR__GREEN:
-				return green != GREEN_EDEFAULT;
-			case GMFGraphPackage.RGB_COLOR__BLUE:
-				return blue != BLUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (red: ");
-		result.append(red);
-		result.append(", green: ");
-		result.append(green);
-		result.append(", blue: ");
-		result.append(blue);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RGBColorImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RealFigureImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RealFigureImpl.java
deleted file mode 100644
index 1bdb008f920..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RealFigureImpl.java
+++ /dev/null
@@ -1,354 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Pin;
-import org.eclipse.papyrus.gmf.gmfgraph.PinOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Real Figure</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RealFigureImpl#getPins <em>Pins</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RealFigureImpl#getAttributes <em>Attributes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RealFigureImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RealFigureImpl#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class RealFigureImpl extends AbstractFigureImpl implements RealFigure {
-	/**
-	 * The cached value of the '{@link #getPins() <em>Pins</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPins()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Pin> pins;
-
-	/**
-	 * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttributes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<CustomAttribute> attributes;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildren()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Figure> children;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RealFigureImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getRealFigure();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Pin> getPins() {
-		if (pins == null) {
-			pins = new EObjectContainmentEList<Pin>(Pin.class, this, GMFGraphPackage.REAL_FIGURE__PINS);
-		}
-		return pins;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<CustomAttribute> getAttributes() {
-		if (attributes == null) {
-			attributes = new EObjectContainmentEList<CustomAttribute>(CustomAttribute.class, this, GMFGraphPackage.REAL_FIGURE__ATTRIBUTES);
-		}
-		return attributes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.REAL_FIGURE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Figure> getChildren() {
-		if (children == null) {
-			children = new EObjectContainmentEList<Figure>(Figure.class, this, GMFGraphPackage.REAL_FIGURE__CHILDREN);
-		}
-		return children;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.REAL_FIGURE__PINS:
-				return ((InternalEList<?>)getPins()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.REAL_FIGURE__ATTRIBUTES:
-				return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.REAL_FIGURE__CHILDREN:
-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.REAL_FIGURE__PINS:
-				return getPins();
-			case GMFGraphPackage.REAL_FIGURE__ATTRIBUTES:
-				return getAttributes();
-			case GMFGraphPackage.REAL_FIGURE__NAME:
-				return getName();
-			case GMFGraphPackage.REAL_FIGURE__CHILDREN:
-				return getChildren();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.REAL_FIGURE__PINS:
-				getPins().clear();
-				getPins().addAll((Collection<? extends Pin>)newValue);
-				return;
-			case GMFGraphPackage.REAL_FIGURE__ATTRIBUTES:
-				getAttributes().clear();
-				getAttributes().addAll((Collection<? extends CustomAttribute>)newValue);
-				return;
-			case GMFGraphPackage.REAL_FIGURE__NAME:
-				setName((String)newValue);
-				return;
-			case GMFGraphPackage.REAL_FIGURE__CHILDREN:
-				getChildren().clear();
-				getChildren().addAll((Collection<? extends Figure>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.REAL_FIGURE__PINS:
-				getPins().clear();
-				return;
-			case GMFGraphPackage.REAL_FIGURE__ATTRIBUTES:
-				getAttributes().clear();
-				return;
-			case GMFGraphPackage.REAL_FIGURE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFGraphPackage.REAL_FIGURE__CHILDREN:
-				getChildren().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.REAL_FIGURE__PINS:
-				return pins != null && !pins.isEmpty();
-			case GMFGraphPackage.REAL_FIGURE__ATTRIBUTES:
-				return attributes != null && !attributes.isEmpty();
-			case GMFGraphPackage.REAL_FIGURE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFGraphPackage.REAL_FIGURE__CHILDREN:
-				return children != null && !children.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == PinOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.REAL_FIGURE__PINS: return GMFGraphPackage.PIN_OWNER__PINS;
-				default: return -1;
-			}
-		}
-		if (baseClass == CustomAttributeOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFGraphPackage.REAL_FIGURE__ATTRIBUTES: return GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == PinOwner.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.PIN_OWNER__PINS: return GMFGraphPackage.REAL_FIGURE__PINS;
-				default: return -1;
-			}
-		}
-		if (baseClass == CustomAttributeOwner.class) {
-			switch (baseFeatureID) {
-				case GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER__ATTRIBUTES: return GMFGraphPackage.REAL_FIGURE__ATTRIBUTES;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RealFigureImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/Rectangle2DImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/Rectangle2DImpl.java
deleted file mode 100644
index 6465630bc21..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/Rectangle2DImpl.java
+++ /dev/null
@@ -1,340 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Rectangle2DImpl.java,v 1.2 2008/08/07 13:30:05 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rectangle2 D</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.Rectangle2DImpl#getX <em>X</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.Rectangle2DImpl#getY <em>Y</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.Rectangle2DImpl#getWidth <em>Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.Rectangle2DImpl#getHeight <em>Height</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class Rectangle2DImpl extends EObjectImpl implements Rectangle2D {
-	/**
-	 * The default value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getX()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float X_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getX() <em>X</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getX()
-	 * @generated
-	 * @ordered
-	 */
-	protected float x = X_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getY()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float Y_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getY() <em>Y</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getY()
-	 * @generated
-	 * @ordered
-	 */
-	protected float y = Y_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float WIDTH_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getWidth() <em>Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected float width = WIDTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final float HEIGHT_EDEFAULT = 0.0F;
-
-	/**
-	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected float height = HEIGHT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Rectangle2DImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getRectangle2D();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getX() {
-		return x;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setX(float newX) {
-		float oldX = x;
-		x = newX;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.RECTANGLE2_D__X, oldX, x));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getY() {
-		return y;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setY(float newY) {
-		float oldY = y;
-		y = newY;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.RECTANGLE2_D__Y, oldY, y));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getWidth() {
-		return width;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setWidth(float newWidth) {
-		float oldWidth = width;
-		width = newWidth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.RECTANGLE2_D__WIDTH, oldWidth, width));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public float getHeight() {
-		return height;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHeight(float newHeight) {
-		float oldHeight = height;
-		height = newHeight;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.RECTANGLE2_D__HEIGHT, oldHeight, height));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.RECTANGLE2_D__X:
-				return getX();
-			case GMFGraphPackage.RECTANGLE2_D__Y:
-				return getY();
-			case GMFGraphPackage.RECTANGLE2_D__WIDTH:
-				return getWidth();
-			case GMFGraphPackage.RECTANGLE2_D__HEIGHT:
-				return getHeight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.RECTANGLE2_D__X:
-				setX((Float)newValue);
-				return;
-			case GMFGraphPackage.RECTANGLE2_D__Y:
-				setY((Float)newValue);
-				return;
-			case GMFGraphPackage.RECTANGLE2_D__WIDTH:
-				setWidth((Float)newValue);
-				return;
-			case GMFGraphPackage.RECTANGLE2_D__HEIGHT:
-				setHeight((Float)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.RECTANGLE2_D__X:
-				setX(X_EDEFAULT);
-				return;
-			case GMFGraphPackage.RECTANGLE2_D__Y:
-				setY(Y_EDEFAULT);
-				return;
-			case GMFGraphPackage.RECTANGLE2_D__WIDTH:
-				setWidth(WIDTH_EDEFAULT);
-				return;
-			case GMFGraphPackage.RECTANGLE2_D__HEIGHT:
-				setHeight(HEIGHT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.RECTANGLE2_D__X:
-				return x != X_EDEFAULT;
-			case GMFGraphPackage.RECTANGLE2_D__Y:
-				return y != Y_EDEFAULT;
-			case GMFGraphPackage.RECTANGLE2_D__WIDTH:
-				return width != WIDTH_EDEFAULT;
-			case GMFGraphPackage.RECTANGLE2_D__HEIGHT:
-				return height != HEIGHT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (x: ");
-		result.append(x);
-		result.append(", y: ");
-		result.append(y);
-		result.append(", width: ");
-		result.append(width);
-		result.append(", height: ");
-		result.append(height);
-		result.append(')');
-		return result.toString();
-	}
-
-} //Rectangle2DImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RectangleImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RectangleImpl.java
deleted file mode 100644
index 58ee72818a2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RectangleImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rectangle</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class RectangleImpl extends ShapeImpl implements Rectangle {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RectangleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getRectangle();
-	}
-
-} //RectangleImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RoundedRectangleImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RoundedRectangleImpl.java
deleted file mode 100644
index c750bf8835c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/RoundedRectangleImpl.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Rounded Rectangle</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RoundedRectangleImpl#getCornerWidth <em>Corner Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.RoundedRectangleImpl#getCornerHeight <em>Corner Height</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class RoundedRectangleImpl extends ShapeImpl implements RoundedRectangle {
-	/**
-	 * The default value of the '{@link #getCornerWidth() <em>Corner Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCornerWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int CORNER_WIDTH_EDEFAULT = 8;
-
-	/**
-	 * The cached value of the '{@link #getCornerWidth() <em>Corner Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCornerWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected int cornerWidth = CORNER_WIDTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getCornerHeight() <em>Corner Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCornerHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int CORNER_HEIGHT_EDEFAULT = 8;
-
-	/**
-	 * The cached value of the '{@link #getCornerHeight() <em>Corner Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCornerHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected int cornerHeight = CORNER_HEIGHT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected RoundedRectangleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getRoundedRectangle();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getCornerWidth() {
-		return cornerWidth;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCornerWidth(int newCornerWidth) {
-		int oldCornerWidth = cornerWidth;
-		cornerWidth = newCornerWidth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_WIDTH, oldCornerWidth, cornerWidth));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getCornerHeight() {
-		return cornerHeight;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCornerHeight(int newCornerHeight) {
-		int oldCornerHeight = cornerHeight;
-		cornerHeight = newCornerHeight;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_HEIGHT, oldCornerHeight, cornerHeight));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_WIDTH:
-				return getCornerWidth();
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_HEIGHT:
-				return getCornerHeight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_WIDTH:
-				setCornerWidth((Integer)newValue);
-				return;
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_HEIGHT:
-				setCornerHeight((Integer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_WIDTH:
-				setCornerWidth(CORNER_WIDTH_EDEFAULT);
-				return;
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_HEIGHT:
-				setCornerHeight(CORNER_HEIGHT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_WIDTH:
-				return cornerWidth != CORNER_WIDTH_EDEFAULT;
-			case GMFGraphPackage.ROUNDED_RECTANGLE__CORNER_HEIGHT:
-				return cornerHeight != CORNER_HEIGHT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (cornerWidth: ");
-		result.append(cornerWidth);
-		result.append(", cornerHeight: ");
-		result.append(cornerHeight);
-		result.append(')');
-		return result.toString();
-	}
-
-} //RoundedRectangleImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/SVGFigureImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/SVGFigureImpl.java
deleted file mode 100644
index 133b7e542d2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/SVGFigureImpl.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SVGFigureImpl.java,v 1.5 2008/08/12 13:56:28 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>SVG Figure</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGFigureImpl#getDocumentURI <em>Document URI</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGFigureImpl#getProperties <em>Properties</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGFigureImpl#getAreaOfInterest <em>Area Of Interest</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGFigureImpl#isNoCanvasWidth <em>No Canvas Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGFigureImpl#isNoCanvasHeight <em>No Canvas Height</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SVGFigureImpl extends RealFigureImpl implements SVGFigure {
-	/**
-	 * The default value of the '{@link #getDocumentURI() <em>Document URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDocumentURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DOCUMENT_URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDocumentURI() <em>Document URI</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDocumentURI()
-	 * @generated
-	 * @ordered
-	 */
-	protected String documentURI = DOCUMENT_URI_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getProperties()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<SVGProperty> properties;
-
-	/**
-	 * The cached value of the '{@link #getAreaOfInterest() <em>Area Of Interest</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAreaOfInterest()
-	 * @generated
-	 * @ordered
-	 */
-	protected Rectangle2D areaOfInterest;
-
-	/**
-	 * The default value of the '{@link #isNoCanvasWidth() <em>No Canvas Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNoCanvasWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NO_CANVAS_WIDTH_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNoCanvasWidth() <em>No Canvas Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNoCanvasWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean noCanvasWidth = NO_CANVAS_WIDTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isNoCanvasHeight() <em>No Canvas Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNoCanvasHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NO_CANVAS_HEIGHT_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNoCanvasHeight() <em>No Canvas Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNoCanvasHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean noCanvasHeight = NO_CANVAS_HEIGHT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SVGFigureImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getSVGFigure();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDocumentURI() {
-		return documentURI;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDocumentURI(String newDocumentURI) {
-		String oldDocumentURI = documentURI;
-		documentURI = newDocumentURI;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_FIGURE__DOCUMENT_URI, oldDocumentURI, documentURI));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<SVGProperty> getProperties() {
-		if (properties == null) {
-			properties = new EObjectContainmentEList<SVGProperty>(SVGProperty.class, this, GMFGraphPackage.SVG_FIGURE__PROPERTIES);
-		}
-		return properties;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Rectangle2D getAreaOfInterest() {
-		return areaOfInterest;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAreaOfInterest(Rectangle2D newAreaOfInterest, NotificationChain msgs) {
-		Rectangle2D oldAreaOfInterest = areaOfInterest;
-		areaOfInterest = newAreaOfInterest;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST, oldAreaOfInterest, newAreaOfInterest);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAreaOfInterest(Rectangle2D newAreaOfInterest) {
-		if (newAreaOfInterest != areaOfInterest) {
-			NotificationChain msgs = null;
-			if (areaOfInterest != null)
-				msgs = ((InternalEObject)areaOfInterest).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST, null, msgs);
-			if (newAreaOfInterest != null)
-				msgs = ((InternalEObject)newAreaOfInterest).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST, null, msgs);
-			msgs = basicSetAreaOfInterest(newAreaOfInterest, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST, newAreaOfInterest, newAreaOfInterest));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNoCanvasWidth() {
-		return noCanvasWidth;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNoCanvasWidth(boolean newNoCanvasWidth) {
-		boolean oldNoCanvasWidth = noCanvasWidth;
-		noCanvasWidth = newNoCanvasWidth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_FIGURE__NO_CANVAS_WIDTH, oldNoCanvasWidth, noCanvasWidth));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNoCanvasHeight() {
-		return noCanvasHeight;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNoCanvasHeight(boolean newNoCanvasHeight) {
-		boolean oldNoCanvasHeight = noCanvasHeight;
-		noCanvasHeight = newNoCanvasHeight;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_FIGURE__NO_CANVAS_HEIGHT, oldNoCanvasHeight, noCanvasHeight));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_FIGURE__PROPERTIES:
-				return ((InternalEList<?>)getProperties()).basicRemove(otherEnd, msgs);
-			case GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST:
-				return basicSetAreaOfInterest(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_FIGURE__DOCUMENT_URI:
-				return getDocumentURI();
-			case GMFGraphPackage.SVG_FIGURE__PROPERTIES:
-				return getProperties();
-			case GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST:
-				return getAreaOfInterest();
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_WIDTH:
-				return isNoCanvasWidth();
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_HEIGHT:
-				return isNoCanvasHeight();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_FIGURE__DOCUMENT_URI:
-				setDocumentURI((String)newValue);
-				return;
-			case GMFGraphPackage.SVG_FIGURE__PROPERTIES:
-				getProperties().clear();
-				getProperties().addAll((Collection<? extends SVGProperty>)newValue);
-				return;
-			case GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST:
-				setAreaOfInterest((Rectangle2D)newValue);
-				return;
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_WIDTH:
-				setNoCanvasWidth((Boolean)newValue);
-				return;
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_HEIGHT:
-				setNoCanvasHeight((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_FIGURE__DOCUMENT_URI:
-				setDocumentURI(DOCUMENT_URI_EDEFAULT);
-				return;
-			case GMFGraphPackage.SVG_FIGURE__PROPERTIES:
-				getProperties().clear();
-				return;
-			case GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST:
-				setAreaOfInterest((Rectangle2D)null);
-				return;
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_WIDTH:
-				setNoCanvasWidth(NO_CANVAS_WIDTH_EDEFAULT);
-				return;
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_HEIGHT:
-				setNoCanvasHeight(NO_CANVAS_HEIGHT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_FIGURE__DOCUMENT_URI:
-				return DOCUMENT_URI_EDEFAULT == null ? documentURI != null : !DOCUMENT_URI_EDEFAULT.equals(documentURI);
-			case GMFGraphPackage.SVG_FIGURE__PROPERTIES:
-				return properties != null && !properties.isEmpty();
-			case GMFGraphPackage.SVG_FIGURE__AREA_OF_INTEREST:
-				return areaOfInterest != null;
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_WIDTH:
-				return noCanvasWidth != NO_CANVAS_WIDTH_EDEFAULT;
-			case GMFGraphPackage.SVG_FIGURE__NO_CANVAS_HEIGHT:
-				return noCanvasHeight != NO_CANVAS_HEIGHT_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (documentURI: ");
-		result.append(documentURI);
-		result.append(", noCanvasWidth: ");
-		result.append(noCanvasWidth);
-		result.append(", noCanvasHeight: ");
-		result.append(noCanvasHeight);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SVGFigureImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/SVGPropertyImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/SVGPropertyImpl.java
deleted file mode 100644
index a91ab3135ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/SVGPropertyImpl.java
+++ /dev/null
@@ -1,449 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SVGPropertyImpl.java,v 1.1 2008/07/31 12:17:13 dstadnik Exp $
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGPropertyType;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>SVG Property</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGPropertyImpl#getQuery <em>Query</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGPropertyImpl#getAttribute <em>Attribute</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGPropertyImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGPropertyImpl#getGetter <em>Getter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGPropertyImpl#getSetter <em>Setter</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.SVGPropertyImpl#isCallSuper <em>Call Super</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SVGPropertyImpl extends EObjectImpl implements SVGProperty {
-	/**
-	 * The default value of the '{@link #getQuery() <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQuery()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String QUERY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getQuery() <em>Query</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getQuery()
-	 * @generated
-	 * @ordered
-	 */
-	protected String query = QUERY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getAttribute() <em>Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ATTRIBUTE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected String attribute = ATTRIBUTE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final SVGPropertyType TYPE_EDEFAULT = SVGPropertyType.STRING;
-
-	/**
-	 * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getType()
-	 * @generated
-	 * @ordered
-	 */
-	protected SVGPropertyType type = TYPE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getGetter() <em>Getter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGetter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String GETTER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getGetter() <em>Getter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGetter()
-	 * @generated
-	 * @ordered
-	 */
-	protected String getter = GETTER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSetter() <em>Setter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSetter()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SETTER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSetter() <em>Setter</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSetter()
-	 * @generated
-	 * @ordered
-	 */
-	protected String setter = SETTER_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isCallSuper() <em>Call Super</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCallSuper()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean CALL_SUPER_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCallSuper() <em>Call Super</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCallSuper()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean callSuper = CALL_SUPER_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SVGPropertyImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getSVGProperty();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getQuery() {
-		return query;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setQuery(String newQuery) {
-		String oldQuery = query;
-		query = newQuery;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_PROPERTY__QUERY, oldQuery, query));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAttribute() {
-		return attribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAttribute(String newAttribute) {
-		String oldAttribute = attribute;
-		attribute = newAttribute;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_PROPERTY__ATTRIBUTE, oldAttribute, attribute));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SVGPropertyType getType() {
-		return type;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setType(SVGPropertyType newType) {
-		SVGPropertyType oldType = type;
-		type = newType == null ? TYPE_EDEFAULT : newType;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_PROPERTY__TYPE, oldType, type));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getGetter() {
-		return getter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGetter(String newGetter) {
-		String oldGetter = getter;
-		getter = newGetter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_PROPERTY__GETTER, oldGetter, getter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSetter() {
-		return setter;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSetter(String newSetter) {
-		String oldSetter = setter;
-		setter = newSetter;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_PROPERTY__SETTER, oldSetter, setter));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isCallSuper() {
-		return callSuper;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCallSuper(boolean newCallSuper) {
-		boolean oldCallSuper = callSuper;
-		callSuper = newCallSuper;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SVG_PROPERTY__CALL_SUPER, oldCallSuper, callSuper));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_PROPERTY__QUERY:
-				return getQuery();
-			case GMFGraphPackage.SVG_PROPERTY__ATTRIBUTE:
-				return getAttribute();
-			case GMFGraphPackage.SVG_PROPERTY__TYPE:
-				return getType();
-			case GMFGraphPackage.SVG_PROPERTY__GETTER:
-				return getGetter();
-			case GMFGraphPackage.SVG_PROPERTY__SETTER:
-				return getSetter();
-			case GMFGraphPackage.SVG_PROPERTY__CALL_SUPER:
-				return isCallSuper();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_PROPERTY__QUERY:
-				setQuery((String)newValue);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__ATTRIBUTE:
-				setAttribute((String)newValue);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__TYPE:
-				setType((SVGPropertyType)newValue);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__GETTER:
-				setGetter((String)newValue);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__SETTER:
-				setSetter((String)newValue);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__CALL_SUPER:
-				setCallSuper((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_PROPERTY__QUERY:
-				setQuery(QUERY_EDEFAULT);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__ATTRIBUTE:
-				setAttribute(ATTRIBUTE_EDEFAULT);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__TYPE:
-				setType(TYPE_EDEFAULT);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__GETTER:
-				setGetter(GETTER_EDEFAULT);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__SETTER:
-				setSetter(SETTER_EDEFAULT);
-				return;
-			case GMFGraphPackage.SVG_PROPERTY__CALL_SUPER:
-				setCallSuper(CALL_SUPER_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.SVG_PROPERTY__QUERY:
-				return QUERY_EDEFAULT == null ? query != null : !QUERY_EDEFAULT.equals(query);
-			case GMFGraphPackage.SVG_PROPERTY__ATTRIBUTE:
-				return ATTRIBUTE_EDEFAULT == null ? attribute != null : !ATTRIBUTE_EDEFAULT.equals(attribute);
-			case GMFGraphPackage.SVG_PROPERTY__TYPE:
-				return type != TYPE_EDEFAULT;
-			case GMFGraphPackage.SVG_PROPERTY__GETTER:
-				return GETTER_EDEFAULT == null ? getter != null : !GETTER_EDEFAULT.equals(getter);
-			case GMFGraphPackage.SVG_PROPERTY__SETTER:
-				return SETTER_EDEFAULT == null ? setter != null : !SETTER_EDEFAULT.equals(setter);
-			case GMFGraphPackage.SVG_PROPERTY__CALL_SUPER:
-				return callSuper != CALL_SUPER_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (query: ");
-		result.append(query);
-		result.append(", attribute: ");
-		result.append(attribute);
-		result.append(", type: ");
-		result.append(type);
-		result.append(", getter: ");
-		result.append(getter);
-		result.append(", setter: ");
-		result.append(setter);
-		result.append(", callSuper: ");
-		result.append(callSuper);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SVGPropertyImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ScalablePolygonImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ScalablePolygonImpl.java
deleted file mode 100644
index 4546d299c02..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ScalablePolygonImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Scalable Polygon</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ScalablePolygonImpl extends PolygonImpl implements ScalablePolygon {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ScalablePolygonImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getScalablePolygon();
-	}
-
-} //ScalablePolygonImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ShapeImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ShapeImpl.java
deleted file mode 100644
index 08afb7dcc1c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/ShapeImpl.java
+++ /dev/null
@@ -1,476 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import java.util.ArrayList;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreEList;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.LineKind;
-import org.eclipse.papyrus.gmf.gmfgraph.Shape;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Shape</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl#isOutline <em>Outline</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl#isFill <em>Fill</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl#getLineWidth <em>Line Width</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl#getLineKind <em>Line Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl#isXorFill <em>Xor Fill</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl#isXorOutline <em>Xor Outline</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.ShapeImpl#getResolvedChildren <em>Resolved Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ShapeImpl extends RealFigureImpl implements Shape {
-	/**
-	 * The default value of the '{@link #isOutline() <em>Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOutline()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean OUTLINE_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isOutline() <em>Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isOutline()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean outline = OUTLINE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isFill() <em>Fill</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFill()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean FILL_EDEFAULT = true;
-
-	/**
-	 * The cached value of the '{@link #isFill() <em>Fill</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isFill()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean fill = FILL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLineWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int LINE_WIDTH_EDEFAULT = 1;
-
-	/**
-	 * The cached value of the '{@link #getLineWidth() <em>Line Width</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLineWidth()
-	 * @generated
-	 * @ordered
-	 */
-	protected int lineWidth = LINE_WIDTH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLineKind() <em>Line Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLineKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final LineKind LINE_KIND_EDEFAULT = LineKind.LINE_SOLID_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getLineKind() <em>Line Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLineKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected LineKind lineKind = LINE_KIND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isXorFill() <em>Xor Fill</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isXorFill()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean XOR_FILL_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isXorFill() <em>Xor Fill</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isXorFill()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean xorFill = XOR_FILL_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isXorOutline() <em>Xor Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isXorOutline()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean XOR_OUTLINE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isXorOutline() <em>Xor Outline</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isXorOutline()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean xorOutline = XOR_OUTLINE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ShapeImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getShape();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public EList<Figure> getResolvedChildren() {
-		ArrayList<Figure> r = new ArrayList<Figure>(getChildren().size());
-		for (Figure next : getChildren()) {
-			if (next instanceof FigureRef) {
-				r.add(((FigureRef) next).getFigure());
-			} else {
-				r.add(next);
-			}
-		}
-		return new EcoreEList.UnmodifiableEList<Figure>(this, GMFGraphPackage.eINSTANCE.getShape_ResolvedChildren(), r.size(), r.toArray());
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.SHAPE__OUTLINE:
-				return isOutline();
-			case GMFGraphPackage.SHAPE__FILL:
-				return isFill();
-			case GMFGraphPackage.SHAPE__LINE_WIDTH:
-				return getLineWidth();
-			case GMFGraphPackage.SHAPE__LINE_KIND:
-				return getLineKind();
-			case GMFGraphPackage.SHAPE__XOR_FILL:
-				return isXorFill();
-			case GMFGraphPackage.SHAPE__XOR_OUTLINE:
-				return isXorOutline();
-			case GMFGraphPackage.SHAPE__RESOLVED_CHILDREN:
-				return getResolvedChildren();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.SHAPE__OUTLINE:
-				setOutline((Boolean)newValue);
-				return;
-			case GMFGraphPackage.SHAPE__FILL:
-				setFill((Boolean)newValue);
-				return;
-			case GMFGraphPackage.SHAPE__LINE_WIDTH:
-				setLineWidth((Integer)newValue);
-				return;
-			case GMFGraphPackage.SHAPE__LINE_KIND:
-				setLineKind((LineKind)newValue);
-				return;
-			case GMFGraphPackage.SHAPE__XOR_FILL:
-				setXorFill((Boolean)newValue);
-				return;
-			case GMFGraphPackage.SHAPE__XOR_OUTLINE:
-				setXorOutline((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.SHAPE__OUTLINE:
-				setOutline(OUTLINE_EDEFAULT);
-				return;
-			case GMFGraphPackage.SHAPE__FILL:
-				setFill(FILL_EDEFAULT);
-				return;
-			case GMFGraphPackage.SHAPE__LINE_WIDTH:
-				setLineWidth(LINE_WIDTH_EDEFAULT);
-				return;
-			case GMFGraphPackage.SHAPE__LINE_KIND:
-				setLineKind(LINE_KIND_EDEFAULT);
-				return;
-			case GMFGraphPackage.SHAPE__XOR_FILL:
-				setXorFill(XOR_FILL_EDEFAULT);
-				return;
-			case GMFGraphPackage.SHAPE__XOR_OUTLINE:
-				setXorOutline(XOR_OUTLINE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.SHAPE__OUTLINE:
-				return outline != OUTLINE_EDEFAULT;
-			case GMFGraphPackage.SHAPE__FILL:
-				return fill != FILL_EDEFAULT;
-			case GMFGraphPackage.SHAPE__LINE_WIDTH:
-				return lineWidth != LINE_WIDTH_EDEFAULT;
-			case GMFGraphPackage.SHAPE__LINE_KIND:
-				return lineKind != LINE_KIND_EDEFAULT;
-			case GMFGraphPackage.SHAPE__XOR_FILL:
-				return xorFill != XOR_FILL_EDEFAULT;
-			case GMFGraphPackage.SHAPE__XOR_OUTLINE:
-				return xorOutline != XOR_OUTLINE_EDEFAULT;
-			case GMFGraphPackage.SHAPE__RESOLVED_CHILDREN:
-				return !getResolvedChildren().isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isOutline() {
-		return outline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOutline(boolean newOutline) {
-		boolean oldOutline = outline;
-		outline = newOutline;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SHAPE__OUTLINE, oldOutline, outline));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isFill() {
-		return fill;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFill(boolean newFill) {
-		boolean oldFill = fill;
-		fill = newFill;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SHAPE__FILL, oldFill, fill));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getLineWidth() {
-		return lineWidth;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLineWidth(int newLineWidth) {
-		int oldLineWidth = lineWidth;
-		lineWidth = newLineWidth;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SHAPE__LINE_WIDTH, oldLineWidth, lineWidth));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LineKind getLineKind() {
-		return lineKind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLineKind(LineKind newLineKind) {
-		LineKind oldLineKind = lineKind;
-		lineKind = newLineKind == null ? LINE_KIND_EDEFAULT : newLineKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SHAPE__LINE_KIND, oldLineKind, lineKind));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isXorFill() {
-		return xorFill;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setXorFill(boolean newXorFill) {
-		boolean oldXorFill = xorFill;
-		xorFill = newXorFill;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SHAPE__XOR_FILL, oldXorFill, xorFill));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isXorOutline() {
-		return xorOutline;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setXorOutline(boolean newXorOutline) {
-		boolean oldXorOutline = xorOutline;
-		xorOutline = newXorOutline;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.SHAPE__XOR_OUTLINE, oldXorOutline, xorOutline));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (outline: ");
-		result.append(outline);
-		result.append(", fill: ");
-		result.append(fill);
-		result.append(", lineWidth: ");
-		result.append(lineWidth);
-		result.append(", lineKind: ");
-		result.append(lineKind);
-		result.append(", xorFill: ");
-		result.append(xorFill);
-		result.append(", xorOutline: ");
-		result.append(xorOutline);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ShapeImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/StackLayoutImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/StackLayoutImpl.java
deleted file mode 100644
index da209cb38d2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/StackLayoutImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.StackLayout;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Stack Layout</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class StackLayoutImpl extends EObjectImpl implements StackLayout {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StackLayoutImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getStackLayout();
-	}
-
-} //StackLayoutImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/VerticalLabelImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/VerticalLabelImpl.java
deleted file mode 100644
index 936f2beb527..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/VerticalLabelImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Vertical Label</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.VerticalLabelImpl#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class VerticalLabelImpl extends RealFigureImpl implements VerticalLabel {
-	/**
-	 * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TEXT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected String text = TEXT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VerticalLabelImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getVerticalLabel();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setText(String newText) {
-		String oldText = text;
-		text = newText;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.VERTICAL_LABEL__TEXT, oldText, text));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.VERTICAL_LABEL__TEXT:
-				return getText();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.VERTICAL_LABEL__TEXT:
-				setText((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.VERTICAL_LABEL__TEXT:
-				setText(TEXT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.VERTICAL_LABEL__TEXT:
-				return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (text: ");
-		result.append(text);
-		result.append(')');
-		return result.toString();
-	}
-
-} //VerticalLabelImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/VisiblePinImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/VisiblePinImpl.java
deleted file mode 100644
index 07cb8dff4d9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/VisiblePinImpl.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.VisiblePin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Visible Pin</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.VisiblePinImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class VisiblePinImpl extends EObjectImpl implements VisiblePin {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VisiblePinImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getVisiblePin();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.VISIBLE_PIN__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getOperationName() {
-		return "setVisible";
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getOperationType() {
-		return "Boolean";
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.VISIBLE_PIN__NAME:
-				return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.VISIBLE_PIN__NAME:
-				setName((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.VISIBLE_PIN__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.VISIBLE_PIN__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //VisiblePinImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/XYLayoutDataImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/XYLayoutDataImpl.java
deleted file mode 100644
index f65f45ab22b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/XYLayoutDataImpl.java
+++ /dev/null
@@ -1,344 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Layoutable;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>XY Layout Data</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.XYLayoutDataImpl#getOwner <em>Owner</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.XYLayoutDataImpl#getTopLeft <em>Top Left</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.gmfgraph.impl.XYLayoutDataImpl#getSize <em>Size</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class XYLayoutDataImpl extends EObjectImpl implements XYLayoutData {
-	/**
-	 * The cached value of the '{@link #getTopLeft() <em>Top Left</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTopLeft()
-	 * @generated
-	 * @ordered
-	 */
-	protected Point topLeft;
-
-	/**
-	 * The cached value of the '{@link #getSize() <em>Size</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSize()
-	 * @generated
-	 * @ordered
-	 */
-	protected Dimension size;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XYLayoutDataImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getXYLayoutData();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Layoutable getOwner() {
-		if (eContainerFeatureID() != GMFGraphPackage.XY_LAYOUT_DATA__OWNER) return null;
-		return (Layoutable)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOwner(Layoutable newOwner, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newOwner, GMFGraphPackage.XY_LAYOUT_DATA__OWNER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOwner(Layoutable newOwner) {
-		if (newOwner != eInternalContainer() || (eContainerFeatureID() != GMFGraphPackage.XY_LAYOUT_DATA__OWNER && newOwner != null)) {
-			if (EcoreUtil.isAncestor(this, newOwner))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newOwner != null)
-				msgs = ((InternalEObject)newOwner).eInverseAdd(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
-			msgs = basicSetOwner(newOwner, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__OWNER, newOwner, newOwner));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Point getTopLeft() {
-		return topLeft;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTopLeft(Point newTopLeft, NotificationChain msgs) {
-		Point oldTopLeft = topLeft;
-		topLeft = newTopLeft;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT, oldTopLeft, newTopLeft);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTopLeft(Point newTopLeft) {
-		if (newTopLeft != topLeft) {
-			NotificationChain msgs = null;
-			if (topLeft != null)
-				msgs = ((InternalEObject)topLeft).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT, null, msgs);
-			if (newTopLeft != null)
-				msgs = ((InternalEObject)newTopLeft).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT, null, msgs);
-			msgs = basicSetTopLeft(newTopLeft, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT, newTopLeft, newTopLeft));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Dimension getSize() {
-		return size;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSize(Dimension newSize, NotificationChain msgs) {
-		Dimension oldSize = size;
-		size = newSize;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__SIZE, oldSize, newSize);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSize(Dimension newSize) {
-		if (newSize != size) {
-			NotificationChain msgs = null;
-			if (size != null)
-				msgs = ((InternalEObject)size).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.XY_LAYOUT_DATA__SIZE, null, msgs);
-			if (newSize != null)
-				msgs = ((InternalEObject)newSize).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFGraphPackage.XY_LAYOUT_DATA__SIZE, null, msgs);
-			msgs = basicSetSize(newSize, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFGraphPackage.XY_LAYOUT_DATA__SIZE, newSize, newSize));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetOwner((Layoutable)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
-				return basicSetOwner(null, msgs);
-			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
-				return basicSetTopLeft(null, msgs);
-			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
-				return basicSetSize(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
-				return eInternalContainer().eInverseRemove(this, GMFGraphPackage.LAYOUTABLE__LAYOUT_DATA, Layoutable.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
-				return getOwner();
-			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
-				return getTopLeft();
-			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
-				return getSize();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
-				setOwner((Layoutable)newValue);
-				return;
-			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
-				setTopLeft((Point)newValue);
-				return;
-			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
-				setSize((Dimension)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
-				setOwner((Layoutable)null);
-				return;
-			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
-				setTopLeft((Point)null);
-				return;
-			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
-				setSize((Dimension)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFGraphPackage.XY_LAYOUT_DATA__OWNER:
-				return getOwner() != null;
-			case GMFGraphPackage.XY_LAYOUT_DATA__TOP_LEFT:
-				return topLeft != null;
-			case GMFGraphPackage.XY_LAYOUT_DATA__SIZE:
-				return size != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //XYLayoutDataImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/XYLayoutImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/XYLayoutImpl.java
deleted file mode 100644
index 3da395b5fb1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/impl/XYLayoutImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayout;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>XY Layout</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class XYLayoutImpl extends EObjectImpl implements XYLayout {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected XYLayoutImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFGraphPackage.eINSTANCE.getXYLayout();
-	}
-
-} //XYLayoutImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/Assistant.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/Assistant.java
deleted file mode 100644
index 15569d0906f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/Assistant.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-package org.eclipse.papyrus.gmf.gmfgraph.util;
-
-import org.eclipse.emf.common.util.URI;
-
-/**
- * Utility methods to deal with sample/shared/well-known models that are part of this plug-in.  
- * @author artem
- */
-public class Assistant {
-	private static URI basicGraphDef;
-
-	public static URI getBasicGraphDef() {
-		if (basicGraphDef == null) {
-			basicGraphDef = URI.createURI("platform:/plugin/org.eclipse.papyrus.gmf.graphdef/models/basic.gmfgraph");
-		}
-		return basicGraphDef;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/GMFGraphAdapterFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/GMFGraphAdapterFactory.java
deleted file mode 100644
index ee2870e44e0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/GMFGraphAdapterFactory.java
+++ /dev/null
@@ -1,1656 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractNode;
-import org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.BasicFont;
-import org.eclipse.papyrus.gmf.gmfgraph.Border;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.CenterLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Color;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorPin;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.ConstantColor;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomClass;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomPin;
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.Ellipse;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.Font;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GradientFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.Identity;
-import org.eclipse.papyrus.gmf.gmfgraph.Insets;
-import org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.Label;
-import org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer;
-import org.eclipse.papyrus.gmf.gmfgraph.Layout;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Layoutable;
-import org.eclipse.papyrus.gmf.gmfgraph.LineBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.MarginBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.Pin;
-import org.eclipse.papyrus.gmf.gmfgraph.PinOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-import org.eclipse.papyrus.gmf.gmfgraph.Polygon;
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.RGBColor;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D;
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty;
-import org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon;
-import org.eclipse.papyrus.gmf.gmfgraph.Shape;
-import org.eclipse.papyrus.gmf.gmfgraph.StackLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.VisiblePin;
-import org.eclipse.papyrus.gmf.gmfgraph.VisualFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage
- * @generated
- */
-public class GMFGraphAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static GMFGraphPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = GMFGraphPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GMFGraphSwitch<Adapter> modelSwitch =
-		new GMFGraphSwitch<Adapter>() {
-			@Override
-			public Adapter caseCanvas(Canvas object) {
-				return createCanvasAdapter();
-			}
-			@Override
-			public Adapter caseFigureGallery(FigureGallery object) {
-				return createFigureGalleryAdapter();
-			}
-			@Override
-			public Adapter caseIdentity(Identity object) {
-				return createIdentityAdapter();
-			}
-			@Override
-			public Adapter caseDiagramElement(DiagramElement object) {
-				return createDiagramElementAdapter();
-			}
-			@Override
-			public Adapter caseAbstractNode(AbstractNode object) {
-				return createAbstractNodeAdapter();
-			}
-			@Override
-			public Adapter caseNode(Node object) {
-				return createNodeAdapter();
-			}
-			@Override
-			public Adapter caseConnection(Connection object) {
-				return createConnectionAdapter();
-			}
-			@Override
-			public Adapter caseCompartment(Compartment object) {
-				return createCompartmentAdapter();
-			}
-			@Override
-			public Adapter caseDiagramLabel(DiagramLabel object) {
-				return createDiagramLabelAdapter();
-			}
-			@Override
-			public Adapter caseVisualFacet(VisualFacet object) {
-				return createVisualFacetAdapter();
-			}
-			@Override
-			public Adapter caseGeneralFacet(GeneralFacet object) {
-				return createGeneralFacetAdapter();
-			}
-			@Override
-			public Adapter caseAlignmentFacet(AlignmentFacet object) {
-				return createAlignmentFacetAdapter();
-			}
-			@Override
-			public Adapter caseGradientFacet(GradientFacet object) {
-				return createGradientFacetAdapter();
-			}
-			@Override
-			public Adapter caseLabelOffsetFacet(LabelOffsetFacet object) {
-				return createLabelOffsetFacetAdapter();
-			}
-			@Override
-			public Adapter caseDefaultSizeFacet(DefaultSizeFacet object) {
-				return createDefaultSizeFacetAdapter();
-			}
-			@Override
-			public Adapter caseFigure(Figure object) {
-				return createFigureAdapter();
-			}
-			@Override
-			public Adapter caseAbstractFigure(AbstractFigure object) {
-				return createAbstractFigureAdapter();
-			}
-			@Override
-			public Adapter caseFigureDescriptor(FigureDescriptor object) {
-				return createFigureDescriptorAdapter();
-			}
-			@Override
-			public Adapter caseChildAccess(ChildAccess object) {
-				return createChildAccessAdapter();
-			}
-			@Override
-			public Adapter caseRealFigure(RealFigure object) {
-				return createRealFigureAdapter();
-			}
-			@Override
-			public Adapter caseFigureRef(FigureRef object) {
-				return createFigureRefAdapter();
-			}
-			@Override
-			public Adapter caseConnectionFigure(ConnectionFigure object) {
-				return createConnectionFigureAdapter();
-			}
-			@Override
-			public Adapter caseDecorationFigure(DecorationFigure object) {
-				return createDecorationFigureAdapter();
-			}
-			@Override
-			public Adapter caseShape(Shape object) {
-				return createShapeAdapter();
-			}
-			@Override
-			public Adapter caseLabel(Label object) {
-				return createLabelAdapter();
-			}
-			@Override
-			public Adapter caseLabeledContainer(LabeledContainer object) {
-				return createLabeledContainerAdapter();
-			}
-			@Override
-			public Adapter caseVerticalLabel(VerticalLabel object) {
-				return createVerticalLabelAdapter();
-			}
-			@Override
-			public Adapter caseRectangle(Rectangle object) {
-				return createRectangleAdapter();
-			}
-			@Override
-			public Adapter caseInvisibleRectangle(InvisibleRectangle object) {
-				return createInvisibleRectangleAdapter();
-			}
-			@Override
-			public Adapter caseRoundedRectangle(RoundedRectangle object) {
-				return createRoundedRectangleAdapter();
-			}
-			@Override
-			public Adapter caseEllipse(Ellipse object) {
-				return createEllipseAdapter();
-			}
-			@Override
-			public Adapter casePolyline(Polyline object) {
-				return createPolylineAdapter();
-			}
-			@Override
-			public Adapter casePolygon(Polygon object) {
-				return createPolygonAdapter();
-			}
-			@Override
-			public Adapter caseScalablePolygon(ScalablePolygon object) {
-				return createScalablePolygonAdapter();
-			}
-			@Override
-			public Adapter casePolylineConnection(PolylineConnection object) {
-				return createPolylineConnectionAdapter();
-			}
-			@Override
-			public Adapter casePolylineDecoration(PolylineDecoration object) {
-				return createPolylineDecorationAdapter();
-			}
-			@Override
-			public Adapter casePolygonDecoration(PolygonDecoration object) {
-				return createPolygonDecorationAdapter();
-			}
-			@Override
-			public Adapter caseCustomAttributeOwner(CustomAttributeOwner object) {
-				return createCustomAttributeOwnerAdapter();
-			}
-			@Override
-			public Adapter caseCustomClass(CustomClass object) {
-				return createCustomClassAdapter();
-			}
-			@Override
-			public Adapter caseCustomAttribute(CustomAttribute object) {
-				return createCustomAttributeAdapter();
-			}
-			@Override
-			public Adapter caseFigureAccessor(FigureAccessor object) {
-				return createFigureAccessorAdapter();
-			}
-			@Override
-			public Adapter caseCustomFigure(CustomFigure object) {
-				return createCustomFigureAdapter();
-			}
-			@Override
-			public Adapter caseCustomDecoration(CustomDecoration object) {
-				return createCustomDecorationAdapter();
-			}
-			@Override
-			public Adapter caseCustomConnection(CustomConnection object) {
-				return createCustomConnectionAdapter();
-			}
-			@Override
-			public Adapter caseColor(Color object) {
-				return createColorAdapter();
-			}
-			@Override
-			public Adapter caseRGBColor(RGBColor object) {
-				return createRGBColorAdapter();
-			}
-			@Override
-			public Adapter caseConstantColor(ConstantColor object) {
-				return createConstantColorAdapter();
-			}
-			@Override
-			public Adapter caseFont(Font object) {
-				return createFontAdapter();
-			}
-			@Override
-			public Adapter caseBasicFont(BasicFont object) {
-				return createBasicFontAdapter();
-			}
-			@Override
-			public Adapter casePoint(Point object) {
-				return createPointAdapter();
-			}
-			@Override
-			public Adapter caseDimension(Dimension object) {
-				return createDimensionAdapter();
-			}
-			@Override
-			public Adapter caseInsets(Insets object) {
-				return createInsetsAdapter();
-			}
-			@Override
-			public Adapter caseBorder(Border object) {
-				return createBorderAdapter();
-			}
-			@Override
-			public Adapter caseBorderRef(BorderRef object) {
-				return createBorderRefAdapter();
-			}
-			@Override
-			public Adapter caseLineBorder(LineBorder object) {
-				return createLineBorderAdapter();
-			}
-			@Override
-			public Adapter caseMarginBorder(MarginBorder object) {
-				return createMarginBorderAdapter();
-			}
-			@Override
-			public Adapter caseCompoundBorder(CompoundBorder object) {
-				return createCompoundBorderAdapter();
-			}
-			@Override
-			public Adapter caseCustomBorder(CustomBorder object) {
-				return createCustomBorderAdapter();
-			}
-			@Override
-			public Adapter caseLayoutData(LayoutData object) {
-				return createLayoutDataAdapter();
-			}
-			@Override
-			public Adapter caseCustomLayoutData(CustomLayoutData object) {
-				return createCustomLayoutDataAdapter();
-			}
-			@Override
-			public Adapter caseGridLayoutData(GridLayoutData object) {
-				return createGridLayoutDataAdapter();
-			}
-			@Override
-			public Adapter caseBorderLayoutData(BorderLayoutData object) {
-				return createBorderLayoutDataAdapter();
-			}
-			@Override
-			public Adapter caseLayoutable(Layoutable object) {
-				return createLayoutableAdapter();
-			}
-			@Override
-			public Adapter caseLayout(Layout object) {
-				return createLayoutAdapter();
-			}
-			@Override
-			public Adapter caseLayoutRef(LayoutRef object) {
-				return createLayoutRefAdapter();
-			}
-			@Override
-			public Adapter caseCustomLayout(CustomLayout object) {
-				return createCustomLayoutAdapter();
-			}
-			@Override
-			public Adapter caseGridLayout(GridLayout object) {
-				return createGridLayoutAdapter();
-			}
-			@Override
-			public Adapter caseBorderLayout(BorderLayout object) {
-				return createBorderLayoutAdapter();
-			}
-			@Override
-			public Adapter caseFlowLayout(FlowLayout object) {
-				return createFlowLayoutAdapter();
-			}
-			@Override
-			public Adapter caseXYLayout(XYLayout object) {
-				return createXYLayoutAdapter();
-			}
-			@Override
-			public Adapter caseXYLayoutData(XYLayoutData object) {
-				return createXYLayoutDataAdapter();
-			}
-			@Override
-			public Adapter caseStackLayout(StackLayout object) {
-				return createStackLayoutAdapter();
-			}
-			@Override
-			public Adapter caseCenterLayout(CenterLayout object) {
-				return createCenterLayoutAdapter();
-			}
-			@Override
-			public Adapter caseSVGFigure(SVGFigure object) {
-				return createSVGFigureAdapter();
-			}
-			@Override
-			public Adapter caseSVGProperty(SVGProperty object) {
-				return createSVGPropertyAdapter();
-			}
-			@Override
-			public Adapter caseRectangle2D(Rectangle2D object) {
-				return createRectangle2DAdapter();
-			}
-			@Override
-			public Adapter casePin(Pin object) {
-				return createPinAdapter();
-			}
-			@Override
-			public Adapter caseCustomPin(CustomPin object) {
-				return createCustomPinAdapter();
-			}
-			@Override
-			public Adapter caseColorPin(ColorPin object) {
-				return createColorPinAdapter();
-			}
-			@Override
-			public Adapter caseVisiblePin(VisiblePin object) {
-				return createVisiblePinAdapter();
-			}
-			@Override
-			public Adapter casePinOwner(PinOwner object) {
-				return createPinOwnerAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Canvas <em>Canvas</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Canvas
-	 * @generated
-	 */
-	public Adapter createCanvasAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureGallery <em>Figure Gallery</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureGallery
-	 * @generated
-	 */
-	public Adapter createFigureGalleryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Identity <em>Identity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Identity
-	 * @generated
-	 */
-	public Adapter createIdentityAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramElement <em>Diagram Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramElement
-	 * @generated
-	 */
-	public Adapter createDiagramElementAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.AbstractNode <em>Abstract Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.AbstractNode
-	 * @generated
-	 */
-	public Adapter createAbstractNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Node <em>Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Node
-	 * @generated
-	 */
-	public Adapter createNodeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.ChildAccess <em>Child Access</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ChildAccess
-	 * @generated
-	 */
-	public Adapter createChildAccessAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.RealFigure <em>Real Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RealFigure
-	 * @generated
-	 */
-	public Adapter createRealFigureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Connection <em>Connection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Connection
-	 * @generated
-	 */
-	public Adapter createConnectionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Compartment <em>Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Compartment
-	 * @generated
-	 */
-	public Adapter createCompartmentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel <em>Diagram Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel
-	 * @generated
-	 */
-	public Adapter createDiagramLabelAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.VisualFacet <em>Visual Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.VisualFacet
-	 * @generated
-	 */
-	public Adapter createVisualFacetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet <em>General Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet
-	 * @generated
-	 */
-	public Adapter createGeneralFacetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet <em>Alignment Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet
-	 * @generated
-	 */
-	public Adapter createAlignmentFacetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.GradientFacet <em>Gradient Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GradientFacet
-	 * @generated
-	 */
-	public Adapter createGradientFacetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet <em>Label Offset Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet
-	 * @generated
-	 */
-	public Adapter createLabelOffsetFacetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet <em>Default Size Facet</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet
-	 * @generated
-	 */
-	public Adapter createDefaultSizeFacetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Figure <em>Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Figure
-	 * @generated
-	 */
-	public Adapter createFigureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor <em>Figure Descriptor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor
-	 * @generated
-	 */
-	public Adapter createFigureDescriptorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure <em>Abstract Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure
-	 * @generated
-	 */
-	public Adapter createAbstractFigureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureRef <em>Figure Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureRef
-	 * @generated
-	 */
-	public Adapter createFigureRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure <em>Connection Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure
-	 * @generated
-	 */
-	public Adapter createConnectionFigureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure <em>Decoration Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure
-	 * @generated
-	 */
-	public Adapter createDecorationFigureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Shape <em>Shape</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Shape
-	 * @generated
-	 */
-	public Adapter createShapeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Label <em>Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Label
-	 * @generated
-	 */
-	public Adapter createLabelAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer <em>Labeled Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer
-	 * @generated
-	 */
-	public Adapter createLabeledContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel <em>Vertical Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel
-	 * @generated
-	 */
-	public Adapter createVerticalLabelAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle <em>Rectangle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Rectangle
-	 * @generated
-	 */
-	public Adapter createRectangleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle <em>Invisible Rectangle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle
-	 * @generated
-	 */
-	public Adapter createInvisibleRectangleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle <em>Rounded Rectangle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle
-	 * @generated
-	 */
-	public Adapter createRoundedRectangleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Ellipse <em>Ellipse</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Ellipse
-	 * @generated
-	 */
-	public Adapter createEllipseAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Polyline <em>Polyline</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Polyline
-	 * @generated
-	 */
-	public Adapter createPolylineAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Polygon <em>Polygon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Polygon
-	 * @generated
-	 */
-	public Adapter createPolygonAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon <em>Scalable Polygon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon
-	 * @generated
-	 */
-	public Adapter createScalablePolygonAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection <em>Polyline Connection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection
-	 * @generated
-	 */
-	public Adapter createPolylineConnectionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration <em>Polyline Decoration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration
-	 * @generated
-	 */
-	public Adapter createPolylineDecorationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration <em>Polygon Decoration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration
-	 * @generated
-	 */
-	public Adapter createPolygonDecorationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner <em>Custom Attribute Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner
-	 * @generated
-	 */
-	public Adapter createCustomAttributeOwnerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomClass <em>Custom Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomClass
-	 * @generated
-	 */
-	public Adapter createCustomClassAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomFigure <em>Custom Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomFigure
-	 * @generated
-	 */
-	public Adapter createCustomFigureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration <em>Custom Decoration</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration
-	 * @generated
-	 */
-	public Adapter createCustomDecorationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomConnection <em>Custom Connection</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomConnection
-	 * @generated
-	 */
-	public Adapter createCustomConnectionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Color <em>Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Color
-	 * @generated
-	 */
-	public Adapter createColorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.RGBColor <em>RGB Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.RGBColor
-	 * @generated
-	 */
-	public Adapter createRGBColorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.ConstantColor <em>Constant Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ConstantColor
-	 * @generated
-	 */
-	public Adapter createConstantColorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Font <em>Font</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Font
-	 * @generated
-	 */
-	public Adapter createFontAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.BasicFont <em>Basic Font</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BasicFont
-	 * @generated
-	 */
-	public Adapter createBasicFontAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Point <em>Point</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Point
-	 * @generated
-	 */
-	public Adapter createPointAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Dimension <em>Dimension</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Dimension
-	 * @generated
-	 */
-	public Adapter createDimensionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Insets <em>Insets</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Insets
-	 * @generated
-	 */
-	public Adapter createInsetsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Border <em>Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Border
-	 * @generated
-	 */
-	public Adapter createBorderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderRef <em>Border Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderRef
-	 * @generated
-	 */
-	public Adapter createBorderRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.LineBorder <em>Line Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LineBorder
-	 * @generated
-	 */
-	public Adapter createLineBorderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.MarginBorder <em>Margin Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.MarginBorder
-	 * @generated
-	 */
-	public Adapter createMarginBorderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder <em>Compound Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder
-	 * @generated
-	 */
-	public Adapter createCompoundBorderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomBorder <em>Custom Border</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomBorder
-	 * @generated
-	 */
-	public Adapter createCustomBorderAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutData <em>Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LayoutData
-	 * @generated
-	 */
-	public Adapter createLayoutDataAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData <em>Custom Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData
-	 * @generated
-	 */
-	public Adapter createCustomLayoutDataAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData <em>Grid Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData
-	 * @generated
-	 */
-	public Adapter createGridLayoutDataAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData <em>Border Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData
-	 * @generated
-	 */
-	public Adapter createBorderLayoutDataAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Layoutable <em>Layoutable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layoutable
-	 * @generated
-	 */
-	public Adapter createLayoutableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Layout <em>Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Layout
-	 * @generated
-	 */
-	public Adapter createLayoutAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.LayoutRef <em>Layout Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.LayoutRef
-	 * @generated
-	 */
-	public Adapter createLayoutRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomLayout <em>Custom Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomLayout
-	 * @generated
-	 */
-	public Adapter createCustomLayoutAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.GridLayout <em>Grid Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.GridLayout
-	 * @generated
-	 */
-	public Adapter createGridLayoutAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.BorderLayout <em>Border Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.BorderLayout
-	 * @generated
-	 */
-	public Adapter createBorderLayoutAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute <em>Custom Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute
-	 * @generated
-	 */
-	public Adapter createCustomAttributeAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor <em>Figure Accessor</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor
-	 * @generated
-	 */
-	public Adapter createFigureAccessorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.FlowLayout <em>Flow Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.FlowLayout
-	 * @generated
-	 */
-	public Adapter createFlowLayoutAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayout <em>XY Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.XYLayout
-	 * @generated
-	 */
-	public Adapter createXYLayoutAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData <em>XY Layout Data</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData
-	 * @generated
-	 */
-	public Adapter createXYLayoutDataAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.StackLayout <em>Stack Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.StackLayout
-	 * @generated
-	 */
-	public Adapter createStackLayoutAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CenterLayout <em>Center Layout</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CenterLayout
-	 * @generated
-	 */
-	public Adapter createCenterLayoutAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGFigure <em>SVG Figure</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGFigure
-	 * @generated
-	 */
-	public Adapter createSVGFigureAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.SVGProperty <em>SVG Property</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.SVGProperty
-	 * @generated
-	 */
-	public Adapter createSVGPropertyAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D <em>Rectangle2 D</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D
-	 * @generated
-	 */
-	public Adapter createRectangle2DAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.Pin <em>Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.Pin
-	 * @generated
-	 */
-	public Adapter createPinAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.CustomPin <em>Custom Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.CustomPin
-	 * @generated
-	 */
-	public Adapter createCustomPinAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.ColorPin <em>Color Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.ColorPin
-	 * @generated
-	 */
-	public Adapter createColorPinAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.VisiblePin <em>Visible Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.VisiblePin
-	 * @generated
-	 */
-	public Adapter createVisiblePinAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.gmfgraph.PinOwner <em>Pin Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.gmfgraph.PinOwner
-	 * @generated
-	 */
-	public Adapter createPinOwnerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //GMFGraphAdapterFactory
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/GMFGraphSwitch.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/GMFGraphSwitch.java
deleted file mode 100644
index 99c538922e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/gmfgraph/util/GMFGraphSwitch.java
+++ /dev/null
@@ -1,2100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.gmfgraph.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.AbstractNode;
-import org.eclipse.papyrus.gmf.gmfgraph.AlignmentFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.BasicFont;
-import org.eclipse.papyrus.gmf.gmfgraph.Border;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.BorderRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.CenterLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Color;
-import org.eclipse.papyrus.gmf.gmfgraph.ColorPin;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.CompoundBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.gmfgraph.ConnectionFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.ConstantColor;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttribute;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomAttributeOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomClass;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomPin;
-import org.eclipse.papyrus.gmf.gmfgraph.DecorationFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.DefaultSizeFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Dimension;
-import org.eclipse.papyrus.gmf.gmfgraph.Ellipse;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureRef;
-import org.eclipse.papyrus.gmf.gmfgraph.FlowLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.Font;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.GeneralFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GradientFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.GridLayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.Identity;
-import org.eclipse.papyrus.gmf.gmfgraph.Insets;
-import org.eclipse.papyrus.gmf.gmfgraph.InvisibleRectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.Label;
-import org.eclipse.papyrus.gmf.gmfgraph.LabelOffsetFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.LabeledContainer;
-import org.eclipse.papyrus.gmf.gmfgraph.Layout;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutData;
-import org.eclipse.papyrus.gmf.gmfgraph.LayoutRef;
-import org.eclipse.papyrus.gmf.gmfgraph.Layoutable;
-import org.eclipse.papyrus.gmf.gmfgraph.LineBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.MarginBorder;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.gmfgraph.Pin;
-import org.eclipse.papyrus.gmf.gmfgraph.PinOwner;
-import org.eclipse.papyrus.gmf.gmfgraph.Point;
-import org.eclipse.papyrus.gmf.gmfgraph.Polygon;
-import org.eclipse.papyrus.gmf.gmfgraph.PolygonDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.Polyline;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineConnection;
-import org.eclipse.papyrus.gmf.gmfgraph.PolylineDecoration;
-import org.eclipse.papyrus.gmf.gmfgraph.RGBColor;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.Rectangle2D;
-import org.eclipse.papyrus.gmf.gmfgraph.RoundedRectangle;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.SVGProperty;
-import org.eclipse.papyrus.gmf.gmfgraph.ScalablePolygon;
-import org.eclipse.papyrus.gmf.gmfgraph.Shape;
-import org.eclipse.papyrus.gmf.gmfgraph.StackLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.VerticalLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.VisiblePin;
-import org.eclipse.papyrus.gmf.gmfgraph.VisualFacet;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayout;
-import org.eclipse.papyrus.gmf.gmfgraph.XYLayoutData;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage
- * @generated
- */
-public class GMFGraphSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static GMFGraphPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFGraphSwitch() {
-		if (modelPackage == null) {
-			modelPackage = GMFGraphPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case GMFGraphPackage.CANVAS: {
-				Canvas canvas = (Canvas)theEObject;
-				T result = caseCanvas(canvas);
-				if (result == null) result = caseIdentity(canvas);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.FIGURE_GALLERY: {
-				FigureGallery figureGallery = (FigureGallery)theEObject;
-				T result = caseFigureGallery(figureGallery);
-				if (result == null) result = caseIdentity(figureGallery);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.IDENTITY: {
-				Identity identity = (Identity)theEObject;
-				T result = caseIdentity(identity);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.DIAGRAM_ELEMENT: {
-				DiagramElement diagramElement = (DiagramElement)theEObject;
-				T result = caseDiagramElement(diagramElement);
-				if (result == null) result = caseIdentity(diagramElement);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.ABSTRACT_NODE: {
-				AbstractNode abstractNode = (AbstractNode)theEObject;
-				T result = caseAbstractNode(abstractNode);
-				if (result == null) result = caseDiagramElement(abstractNode);
-				if (result == null) result = caseIdentity(abstractNode);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.NODE: {
-				Node node = (Node)theEObject;
-				T result = caseNode(node);
-				if (result == null) result = caseAbstractNode(node);
-				if (result == null) result = caseDiagramElement(node);
-				if (result == null) result = caseIdentity(node);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CONNECTION: {
-				Connection connection = (Connection)theEObject;
-				T result = caseConnection(connection);
-				if (result == null) result = caseDiagramElement(connection);
-				if (result == null) result = caseIdentity(connection);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.COMPARTMENT: {
-				Compartment compartment = (Compartment)theEObject;
-				T result = caseCompartment(compartment);
-				if (result == null) result = caseDiagramElement(compartment);
-				if (result == null) result = caseIdentity(compartment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.DIAGRAM_LABEL: {
-				DiagramLabel diagramLabel = (DiagramLabel)theEObject;
-				T result = caseDiagramLabel(diagramLabel);
-				if (result == null) result = caseNode(diagramLabel);
-				if (result == null) result = caseAbstractNode(diagramLabel);
-				if (result == null) result = caseDiagramElement(diagramLabel);
-				if (result == null) result = caseIdentity(diagramLabel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.VISUAL_FACET: {
-				VisualFacet visualFacet = (VisualFacet)theEObject;
-				T result = caseVisualFacet(visualFacet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.GENERAL_FACET: {
-				GeneralFacet generalFacet = (GeneralFacet)theEObject;
-				T result = caseGeneralFacet(generalFacet);
-				if (result == null) result = caseVisualFacet(generalFacet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.ALIGNMENT_FACET: {
-				AlignmentFacet alignmentFacet = (AlignmentFacet)theEObject;
-				T result = caseAlignmentFacet(alignmentFacet);
-				if (result == null) result = caseVisualFacet(alignmentFacet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.GRADIENT_FACET: {
-				GradientFacet gradientFacet = (GradientFacet)theEObject;
-				T result = caseGradientFacet(gradientFacet);
-				if (result == null) result = caseVisualFacet(gradientFacet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.LABEL_OFFSET_FACET: {
-				LabelOffsetFacet labelOffsetFacet = (LabelOffsetFacet)theEObject;
-				T result = caseLabelOffsetFacet(labelOffsetFacet);
-				if (result == null) result = caseVisualFacet(labelOffsetFacet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.DEFAULT_SIZE_FACET: {
-				DefaultSizeFacet defaultSizeFacet = (DefaultSizeFacet)theEObject;
-				T result = caseDefaultSizeFacet(defaultSizeFacet);
-				if (result == null) result = caseVisualFacet(defaultSizeFacet);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.FIGURE: {
-				Figure figure = (Figure)theEObject;
-				T result = caseFigure(figure);
-				if (result == null) result = caseLayoutable(figure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.ABSTRACT_FIGURE: {
-				AbstractFigure abstractFigure = (AbstractFigure)theEObject;
-				T result = caseAbstractFigure(abstractFigure);
-				if (result == null) result = caseFigure(abstractFigure);
-				if (result == null) result = caseLayoutable(abstractFigure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.FIGURE_DESCRIPTOR: {
-				FigureDescriptor figureDescriptor = (FigureDescriptor)theEObject;
-				T result = caseFigureDescriptor(figureDescriptor);
-				if (result == null) result = caseIdentity(figureDescriptor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CHILD_ACCESS: {
-				ChildAccess childAccess = (ChildAccess)theEObject;
-				T result = caseChildAccess(childAccess);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.REAL_FIGURE: {
-				RealFigure realFigure = (RealFigure)theEObject;
-				T result = caseRealFigure(realFigure);
-				if (result == null) result = caseAbstractFigure(realFigure);
-				if (result == null) result = casePinOwner(realFigure);
-				if (result == null) result = caseCustomAttributeOwner(realFigure);
-				if (result == null) result = caseFigure(realFigure);
-				if (result == null) result = caseLayoutable(realFigure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.FIGURE_REF: {
-				FigureRef figureRef = (FigureRef)theEObject;
-				T result = caseFigureRef(figureRef);
-				if (result == null) result = caseAbstractFigure(figureRef);
-				if (result == null) result = caseFigure(figureRef);
-				if (result == null) result = caseLayoutable(figureRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CONNECTION_FIGURE: {
-				ConnectionFigure connectionFigure = (ConnectionFigure)theEObject;
-				T result = caseConnectionFigure(connectionFigure);
-				if (result == null) result = caseRealFigure(connectionFigure);
-				if (result == null) result = caseAbstractFigure(connectionFigure);
-				if (result == null) result = casePinOwner(connectionFigure);
-				if (result == null) result = caseCustomAttributeOwner(connectionFigure);
-				if (result == null) result = caseFigure(connectionFigure);
-				if (result == null) result = caseLayoutable(connectionFigure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.DECORATION_FIGURE: {
-				DecorationFigure decorationFigure = (DecorationFigure)theEObject;
-				T result = caseDecorationFigure(decorationFigure);
-				if (result == null) result = caseRealFigure(decorationFigure);
-				if (result == null) result = caseAbstractFigure(decorationFigure);
-				if (result == null) result = casePinOwner(decorationFigure);
-				if (result == null) result = caseCustomAttributeOwner(decorationFigure);
-				if (result == null) result = caseFigure(decorationFigure);
-				if (result == null) result = caseLayoutable(decorationFigure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.SHAPE: {
-				Shape shape = (Shape)theEObject;
-				T result = caseShape(shape);
-				if (result == null) result = caseRealFigure(shape);
-				if (result == null) result = caseAbstractFigure(shape);
-				if (result == null) result = casePinOwner(shape);
-				if (result == null) result = caseCustomAttributeOwner(shape);
-				if (result == null) result = caseFigure(shape);
-				if (result == null) result = caseLayoutable(shape);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.LABEL: {
-				Label label = (Label)theEObject;
-				T result = caseLabel(label);
-				if (result == null) result = caseRealFigure(label);
-				if (result == null) result = caseAbstractFigure(label);
-				if (result == null) result = casePinOwner(label);
-				if (result == null) result = caseCustomAttributeOwner(label);
-				if (result == null) result = caseFigure(label);
-				if (result == null) result = caseLayoutable(label);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.LABELED_CONTAINER: {
-				LabeledContainer labeledContainer = (LabeledContainer)theEObject;
-				T result = caseLabeledContainer(labeledContainer);
-				if (result == null) result = caseRealFigure(labeledContainer);
-				if (result == null) result = caseAbstractFigure(labeledContainer);
-				if (result == null) result = casePinOwner(labeledContainer);
-				if (result == null) result = caseCustomAttributeOwner(labeledContainer);
-				if (result == null) result = caseFigure(labeledContainer);
-				if (result == null) result = caseLayoutable(labeledContainer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.VERTICAL_LABEL: {
-				VerticalLabel verticalLabel = (VerticalLabel)theEObject;
-				T result = caseVerticalLabel(verticalLabel);
-				if (result == null) result = caseRealFigure(verticalLabel);
-				if (result == null) result = caseAbstractFigure(verticalLabel);
-				if (result == null) result = casePinOwner(verticalLabel);
-				if (result == null) result = caseCustomAttributeOwner(verticalLabel);
-				if (result == null) result = caseFigure(verticalLabel);
-				if (result == null) result = caseLayoutable(verticalLabel);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.RECTANGLE: {
-				Rectangle rectangle = (Rectangle)theEObject;
-				T result = caseRectangle(rectangle);
-				if (result == null) result = caseShape(rectangle);
-				if (result == null) result = caseRealFigure(rectangle);
-				if (result == null) result = caseAbstractFigure(rectangle);
-				if (result == null) result = casePinOwner(rectangle);
-				if (result == null) result = caseCustomAttributeOwner(rectangle);
-				if (result == null) result = caseFigure(rectangle);
-				if (result == null) result = caseLayoutable(rectangle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.INVISIBLE_RECTANGLE: {
-				InvisibleRectangle invisibleRectangle = (InvisibleRectangle)theEObject;
-				T result = caseInvisibleRectangle(invisibleRectangle);
-				if (result == null) result = caseRealFigure(invisibleRectangle);
-				if (result == null) result = caseAbstractFigure(invisibleRectangle);
-				if (result == null) result = casePinOwner(invisibleRectangle);
-				if (result == null) result = caseCustomAttributeOwner(invisibleRectangle);
-				if (result == null) result = caseFigure(invisibleRectangle);
-				if (result == null) result = caseLayoutable(invisibleRectangle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.ROUNDED_RECTANGLE: {
-				RoundedRectangle roundedRectangle = (RoundedRectangle)theEObject;
-				T result = caseRoundedRectangle(roundedRectangle);
-				if (result == null) result = caseShape(roundedRectangle);
-				if (result == null) result = caseRealFigure(roundedRectangle);
-				if (result == null) result = caseAbstractFigure(roundedRectangle);
-				if (result == null) result = casePinOwner(roundedRectangle);
-				if (result == null) result = caseCustomAttributeOwner(roundedRectangle);
-				if (result == null) result = caseFigure(roundedRectangle);
-				if (result == null) result = caseLayoutable(roundedRectangle);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.ELLIPSE: {
-				Ellipse ellipse = (Ellipse)theEObject;
-				T result = caseEllipse(ellipse);
-				if (result == null) result = caseShape(ellipse);
-				if (result == null) result = caseRealFigure(ellipse);
-				if (result == null) result = caseAbstractFigure(ellipse);
-				if (result == null) result = casePinOwner(ellipse);
-				if (result == null) result = caseCustomAttributeOwner(ellipse);
-				if (result == null) result = caseFigure(ellipse);
-				if (result == null) result = caseLayoutable(ellipse);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.POLYLINE: {
-				Polyline polyline = (Polyline)theEObject;
-				T result = casePolyline(polyline);
-				if (result == null) result = caseShape(polyline);
-				if (result == null) result = caseRealFigure(polyline);
-				if (result == null) result = caseAbstractFigure(polyline);
-				if (result == null) result = casePinOwner(polyline);
-				if (result == null) result = caseCustomAttributeOwner(polyline);
-				if (result == null) result = caseFigure(polyline);
-				if (result == null) result = caseLayoutable(polyline);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.POLYGON: {
-				Polygon polygon = (Polygon)theEObject;
-				T result = casePolygon(polygon);
-				if (result == null) result = casePolyline(polygon);
-				if (result == null) result = caseShape(polygon);
-				if (result == null) result = caseRealFigure(polygon);
-				if (result == null) result = caseAbstractFigure(polygon);
-				if (result == null) result = casePinOwner(polygon);
-				if (result == null) result = caseCustomAttributeOwner(polygon);
-				if (result == null) result = caseFigure(polygon);
-				if (result == null) result = caseLayoutable(polygon);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.SCALABLE_POLYGON: {
-				ScalablePolygon scalablePolygon = (ScalablePolygon)theEObject;
-				T result = caseScalablePolygon(scalablePolygon);
-				if (result == null) result = casePolygon(scalablePolygon);
-				if (result == null) result = casePolyline(scalablePolygon);
-				if (result == null) result = caseShape(scalablePolygon);
-				if (result == null) result = caseRealFigure(scalablePolygon);
-				if (result == null) result = caseAbstractFigure(scalablePolygon);
-				if (result == null) result = casePinOwner(scalablePolygon);
-				if (result == null) result = caseCustomAttributeOwner(scalablePolygon);
-				if (result == null) result = caseFigure(scalablePolygon);
-				if (result == null) result = caseLayoutable(scalablePolygon);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.POLYLINE_CONNECTION: {
-				PolylineConnection polylineConnection = (PolylineConnection)theEObject;
-				T result = casePolylineConnection(polylineConnection);
-				if (result == null) result = casePolyline(polylineConnection);
-				if (result == null) result = caseConnectionFigure(polylineConnection);
-				if (result == null) result = caseShape(polylineConnection);
-				if (result == null) result = caseRealFigure(polylineConnection);
-				if (result == null) result = caseAbstractFigure(polylineConnection);
-				if (result == null) result = casePinOwner(polylineConnection);
-				if (result == null) result = caseCustomAttributeOwner(polylineConnection);
-				if (result == null) result = caseFigure(polylineConnection);
-				if (result == null) result = caseLayoutable(polylineConnection);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.POLYLINE_DECORATION: {
-				PolylineDecoration polylineDecoration = (PolylineDecoration)theEObject;
-				T result = casePolylineDecoration(polylineDecoration);
-				if (result == null) result = casePolyline(polylineDecoration);
-				if (result == null) result = caseDecorationFigure(polylineDecoration);
-				if (result == null) result = caseShape(polylineDecoration);
-				if (result == null) result = caseRealFigure(polylineDecoration);
-				if (result == null) result = caseAbstractFigure(polylineDecoration);
-				if (result == null) result = casePinOwner(polylineDecoration);
-				if (result == null) result = caseCustomAttributeOwner(polylineDecoration);
-				if (result == null) result = caseFigure(polylineDecoration);
-				if (result == null) result = caseLayoutable(polylineDecoration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.POLYGON_DECORATION: {
-				PolygonDecoration polygonDecoration = (PolygonDecoration)theEObject;
-				T result = casePolygonDecoration(polygonDecoration);
-				if (result == null) result = casePolygon(polygonDecoration);
-				if (result == null) result = caseDecorationFigure(polygonDecoration);
-				if (result == null) result = casePolyline(polygonDecoration);
-				if (result == null) result = caseShape(polygonDecoration);
-				if (result == null) result = caseRealFigure(polygonDecoration);
-				if (result == null) result = caseAbstractFigure(polygonDecoration);
-				if (result == null) result = casePinOwner(polygonDecoration);
-				if (result == null) result = caseCustomAttributeOwner(polygonDecoration);
-				if (result == null) result = caseFigure(polygonDecoration);
-				if (result == null) result = caseLayoutable(polygonDecoration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE_OWNER: {
-				CustomAttributeOwner customAttributeOwner = (CustomAttributeOwner)theEObject;
-				T result = caseCustomAttributeOwner(customAttributeOwner);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_CLASS: {
-				CustomClass customClass = (CustomClass)theEObject;
-				T result = caseCustomClass(customClass);
-				if (result == null) result = caseCustomAttributeOwner(customClass);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_ATTRIBUTE: {
-				CustomAttribute customAttribute = (CustomAttribute)theEObject;
-				T result = caseCustomAttribute(customAttribute);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.FIGURE_ACCESSOR: {
-				FigureAccessor figureAccessor = (FigureAccessor)theEObject;
-				T result = caseFigureAccessor(figureAccessor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_FIGURE: {
-				CustomFigure customFigure = (CustomFigure)theEObject;
-				T result = caseCustomFigure(customFigure);
-				if (result == null) result = caseRealFigure(customFigure);
-				if (result == null) result = caseCustomClass(customFigure);
-				if (result == null) result = caseAbstractFigure(customFigure);
-				if (result == null) result = casePinOwner(customFigure);
-				if (result == null) result = caseCustomAttributeOwner(customFigure);
-				if (result == null) result = caseFigure(customFigure);
-				if (result == null) result = caseLayoutable(customFigure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_DECORATION: {
-				CustomDecoration customDecoration = (CustomDecoration)theEObject;
-				T result = caseCustomDecoration(customDecoration);
-				if (result == null) result = caseCustomFigure(customDecoration);
-				if (result == null) result = caseDecorationFigure(customDecoration);
-				if (result == null) result = caseRealFigure(customDecoration);
-				if (result == null) result = caseCustomClass(customDecoration);
-				if (result == null) result = caseAbstractFigure(customDecoration);
-				if (result == null) result = casePinOwner(customDecoration);
-				if (result == null) result = caseCustomAttributeOwner(customDecoration);
-				if (result == null) result = caseFigure(customDecoration);
-				if (result == null) result = caseLayoutable(customDecoration);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_CONNECTION: {
-				CustomConnection customConnection = (CustomConnection)theEObject;
-				T result = caseCustomConnection(customConnection);
-				if (result == null) result = caseCustomFigure(customConnection);
-				if (result == null) result = caseConnectionFigure(customConnection);
-				if (result == null) result = caseRealFigure(customConnection);
-				if (result == null) result = caseCustomClass(customConnection);
-				if (result == null) result = caseAbstractFigure(customConnection);
-				if (result == null) result = casePinOwner(customConnection);
-				if (result == null) result = caseCustomAttributeOwner(customConnection);
-				if (result == null) result = caseFigure(customConnection);
-				if (result == null) result = caseLayoutable(customConnection);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.COLOR: {
-				Color color = (Color)theEObject;
-				T result = caseColor(color);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.RGB_COLOR: {
-				RGBColor rgbColor = (RGBColor)theEObject;
-				T result = caseRGBColor(rgbColor);
-				if (result == null) result = caseColor(rgbColor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CONSTANT_COLOR: {
-				ConstantColor constantColor = (ConstantColor)theEObject;
-				T result = caseConstantColor(constantColor);
-				if (result == null) result = caseColor(constantColor);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.FONT: {
-				Font font = (Font)theEObject;
-				T result = caseFont(font);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.BASIC_FONT: {
-				BasicFont basicFont = (BasicFont)theEObject;
-				T result = caseBasicFont(basicFont);
-				if (result == null) result = caseFont(basicFont);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.POINT: {
-				Point point = (Point)theEObject;
-				T result = casePoint(point);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.DIMENSION: {
-				Dimension dimension = (Dimension)theEObject;
-				T result = caseDimension(dimension);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.INSETS: {
-				Insets insets = (Insets)theEObject;
-				T result = caseInsets(insets);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.BORDER: {
-				Border border = (Border)theEObject;
-				T result = caseBorder(border);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.BORDER_REF: {
-				BorderRef borderRef = (BorderRef)theEObject;
-				T result = caseBorderRef(borderRef);
-				if (result == null) result = caseBorder(borderRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.LINE_BORDER: {
-				LineBorder lineBorder = (LineBorder)theEObject;
-				T result = caseLineBorder(lineBorder);
-				if (result == null) result = caseBorder(lineBorder);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.MARGIN_BORDER: {
-				MarginBorder marginBorder = (MarginBorder)theEObject;
-				T result = caseMarginBorder(marginBorder);
-				if (result == null) result = caseBorder(marginBorder);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.COMPOUND_BORDER: {
-				CompoundBorder compoundBorder = (CompoundBorder)theEObject;
-				T result = caseCompoundBorder(compoundBorder);
-				if (result == null) result = caseBorder(compoundBorder);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_BORDER: {
-				CustomBorder customBorder = (CustomBorder)theEObject;
-				T result = caseCustomBorder(customBorder);
-				if (result == null) result = caseBorder(customBorder);
-				if (result == null) result = caseCustomClass(customBorder);
-				if (result == null) result = caseCustomAttributeOwner(customBorder);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.LAYOUT_DATA: {
-				LayoutData layoutData = (LayoutData)theEObject;
-				T result = caseLayoutData(layoutData);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_LAYOUT_DATA: {
-				CustomLayoutData customLayoutData = (CustomLayoutData)theEObject;
-				T result = caseCustomLayoutData(customLayoutData);
-				if (result == null) result = caseLayoutData(customLayoutData);
-				if (result == null) result = caseCustomClass(customLayoutData);
-				if (result == null) result = caseCustomAttributeOwner(customLayoutData);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.GRID_LAYOUT_DATA: {
-				GridLayoutData gridLayoutData = (GridLayoutData)theEObject;
-				T result = caseGridLayoutData(gridLayoutData);
-				if (result == null) result = caseLayoutData(gridLayoutData);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.BORDER_LAYOUT_DATA: {
-				BorderLayoutData borderLayoutData = (BorderLayoutData)theEObject;
-				T result = caseBorderLayoutData(borderLayoutData);
-				if (result == null) result = caseLayoutData(borderLayoutData);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.LAYOUTABLE: {
-				Layoutable layoutable = (Layoutable)theEObject;
-				T result = caseLayoutable(layoutable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.LAYOUT: {
-				Layout layout = (Layout)theEObject;
-				T result = caseLayout(layout);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.LAYOUT_REF: {
-				LayoutRef layoutRef = (LayoutRef)theEObject;
-				T result = caseLayoutRef(layoutRef);
-				if (result == null) result = caseLayout(layoutRef);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_LAYOUT: {
-				CustomLayout customLayout = (CustomLayout)theEObject;
-				T result = caseCustomLayout(customLayout);
-				if (result == null) result = caseLayout(customLayout);
-				if (result == null) result = caseCustomClass(customLayout);
-				if (result == null) result = caseCustomAttributeOwner(customLayout);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.GRID_LAYOUT: {
-				GridLayout gridLayout = (GridLayout)theEObject;
-				T result = caseGridLayout(gridLayout);
-				if (result == null) result = caseLayout(gridLayout);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.BORDER_LAYOUT: {
-				BorderLayout borderLayout = (BorderLayout)theEObject;
-				T result = caseBorderLayout(borderLayout);
-				if (result == null) result = caseLayout(borderLayout);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.FLOW_LAYOUT: {
-				FlowLayout flowLayout = (FlowLayout)theEObject;
-				T result = caseFlowLayout(flowLayout);
-				if (result == null) result = caseLayout(flowLayout);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.XY_LAYOUT: {
-				XYLayout xyLayout = (XYLayout)theEObject;
-				T result = caseXYLayout(xyLayout);
-				if (result == null) result = caseLayout(xyLayout);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.XY_LAYOUT_DATA: {
-				XYLayoutData xyLayoutData = (XYLayoutData)theEObject;
-				T result = caseXYLayoutData(xyLayoutData);
-				if (result == null) result = caseLayoutData(xyLayoutData);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.STACK_LAYOUT: {
-				StackLayout stackLayout = (StackLayout)theEObject;
-				T result = caseStackLayout(stackLayout);
-				if (result == null) result = caseLayout(stackLayout);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CENTER_LAYOUT: {
-				CenterLayout centerLayout = (CenterLayout)theEObject;
-				T result = caseCenterLayout(centerLayout);
-				if (result == null) result = caseLayout(centerLayout);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.SVG_FIGURE: {
-				SVGFigure svgFigure = (SVGFigure)theEObject;
-				T result = caseSVGFigure(svgFigure);
-				if (result == null) result = caseRealFigure(svgFigure);
-				if (result == null) result = caseAbstractFigure(svgFigure);
-				if (result == null) result = casePinOwner(svgFigure);
-				if (result == null) result = caseCustomAttributeOwner(svgFigure);
-				if (result == null) result = caseFigure(svgFigure);
-				if (result == null) result = caseLayoutable(svgFigure);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.SVG_PROPERTY: {
-				SVGProperty svgProperty = (SVGProperty)theEObject;
-				T result = caseSVGProperty(svgProperty);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.RECTANGLE2_D: {
-				Rectangle2D rectangle2D = (Rectangle2D)theEObject;
-				T result = caseRectangle2D(rectangle2D);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.PIN: {
-				Pin pin = (Pin)theEObject;
-				T result = casePin(pin);
-				if (result == null) result = caseIdentity(pin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.CUSTOM_PIN: {
-				CustomPin customPin = (CustomPin)theEObject;
-				T result = caseCustomPin(customPin);
-				if (result == null) result = casePin(customPin);
-				if (result == null) result = caseIdentity(customPin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.COLOR_PIN: {
-				ColorPin colorPin = (ColorPin)theEObject;
-				T result = caseColorPin(colorPin);
-				if (result == null) result = casePin(colorPin);
-				if (result == null) result = caseIdentity(colorPin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.VISIBLE_PIN: {
-				VisiblePin visiblePin = (VisiblePin)theEObject;
-				T result = caseVisiblePin(visiblePin);
-				if (result == null) result = casePin(visiblePin);
-				if (result == null) result = caseIdentity(visiblePin);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFGraphPackage.PIN_OWNER: {
-				PinOwner pinOwner = (PinOwner)theEObject;
-				T result = casePinOwner(pinOwner);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Canvas</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Canvas</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCanvas(Canvas object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Figure Gallery</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Figure Gallery</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFigureGallery(FigureGallery object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Identity</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Identity</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseIdentity(Identity object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Diagram Element</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Diagram Element</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDiagramElement(DiagramElement object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractNode(AbstractNode object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Node</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Node</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseNode(Node object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Child Access</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Child Access</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseChildAccess(ChildAccess object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Real Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Real Figure</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRealFigure(RealFigure object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Connection</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConnection(Connection object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Compartment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Compartment</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCompartment(Compartment object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Diagram Label</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Diagram Label</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDiagramLabel(DiagramLabel object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Visual Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Visual Facet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseVisualFacet(VisualFacet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>General Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>General Facet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGeneralFacet(GeneralFacet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Alignment Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Alignment Facet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAlignmentFacet(AlignmentFacet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Gradient Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Gradient Facet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGradientFacet(GradientFacet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Label Offset Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Label Offset Facet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLabelOffsetFacet(LabelOffsetFacet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Default Size Facet</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Default Size Facet</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDefaultSizeFacet(DefaultSizeFacet object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Figure</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFigure(Figure object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Figure Descriptor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Figure Descriptor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFigureDescriptor(FigureDescriptor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Figure</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractFigure(AbstractFigure object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Figure Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Figure Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFigureRef(FigureRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Connection Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Connection Figure</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConnectionFigure(ConnectionFigure object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Decoration Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Decoration Figure</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDecorationFigure(DecorationFigure object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Shape</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Shape</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseShape(Shape object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Label</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Label</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLabel(Label object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Labeled Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Labeled Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLabeledContainer(LabeledContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Vertical Label</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Vertical Label</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseVerticalLabel(VerticalLabel object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Rectangle</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Rectangle</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRectangle(Rectangle object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Invisible Rectangle</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Invisible Rectangle</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseInvisibleRectangle(InvisibleRectangle object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Rounded Rectangle</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Rounded Rectangle</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRoundedRectangle(RoundedRectangle object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ellipse</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ellipse</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEllipse(Ellipse object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Polyline</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Polyline</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePolyline(Polyline object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Polygon</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Polygon</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePolygon(Polygon object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Scalable Polygon</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Scalable Polygon</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseScalablePolygon(ScalablePolygon object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Polyline Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Polyline Connection</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePolylineConnection(PolylineConnection object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Polyline Decoration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Polyline Decoration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePolylineDecoration(PolylineDecoration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Polygon Decoration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Polygon Decoration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePolygonDecoration(PolygonDecoration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Attribute Owner</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Attribute Owner</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomAttributeOwner(CustomAttributeOwner object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Class</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Class</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomClass(CustomClass object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Figure</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomFigure(CustomFigure object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Decoration</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Decoration</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomDecoration(CustomDecoration object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Connection</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Connection</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomConnection(CustomConnection object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Color</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Color</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseColor(Color object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>RGB Color</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>RGB Color</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRGBColor(RGBColor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constant Color</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constant Color</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConstantColor(ConstantColor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Font</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFont(Font object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Basic Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Basic Font</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBasicFont(BasicFont object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Point</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Point</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePoint(Point object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Dimension</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Dimension</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDimension(Dimension object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Insets</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Insets</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseInsets(Insets object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Border</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBorder(Border object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Border Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Border Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBorderRef(BorderRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Line Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Line Border</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLineBorder(LineBorder object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Margin Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Margin Border</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMarginBorder(MarginBorder object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Compound Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Compound Border</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCompoundBorder(CompoundBorder object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Border</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Border</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomBorder(CustomBorder object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Layout Data</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLayoutData(LayoutData object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Layout Data</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomLayoutData(CustomLayoutData object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Grid Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Grid Layout Data</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGridLayoutData(GridLayoutData object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Border Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Border Layout Data</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBorderLayoutData(BorderLayoutData object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Layoutable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Layoutable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLayoutable(Layoutable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Layout</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLayout(Layout object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Layout Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Layout Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLayoutRef(LayoutRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Layout</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomLayout(CustomLayout object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Grid Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Grid Layout</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGridLayout(GridLayout object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Border Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Border Layout</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBorderLayout(BorderLayout object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Attribute</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Attribute</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomAttribute(CustomAttribute object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Figure Accessor</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Figure Accessor</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFigureAccessor(FigureAccessor object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Flow Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Flow Layout</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFlowLayout(FlowLayout object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>XY Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>XY Layout</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXYLayout(XYLayout object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>XY Layout Data</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>XY Layout Data</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseXYLayoutData(XYLayoutData object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Stack Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Stack Layout</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseStackLayout(StackLayout object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Center Layout</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Center Layout</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCenterLayout(CenterLayout object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>SVG Figure</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>SVG Figure</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSVGFigure(SVGFigure object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>SVG Property</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>SVG Property</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSVGProperty(SVGProperty object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Rectangle2 D</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Rectangle2 D</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRectangle2D(Rectangle2D object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Pin</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Pin</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePin(Pin object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Custom Pin</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Custom Pin</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCustomPin(CustomPin object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Color Pin</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Color Pin</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseColorPin(ColorPin object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Visible Pin</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Visible Pin</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseVisiblePin(VisiblePin object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Pin Owner</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Pin Owner</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePinOwner(PinOwner object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //GMFGraphSwitch
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/internal/graphdef/util/MigrateFactory2005.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/internal/graphdef/util/MigrateFactory2005.java
deleted file mode 100644
index 3761ec869a6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.graphdef/src/org/eclipse/papyrus/gmf/internal/graphdef/util/MigrateFactory2005.java
+++ /dev/null
@@ -1,284 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- */
-package org.eclipse.papyrus.gmf.internal.graphdef.util;
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.ecore.xmi.impl.BasicResourceHandler;
-import org.eclipse.papyrus.gmf.gmfgraph.ChildAccess;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.gmfgraph.CustomFigure;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramElement;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.gmfgraph.Figure;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureAccessor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureDescriptor;
-import org.eclipse.papyrus.gmf.gmfgraph.FigureGallery;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphFactory;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.RealFigure;
-import org.eclipse.papyrus.gmf.internal.common.ToolingResourceFactory;
-import org.eclipse.papyrus.gmf.internal.common.migrate.FilteringCopier;
-import org.eclipse.papyrus.gmf.internal.common.migrate.Messages;
-import org.eclipse.papyrus.gmf.internal.common.migrate.MigrationResource;
-
-/**
- * This is a complete rework of old XML-based MigrationDelegate,
- * to handle migration of gmfgraph resources of year 2005 to the
- * version of year 2007, using dynamic meta-model for old one. 
- * @author artem
- */
-public class MigrateFactory2005 extends ToolingResourceFactory {
-	private static final Object MIGRATION_IN_PROGRESS = "gmf.migration";
-	private static final Object MIGRATION_PARTICIPANTS = "gmf.migration.resources";
-	private static final String OLD_NS_URI = "http://www.eclipse.org/gmf/2005/GraphicalDefinition";
-
-	@Override
-	public Resource createResource(URI uri) {
-		ToolResource r = (ToolResource) super.createResource(uri);
-		r.getDefaultLoadOptions().put(XMLResource.OPTION_RESOURCE_HANDLER, new BasicResourceHandler() {
-			
-			@Override
-			public void postLoad(XMLResource resource, InputStream inputStream, Map<?, ?> options) {
-				// when modifying, can't use passed options as they represent merged value of rs options and default resource options
-				if (Boolean.TRUE.equals(options.get(MIGRATION_IN_PROGRESS))) {
-					@SuppressWarnings("unchecked") 
-					List<XMLResource> participants = (List<XMLResource>) resource.getResourceSet().getLoadOptions().get(MIGRATION_PARTICIPANTS);
-					participants.add(resource);
-					return;
-				}
-				try {
-					resource.getResourceSet().getLoadOptions().put(MIGRATION_IN_PROGRESS, Boolean.TRUE);
-					final LinkedList<XMLResource> participants = new LinkedList<XMLResource>();
-					participants.add(resource);
-					resource.getResourceSet().getLoadOptions().put(MIGRATION_PARTICIPANTS, participants);
-					for (EObject o : resource.getContents()) {
-						if (isOfInterest(o)) {
-							// trigger load of all resorces while migration-in-progress flag is set
-							// and no actual migration happens 
-							EcoreUtil.resolveAll(o);
-						}
-					}
-					// collect all objects for migration
-					Map<EObject, EObject> wholeMigration = new HashMap<EObject, EObject>();
-					for (XMLResource r : participants) {
-						for (EObject o : r.getContents()) {
-							if (isOfInterest(o)) {
-								wholeMigration.put(o, null);
-							}
-						}
-					}
-					migrate2005to2006(wholeMigration);
-					// update migrated elements in their respective resources
-					for (XMLResource r : participants) {
-						LinkedList<EObject> migrated = new LinkedList<EObject>();
-						for (EObject o : r.getContents()) {
-							EObject m = wholeMigration.get(o);
-							if (m != null) {
-								migrated.add(m);
-								r.getWarnings().add(0, MigrationResource.createMessageDiagnostic(r, Messages.oldModelVersionLoadedMigrationRequired));
-							} else {
-								migrated.add(o);
-							}
-						} 
-						r.getContents().clear();
-						r.getContents().addAll(migrated);
-					}
-				} finally {
-					resource.getResourceSet().getLoadOptions().remove(MIGRATION_IN_PROGRESS);
-					resource.getResourceSet().getLoadOptions().remove(MIGRATION_PARTICIPANTS);
-				}
-			}
-
-			private boolean isOfInterest(EObject o) {
-				return o != null && OLD_NS_URI.equals(o.eClass().getEPackage().getNsURI());
-			}
-		});
-		return r;
-	}
-
-	private void migrate2005to2006(Map<EObject, EObject> original2migrated) {
-		final EPackage oldModel = EPackage.Registry.INSTANCE.getEPackage(OLD_NS_URI);
-		final EClass oldFigureClass = (EClass) oldModel.getEClassifier("Figure");
-		final EClass oldFigureAccessorClass = (EClass) oldModel.getEClassifier("FigureAccessor");
-		final EStructuralFeature deFigure = ((EClass) oldModel.getEClassifier("DiagramElement")).getEStructuralFeature("figure");
-		final EStructuralFeature fhReferencingElements = ((EClass) oldModel.getEClassifier("FigureHandle")).getEStructuralFeature("referencingElements");
-		final EStructuralFeature identityName = ((EClass) oldModel.getEClassifier("Identity")).getEStructuralFeature("name");
-		final EStructuralFeature figureChildren = oldFigureClass.getEStructuralFeature("children");
-		final EStructuralFeature faTypedFigure = oldFigureAccessorClass.getEStructuralFeature("typedFigure");
-
-		FilteringCopier cc = new FilteringCopier(false, false, GMFGraphPackage.eINSTANCE);
-		cc.ignore(((EClass) oldModel.getEClassifier("CustomClass")).getEStructuralFeature("bundleName"));
-		cc.ignore(deFigure);
-		cc.ignore(fhReferencingElements);
-		cc.ignoreIn(identityName, oldFigureClass);
-		cc.ignore(faTypedFigure);
-		cc.substitute(figureChildren, GMFGraphPackage.eINSTANCE.getRealFigure_Children());
-
-		cc.copyAll(original2migrated.keySet());
-		cc.copyReferences();
-
-		for (EObject fa : cc.getIgnoredOwners(faTypedFigure)) {
-			EObject oldReferencedFigure = (EObject) fa.eGet(faTypedFigure);
-			if (oldReferencedFigure == null) {
-				// typedFigure reference was optional, became mandatory,
-				// need to create a bare figure to hold value  
-				// @see MigrationDelegate#getOrCreateTypedFigure
-				CustomFigure custom = GMFGraphFactory.eINSTANCE.createCustomFigure();
-				custom.setQualifiedClassName("org.eclipse.draw2d.IFigure"); //$NON-NLS-1$
-				((FigureAccessor) cc.get(fa)).setTypedFigure(custom);
-				continue;
-			}
-			if (oldReferencedFigure.eIsProxy()) {
-				oldReferencedFigure = EcoreUtil.resolve(oldReferencedFigure, fa);
-			}
-			EObject newFigure = cc.get(oldReferencedFigure);
-			if (newFigure == null) {
-				continue;
-			}
-			assert !newFigure.eIsProxy(); // how come freshly copied newFigure may be a proxy? 
-			EObject copy = EcoreUtil.copy(newFigure);
-			if (copy instanceof RealFigure) { // sanity, typedFigure can't be anything but CustomFigure
-				((FigureAccessor) cc.get(fa)).setTypedFigure((RealFigure) copy);
-			}
-		}
-		final EClass oldFigureGalleryClass = (EClass) oldModel.getEClassifier("FigureGallery");
-		final Map<EObject, FigureDescriptor> oldFigure2newDescriptor = new HashMap<EObject, FigureDescriptor>();
-		final Map<EObject, ChildAccess> oldFigureAccessor2newChildAccess = new HashMap<EObject, ChildAccess>();
-		for (EObject fh : cc.getIgnoredOwners(fhReferencingElements)) {
-			List<?> de = (List<?>) fh.eGet(fhReferencingElements);
-			if (de.isEmpty()) {
-				// in original migration code, similar effect (not-referenced 
-				// figures are not migrated to FigureDescriptor) was achieved
-				// as there happen to be no 'referencedElement' tag in a gmfgraph
-				// file, and hence, migrateFigureStructureToDescriptor() wasn't invoked
-				continue;
-			}
-			if (!oldFigureClass.isInstance(fh) && !oldFigureAccessorClass.isInstance(fh)) {
-				// no more known subclasses of FigureHandle
-				assert false;
-				continue;
-			}
-			EObject topLevel = fh;
-			while (topLevel != null && !oldFigureGalleryClass.isInstance(topLevel.eContainer())) {
-				topLevel = topLevel.eContainer();
-			}
-			if (topLevel == null) {
-				assert false; // can't happen
-				continue;
-			}
-			initFigureDescriptor(cc, topLevel, fh, oldFigure2newDescriptor, oldFigureAccessor2newChildAccess);
-		}
-		for (EObject de : cc.getIgnoredOwners(deFigure)) {
-			final Object fh = de.eGet(deFigure); 
-			if (false == fh instanceof EObject) {
-				continue;
-			}
-			EObject oldFigure = (EObject) fh;
-			if (oldFigure.eIsProxy()) {
-				oldFigure = EcoreUtil.resolve(oldFigure, de);
-				if (oldFigure.eIsProxy()) { // failed to resolve proxy
-					continue;
-				}
-			}
-			// oldFigure is either subclass of Figure or FigureAccessor
-			if (!oldFigureClass.isInstance(oldFigure) && !oldFigureAccessorClass.isInstance(oldFigure)) {
-				assert false;
-				continue;
-			}
-			EObject topLevel = oldFigure;
-			while (topLevel != null && !oldFigureGalleryClass.isInstance(topLevel.eContainer())) {
-				topLevel = topLevel.eContainer();
-			}
-			if (topLevel == null) {
-				assert false;
-				continue;
-			}
-			if (!oldFigure2newDescriptor.containsKey(topLevel)) {
-				// though all *correct* figures should already be migrated,
-				// there might be a figure without referencedElements set, 
-				// hence, may need to migrate it anyway
-				initFigureDescriptor(cc, topLevel, oldFigure, oldFigure2newDescriptor, oldFigureAccessor2newChildAccess);
-			}
-			FigureDescriptor fd = oldFigure2newDescriptor.get(topLevel);
-			final DiagramElement newDE = (DiagramElement) cc.get(de);
-			newDE.setFigure(fd);
-			if (topLevel != oldFigure) {
-				// child access, MigrationDelegate#setNestedFigureAccessFor
-				ChildAccess access = oldFigureAccessor2newChildAccess.get(oldFigure);
-				if (access == null) {
-					// assert false; // XXX create new one?
-					continue;
-				}
-				if (newDE instanceof DiagramLabel) {
-					((DiagramLabel) newDE).setAccessor(access);
-				} else if (newDE instanceof Compartment) {
-					((Compartment) newDE).setAccessor(access);
-				}
-			}
-		}
-		for (EObject i : cc.getIgnoredOwners(identityName)) {
-			if (cc.get(i) instanceof RealFigure && i.eIsSet(identityName)) {
-				// in old model, name feature came from Identity class,
-				// while in the new model, name feature is RealFigure's attribute.
-				// Copier#getTarget(EStructuralFeature) logic is not suited to 
-				// find new feature owners yet, using feature.getEContainingClass()
-				// for simplicity now, hence can't get appropriate new EStrFea.
-				((RealFigure) cc.get(i)).setName((String) i.eGet(identityName));
-			}
-		}
-		// map original elements to their respective copies
-		for (EObject o : new LinkedList<EObject>(original2migrated.keySet())) {
-			original2migrated.put(o, cc.get(o));
-		}
-	}
-
-	private void initFigureDescriptor(FilteringCopier cc, EObject topLevel, EObject fh, Map<EObject, FigureDescriptor> oldFigure2newDescriptor, Map<EObject, ChildAccess> oldFigureAccessor2newChildAccess) {
-		FigureDescriptor fd = oldFigure2newDescriptor.get(topLevel);
-		if (fd == null) {
-			fd = GMFGraphFactory.eINSTANCE.createFigureDescriptor();
-			fd.setActualFigure((RealFigure) cc.get(topLevel));
-			fd.setName((String) topLevel.eGet(topLevel.eClass().getEStructuralFeature("name")));
-			oldFigure2newDescriptor.put(topLevel, fd);
-			EObject figureGallery = topLevel.eContainer();
-			((FigureGallery) cc.get(figureGallery)).getDescriptors().add(fd);
-		}
-		if (topLevel != fh && !oldFigureAccessor2newChildAccess.containsKey(fh)) {
-			ChildAccess a = GMFGraphFactory.eINSTANCE.createChildAccess();
-			final EClass oldFigureAccessorClass = (EClass) topLevel.eClass().getEPackage().getEClassifier("FigureAccessor");
-			if (oldFigureAccessorClass.isInstance(fh)) {
-				FigureAccessor fa = (FigureAccessor) cc.get(fh);
-				if (fa != null) {
-					a.setFigure(fa.getTypedFigure());
-				}
-			} else {
-				a.setFigure((Figure) cc.get(fh));
-			}
-			oldFigureAccessor2newChildAccess.put(fh, a);
-			fd.getAccessors().add(a);
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.project
deleted file mode 100644
index 20119c75033..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.map.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 20a57969154..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,23 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.map.edit; singleton:=true
-Bundle-Version: 2.9.0.qualifier
-Bundle-Activator: org.eclipse.papyrus.gmf.mappings.provider.GMFMapEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.papyrus.gmf.mappings.presentation,
- org.eclipse.papyrus.gmf.mappings.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.common;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.map;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.graphdef.edit;bundle-version="[2.9.0,4.0.0)",
- org.eclipse.papyrus.gmf.tooldef.edit;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.ecore.edit;bundle-version="[2.4.0,3.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/build.properties
deleted file mode 100644
index 0bcb1edead0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#    Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               icons/,\
-               META-INF/,\
-               .,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditContainer_audits_AuditRule.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditContainer_audits_AuditRule.gif
deleted file mode 100644
index 4699e94d909..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditContainer_audits_AuditRule.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditContainer_childContainers_AuditContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditContainer_childContainers_AuditContainer.gif
deleted file mode 100644
index e07c4ede552..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditContainer_childContainers_AuditContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_rule_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_rule_Constraint.gif
deleted file mode 100644
index 64cd1b08817..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_rule_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_AuditedMetricTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_AuditedMetricTarget.gif
deleted file mode 100644
index 61b0302a8e5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_AuditedMetricTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DiagramElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DiagramElementTarget.gif
deleted file mode 100644
index 9c7efc49c09..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DiagramElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DomainAttributeTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DomainAttributeTarget.gif
deleted file mode 100644
index 5b78080875c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DomainAttributeTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DomainElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DomainElementTarget.gif
deleted file mode 100644
index 9c7efc49c09..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_DomainElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_NotationElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_NotationElementTarget.gif
deleted file mode 100644
index f9be6da8f0d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateAuditRule_target_NotationElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateChildReference_ownedChild_NodeMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateChildReference_ownedChild_NodeMapping.gif
deleted file mode 100644
index 2833425da49..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateChildReference_ownedChild_NodeMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_editExpression_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_editExpression_Constraint.gif
deleted file mode 100644
index ab7b42d63c1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_editExpression_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_editExpression_ValueExpression.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_editExpression_ValueExpression.gif
deleted file mode 100644
index b1d08d2828a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_editExpression_ValueExpression.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_validateExpression_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_validateExpression_Constraint.gif
deleted file mode 100644
index ab7b42d63c1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_validateExpression_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_viewExpression_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_viewExpression_Constraint.gif
deleted file mode 100644
index ab7b42d63c1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_viewExpression_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_viewExpression_ValueExpression.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_viewExpression_ValueExpression.gif
deleted file mode 100644
index b1d08d2828a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateExpressionLabelMapping_viewExpression_ValueExpression.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureSeqInitializer_initializers_FeatureValueSpec.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureSeqInitializer_initializers_FeatureValueSpec.gif
deleted file mode 100644
index c7d5a0c5815..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureSeqInitializer_initializers_FeatureValueSpec.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureSeqInitializer_initializers_ReferenceNewElementSpec.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureSeqInitializer_initializers_ReferenceNewElementSpec.gif
deleted file mode 100644
index 912c2bf00e2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureSeqInitializer_initializers_ReferenceNewElementSpec.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureValueSpec_value_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureValueSpec_value_Constraint.gif
deleted file mode 100644
index 64a9ca41f08..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureValueSpec_value_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureValueSpec_value_ValueExpression.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureValueSpec_value_ValueExpression.gif
deleted file mode 100644
index 27c2e4c9e28..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateFeatureValueSpec_value_ValueExpression.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkConstraints_sourceEnd_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkConstraints_sourceEnd_Constraint.gif
deleted file mode 100644
index b1cadb396e0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkConstraints_sourceEnd_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkConstraints_targetEnd_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkConstraints_targetEnd_Constraint.gif
deleted file mode 100644
index b1cadb396e0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkConstraints_targetEnd_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkMapping_creationConstraints_LinkConstraints.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkMapping_creationConstraints_LinkConstraints.gif
deleted file mode 100644
index c3dd92014ca..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkMapping_creationConstraints_LinkConstraints.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkMapping_labelMappings_LinkLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkMapping_labelMappings_LinkLabelMapping.gif
deleted file mode 100644
index 968035a2b88..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateLinkMapping_labelMappings_LinkLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_domainInitializer_FeatureSeqInitializer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_domainInitializer_FeatureSeqInitializer.gif
deleted file mode 100644
index c01322f2958..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_domainInitializer_FeatureSeqInitializer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_domainSpecialization_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_domainSpecialization_Constraint.gif
deleted file mode 100644
index 706dc412834..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_domainSpecialization_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_DesignLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_DesignLabelMapping.gif
deleted file mode 100644
index 6f4abde0a26..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_DesignLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_ExpressionLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_ExpressionLabelMapping.gif
deleted file mode 100644
index c9af92d8910..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_ExpressionLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_FeatureLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_FeatureLabelMapping.gif
deleted file mode 100644
index 5d6719970cb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_FeatureLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_LabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_LabelMapping.gif
deleted file mode 100644
index 07d4cba6e20..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_LabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_OclChoiceLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_OclChoiceLabelMapping.gif
deleted file mode 100644
index 8883ef6afba..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_labelMappings_OclChoiceLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_visualEffects_VisualEffectMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_visualEffects_VisualEffectMapping.gif
deleted file mode 100644
index bfe2863deeb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMappingEntry_visualEffects_VisualEffectMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_appearanceStyles_GenericStyleSelector.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_appearanceStyles_GenericStyleSelector.gif
deleted file mode 100644
index eeca32a9bec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_appearanceStyles_GenericStyleSelector.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_audits_AuditContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_audits_AuditContainer.gif
deleted file mode 100644
index c5ad7c64816..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_audits_AuditContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_diagram_CanvasMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_diagram_CanvasMapping.gif
deleted file mode 100644
index 5d1b367c137..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_diagram_CanvasMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_links_LinkMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_links_LinkMapping.gif
deleted file mode 100644
index 433da751138..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_links_LinkMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_metrics_MetricContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_metrics_MetricContainer.gif
deleted file mode 100644
index 06ebb8d9145..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_metrics_MetricContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_nodes_NodeMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_nodes_NodeMapping.gif
deleted file mode 100644
index d7884addd49..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_nodes_NodeMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_nodes_TopNodeReference.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_nodes_TopNodeReference.gif
deleted file mode 100644
index 6c71b4cfb32..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMapping_nodes_TopNodeReference.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricContainer_metrics_MetricRule.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricContainer_metrics_MetricRule.gif
deleted file mode 100644
index eb470e4612c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricContainer_metrics_MetricRule.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_Constraint.gif
deleted file mode 100644
index ff9c9a02dc0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_FeatureValueSpec.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_FeatureValueSpec.gif
deleted file mode 100644
index 1934e2585f2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_FeatureValueSpec.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_ValueExpression.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_ValueExpression.gif
deleted file mode 100644
index d455c0c25d2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_rule_ValueExpression.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_DiagramElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_DiagramElementTarget.gif
deleted file mode 100644
index 57d043b4f2d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_DiagramElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_DomainElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_DomainElementTarget.gif
deleted file mode 100644
index 57d043b4f2d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_DomainElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_NotationElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_NotationElementTarget.gif
deleted file mode 100644
index 968b6be0c40..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateMetricRule_target_NotationElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_children_ChildReference.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_children_ChildReference.gif
deleted file mode 100644
index 9c351cc5ec8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_children_ChildReference.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_compartments_CompartmentMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_compartments_CompartmentMapping.gif
deleted file mode 100644
index 1826517dd72..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_compartments_CompartmentMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_visualEffects_VisualEffectMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_visualEffects_VisualEffectMapping.gif
deleted file mode 100644
index 5bfbb66ec75..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateNodeMapping_visualEffects_VisualEffectMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_itemsExpression_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_itemsExpression_Constraint.gif
deleted file mode 100644
index 28b7d50cb7c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_itemsExpression_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_itemsExpression_ValueExpression.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_itemsExpression_ValueExpression.gif
deleted file mode 100644
index 967985834eb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_itemsExpression_ValueExpression.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_showExpression_Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_showExpression_Constraint.gif
deleted file mode 100644
index 28b7d50cb7c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_showExpression_Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_showExpression_ValueExpression.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_showExpression_ValueExpression.gif
deleted file mode 100644
index 967985834eb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateOclChoiceLabelMapping_showExpression_ValueExpression.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateReferenceNewElementSpec_newElementInitializers_FeatureSeqInitializer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateReferenceNewElementSpec_newElementInitializers_FeatureSeqInitializer.gif
deleted file mode 100644
index f075771bb8f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateReferenceNewElementSpec_newElementInitializers_FeatureSeqInitializer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_DiagramElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_DiagramElementTarget.gif
deleted file mode 100644
index 9c7efc49c09..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_DiagramElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_DomainElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_DomainElementTarget.gif
deleted file mode 100644
index 9c7efc49c09..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_DomainElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_NotationElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_NotationElementTarget.gif
deleted file mode 100644
index f9be6da8f0d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateRuleBase_target_NotationElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateTopNodeReference_ownedChild_NodeMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateTopNodeReference_ownedChild_NodeMapping.gif
deleted file mode 100644
index a20f5daae46..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/ctool16/CreateTopNodeReference_ownedChild_NodeMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditContainer.gif
deleted file mode 100644
index afb82ea48a5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditRule.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditRule.gif
deleted file mode 100644
index 739ebbfa6ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditRule.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditedMetricTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditedMetricTarget.gif
deleted file mode 100644
index c4a8af41844..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/AuditedMetricTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/CanvasMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/CanvasMapping.gif
deleted file mode 100644
index 11ca23286d9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/CanvasMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ChildNodeMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ChildNodeMapping.gif
deleted file mode 100644
index ed874747401..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ChildNodeMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ChildReference.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ChildReference.gif
deleted file mode 100644
index e0016974a6b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ChildReference.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/CompartmentMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/CompartmentMapping.gif
deleted file mode 100644
index c687685d540..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/CompartmentMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/Constraint.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/Constraint.gif
deleted file mode 100644
index db7414e9372..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/Constraint.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DesignLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DesignLabelMapping.gif
deleted file mode 100644
index 57c448eb829..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DesignLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DiagramElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DiagramElementTarget.gif
deleted file mode 100644
index 35ef84e20e2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DiagramElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DomainAttributeTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DomainAttributeTarget.gif
deleted file mode 100644
index 1e5345fb323..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DomainAttributeTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DomainElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DomainElementTarget.gif
deleted file mode 100644
index 35ef84e20e2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/DomainElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ExpressionLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ExpressionLabelMapping.gif
deleted file mode 100644
index 7c2aaac84ee..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ExpressionLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureInitializer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureInitializer.gif
deleted file mode 100644
index 7bac4fd3808..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureInitializer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureLabelMapping.gif
deleted file mode 100644
index 57c448eb829..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureSeqInitializer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureSeqInitializer.gif
deleted file mode 100644
index c00aedf4135..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureSeqInitializer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureValueSpec.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureValueSpec.gif
deleted file mode 100644
index afb82ea48a5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/FeatureValueSpec.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/GMFMapModelFile.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/GMFMapModelFile.gif
deleted file mode 100644
index dc44e5423ed..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/GMFMapModelFile.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LabelMapping.gif
deleted file mode 100644
index 57c448eb829..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkConstraints.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkConstraints.gif
deleted file mode 100644
index 53500daf98e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkConstraints.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkLabelMapping.gif
deleted file mode 100644
index 10d222998af..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkMapping.gif
deleted file mode 100644
index e8e09904e08..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/LinkMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/Mapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/Mapping.gif
deleted file mode 100644
index b3643da048a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/Mapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/MetricContainer.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/MetricContainer.gif
deleted file mode 100644
index 89ad5da38ab..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/MetricContainer.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/MetricRule.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/MetricRule.gif
deleted file mode 100644
index badaab0664a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/MetricRule.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NodeLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NodeLabelMapping.gif
deleted file mode 100644
index a26660ec28f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NodeLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NodeMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NodeMapping.gif
deleted file mode 100644
index 92a726beb3c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NodeMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NotationElementTarget.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NotationElementTarget.gif
deleted file mode 100644
index a26660ec28f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/NotationElementTarget.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/OclChoiceLabelMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/OclChoiceLabelMapping.gif
deleted file mode 100644
index c8d381f0b32..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/OclChoiceLabelMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ReferenceNewElementSpec.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ReferenceNewElementSpec.gif
deleted file mode 100644
index 53500daf98e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ReferenceNewElementSpec.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/TopNodeReference.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/TopNodeReference.gif
deleted file mode 100644
index e0016974a6b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/TopNodeReference.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ValueExpression.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ValueExpression.gif
deleted file mode 100644
index 136e3b27269..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/ValueExpression.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/VisualEffectMapping.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/VisualEffectMapping.gif
deleted file mode 100644
index 45731fe28e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/obj16/VisualEffectMapping.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/wizban/NewGMFMap.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/wizban/NewGMFMap.gif
deleted file mode 100644
index d7a58977468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/icons/full/wizban/NewGMFMap.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/plugin.properties
deleted file mode 100644
index 54f8ae49c95..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/plugin.properties
+++ /dev/null
@@ -1,282 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-pluginName = Papyrus GMF Mapping Edit Model
-providerName = Eclipse Modeling Project
-
-#####################################################
-# Properties in this section SHOULD NOT be translated
-#####################################################
-_UI_GMFMapEditorFilenameDefaultBase = My
-_UI_GMFMapEditorFilenameExtension = gmfmap
-_UI_GMFMapEditorFilenameExtensions = gmfmap
-
-_UI_Language_ocl_literal = ocl
-_UI_Language_java_literal = java
-_UI_Language_regexp_literal = regexp
-_UI_Language_nregexp_literal = nregexp
-
-#_UI_Wizard_category=
-#_UI_XMLEncodingChoices=
-#_UI_ModelObject=
-#_UI_XMLEncoding=
-#_UI_Wizard_initial_object_description=
-
-################
-# End of section
-################
-
-#############################################################
-# Properties in this section ARE REALLY NEED to be translated
-#############################################################
-
-# next item(s) are manually added
-_UI_ToggleQualifiedLabels_menu_item=Qualified feature names 
-#
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_GMFMapEditor_menu = &GMFMap Editor
-
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-
-_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-
-_UI_SelectionPage_label = Selection
-_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-
-_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-
-_UI_OpenEditorError_label = Open Editor
-
-_UI_GMFMapModelWizard_label = GMFMap Model
-_UI_GMFMapModelWizard_description = Create a new GMFMap model
-
-_UI_GMFMapEditor_label = GMFMap Model Editor
-
-_UI_Wizard_label = New
-
-_WARN_FilenameExtension = The file name must end in ".{0}"
-_WARN_FilenameExtensions = The file name must have one of the following extensions: {0}
-
-_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-
-_UI_CreateModelError_message = Problems encountered in file "{0}"
-
-################
-# End of section
-################
-
-######################################################################################
-# Properties in this section MAY be translated, although they are quite ok in English.
-# Mostly there are names of classes and features that are often referenced to by
-# their English names
-######################################################################################
-pluginName = Papyrus GMF Mapping Edit Support
-providerName = Eclipse Modeling Project
-
-_UI_Mapping_type = Mapping
-_UI_MappingEntry_type = Mapping Entry
-_UI_NeedsContainment_type = Needs Containment
-_UI_NodeReference_type = Node Reference
-_UI_ChildReference_type = Child Reference
-_UI_TopNodeReference_type = Top Node Reference
-_UI_NodeMapping_type = Node Mapping
-_UI_CompartmentMapping_type = Compartment Mapping
-_UI_LinkMapping_type = Link Mapping
-_UI_CanvasMapping_type = Canvas Mapping
-_UI_LabelMapping_type = Label Mapping
-_UI_Constraint_type = Constraint
-_UI_LinkConstraints_type = Link Constraints
-_UI_ValueExpression_type = Value Expression
-_UI_ElementInitializer_type = Element Initializer
-_UI_FeatureSeqInitializer_type = Feature Seq Initializer
-_UI_FeatureValueSpec_type = Feature Value Spec
-_UI_MenuOwner_type = Menu Owner
-_UI_ToolOwner_type = Tool Owner
-_UI_AppearanceSteward_type = Appearance Steward
-_UI_AuditContainer_type = Audit Container
-_UI_RuleBase_type = Rule Base
-_UI_AuditRule_type = Audit Rule
-_UI_DomainElementTarget_type = Domain Element Target
-_UI_DomainAttributeTarget_type = Domain Attribute Target
-_UI_DiagramElementTarget_type = Diagram Element Target
-_UI_NotationElementTarget_type = Notation Element Target
-_UI_MetricContainer_type = Metric Container
-_UI_MetricRule_type = Metric Rule
-_UI_AuditedMetricTarget_type = Audited Metric Target
-_UI_Auditable_type = Auditable
-_UI_Measurable_type = Measurable
-_UI_Unknown_type = Object
-
_UI_Unknown_datatype= Value
-
_UI_Mapping_nodes_feature = Nodes
-_UI_Mapping_links_feature = Links
-_UI_Mapping_diagram_feature = Diagram
-_UI_Mapping_appearanceStyles_feature = Appearance Styles
-_UI_Mapping_audits_feature = Audits
-_UI_Mapping_metrics_feature = Metrics
-_UI_MappingEntry_domainMetaElement_feature = Element
-_UI_MappingEntry_domainSpecialization_feature = Specialization
-_UI_MappingEntry_domainInitializer_feature = Initializer
-_UI_MappingEntry_labelMappings_feature = Label Mappings
-_UI_NeedsContainment_containmentFeature_feature = Containment Feature
-_UI_NodeReference_childrenFeature_feature = Children Feature
-_UI_NodeReference_child_feature = Child
-_UI_ChildReference_parentNode_feature = Parent Node
-_UI_ChildReference_compartment_feature = Compartment
-_UI_ChildReference_ownedChild_feature = Owned Child
-_UI_ChildReference_referencedChild_feature = Referenced Child
-_UI_TopNodeReference_ownedChild_feature = Owned Child
-_UI_NodeMapping_diagramNode_feature = Diagram Node
-_UI_NodeMapping_children_feature = Children
-_UI_NodeMapping_compartments_feature = Compartments
-_UI_CompartmentMapping_compartment_feature = Compartment
-_UI_CompartmentMapping_parentNode_feature = Parent Node
-_UI_CompartmentMapping_children_feature = Children
-_UI_LinkMapping_diagramLink_feature = Diagram Link
-_UI_LinkMapping_sourceMetaFeature_feature = Source Feature
-_UI_LinkMapping_linkMetaFeature_feature = Target Feature
-_UI_LinkMapping_creationConstraints_feature = Creation Constraints
-_UI_CanvasMapping_diagramCanvas_feature = Diagram Canvas
-_UI_CanvasMapping_domainModel_feature = Domain Model
-_UI_CanvasMapping_domainMetaElement_feature = Element
-_UI_CanvasMapping_palette_feature = Palette
-_UI_CanvasMapping_menuContributions_feature = Menu Contributions
-_UI_CanvasMapping_toolbarContributions_feature = Toolbar Contributions
-_UI_LabelMapping_diagramLabel_feature = Diagram Label
-_UI_LabelMapping_features_feature = Features
-_UI_LabelMapping_readOnly_feature = Read Only
-_UI_LabelMapping_viewPattern_feature = View Pattern
-_UI_LabelMapping_editPattern_feature = Edit Pattern
-_UI_LabelMapping_mapEntry_feature = Map Entry
-_UI_LinkConstraints_linkMapping_feature = Link Mapping
-_UI_LinkConstraints_sourceEnd_feature = Source End
-_UI_LinkConstraints_targetEnd_feature = Target End
-_UI_ValueExpression_body_feature = Body
-_UI_ValueExpression_language_feature = Language
-_UI_ElementInitializer_mappingEntry_feature = Mapping Entry
-_UI_FeatureSeqInitializer_initializers_feature = Initializers
-_UI_FeatureValueSpec_feature_feature = Feature
-_UI_FeatureValueSpec_featureSeqInitializer_feature = Feature Seq Initializer
-_UI_MenuOwner_contextMenu_feature = Context Menu
-_UI_ToolOwner_tool_feature = Tool
-_UI_AppearanceSteward_appearanceStyle_feature = Appearance Style
-_UI_AuditContainer_id_feature = Id
-_UI_AuditContainer_name_feature = Name
-_UI_AuditContainer_description_feature = Description
-_UI_AuditContainer_parentContainer_feature = Parent Container
-_UI_AuditContainer_audits_feature = Audits
-_UI_AuditContainer_childContainers_feature = Child Containers
-_UI_RuleBase_name_feature = Name
-_UI_RuleBase_description_feature = Description
-_UI_AuditRule_id_feature = Id
-_UI_AuditRule_rule_feature = Rule
-_UI_AuditRule_target_feature = Target
-_UI_AuditRule_severity_feature = Severity
-_UI_AuditRule_useInLiveMode_feature = Use In Live Mode
-_UI_AuditRule_message_feature = Message
-_UI_AuditRule_container_feature = Container
-_UI_DomainElementTarget_element_feature = Element
-_UI_DomainAttributeTarget_attribute_feature = Attribute
-_UI_DomainAttributeTarget_nullAsError_feature = Null As Error
-_UI_DiagramElementTarget_element_feature = Element
-_UI_NotationElementTarget_element_feature = Element
-_UI_MetricContainer_metrics_feature = Metrics
-_UI_MetricRule_key_feature = Key
-_UI_MetricRule_rule_feature = Rule
-_UI_MetricRule_target_feature = Target
-_UI_MetricRule_lowLimit_feature = Low Limit
-_UI_MetricRule_highLimit_feature = High Limit
-_UI_MetricRule_container_feature = Container
-_UI_AuditedMetricTarget_metric_feature = Metric
-_UI_Unknown_feature = Unspecified
-
_UI_Severity_INFO_literal = INFO
-_UI_Severity_WARNING_literal = WARNING
-_UI_Severity_ERROR_literal = ERROR
-_UI_VisualrepresentationPropertyCategory = Visual representation
-_UI_DomainmetainformationPropertyCategory = Domain meta information
-
-_UI_ValueExpression_langName_feature = Lang Name
-_UI_FeatureInitializer_type = Feature Initializer
-_UI_ReferenceNewElementSpec_type = Reference New Element Spec
-_UI_FeatureSeqInitializer_elementClass_feature = Element Class
-_UI_FeatureSeqInitializer_creatingInitializer_feature = Creating Initializer
-_UI_FeatureInitializer_feature_feature = Feature
-_UI_FeatureInitializer_featureSeqInitializer_feature = Feature Seq Initializer
-_UI_ReferenceNewElementSpec_newElementInitializers_feature = New Element Initializers
-
-_UI_MappingEntry_relatedDiagrams_feature = Related Diagrams
-
-# ====================================================================
-_UI_DesignLabelMapping_type = Design Label Mapping
-_UI_FeatureLabelMapping_type = Feature Label Mapping
-_UI_FeatureLabelMapping_features_feature = Features to display
-_UI_FeatureLabelMapping_editableFeatures_feature = Features to edit
-_UI_FeatureLabelMapping_viewPattern_feature = View Pattern
-_UI_FeatureLabelMapping_viewPattern_description = Pattern to produce label on diagram, depends on view method
-_UI_FeatureLabelMapping_editPattern_feature = Edit Pattern
-_UI_FeatureLabelMapping_editPattern_description = Pattern to extract values from input text, depends on edit method; if not specified then viewPattern should be used
-_UI_FeatureLabelMapping_editorPattern_feature = Editor Pattern
-_UI_FeatureLabelMapping_editorPattern_description = Pattern to produce text for in-place editor, depends on view method; if not specified then viewPattern should be used
-_UI_FeatureLabelMapping_viewMethod_feature = View Method
-_UI_FeatureLabelMapping_editMethod_feature = Edit Method
-_UI_LabelTextAccessMethod_MESSAGE_FORMAT_literal = MESSAGE_FORMAT
-_UI_LabelTextAccessMethod_NATIVE_literal = NATIVE
-_UI_LabelTextAccessMethod_REGEXP_literal = REGEXP
-_UI_LabelTextAccessMethod_PRINTF_literal = PRINTF
-_UI_FeatureValueSpec_value_feature = Value
-_UI_Language_literal_literal = literal
-_UI_ExpressionLabelMapping_type = Expression Label Mapping
-_UI_ExpressionLabelMapping_viewExpression_feature = View Expression
-_UI_ExpressionLabelMapping_viewExpression_description = Expression to produce regular label value. Evaluated in the context of the owning mapEntry.domainMetaElement
-_UI_ExpressionLabelMapping_editExpression_feature = Edit Expression
-_UI_ExpressionLabelMapping_editExpression_description = Optional expression to produce editable string representation of the label. If not set, viewExpression is used
-_UI_ExpressionLabelMapping_validateExpression_feature = Validate Expression
-_UI_ExpressionLabelMapping_validateExpression_description = Boolean expression in a string context, which able to tell whether user-entered text is valid
-_UI_FeatureLabelMapping_oclChoice_feature = Ocl Choice
-_UI_OclChoiceMapping_itemsExpression_feature = Items Expression
-_UI_OclChoiceMapping_showExpression_feature = Show Expression
-_UI_OclChoiceMappingBase_type = Ocl Choice Mapping Base
-_UI_OclChoiceMappingBase_itemsExpression_feature = Items Expression
-_UI_OclChoiceMappingBase_showExpression_feature = Show Expression
-_UI_OclChoiceLabelMapping_type = Ocl Choice Label Mapping
-_UI_OclChoiceLabelMapping_refFeature_feature = Ref Feature
-_UI_OclChoiceLabelMapping_itemsExpression_feature = Items Expression
-_UI_OclChoiceLabelMapping_showExpression_feature = Show Expression
-_UI_OclChoiceLabelMapping_feature_feature = Feature
-_UI_PinMapping_type = Pin Mapping
-_UI_NodeMapping_pins_feature = Pins
-_UI_PinMapping_diagramPin_feature = Diagram Pin
-_UI_PinMapping_oclExpression_feature = Ocl Expression
-_UI_PinMapping_parentNode_feature = Parent Node
-_UI_VisualEffectMapping_type = Visual Effect Mapping
-_UI_VisualEffectMapping_diagramPin_feature = Diagram Pin
-_UI_VisualEffectMapping_oclExpression_feature = Ocl Expression
-_UI_VisualEffectMapping_parentNode_feature = Parent Node
-_UI_MappingEntry_visualEffects_feature = Visual Effects
-_UI_VisualEffectMapping_parentMapEntry_feature = Parent Map Entry
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/plugin.xml
deleted file mode 100644
index 3277b9fe452..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/plugin.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-  <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-    <factory 
-       uri = "http://www.eclipse.org/papyrus/gmf/2020/mappings" 
-       class = "org.eclipse.papyrus.gmf.mappings.provider.GMFMapItemProviderAdapterFactory"
-       supportedTypes = 
-         "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-          org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-          org.eclipse.emf.edit.provider.ITreeItemContentProvider
-          org.eclipse.emf.edit.provider.IItemLabelProvider
-          org.eclipse.emf.edit.provider.IItemPropertySource" />
-  </extension>
-  
-
-  <extension
-    point = "org.eclipse.ui.newWizards">
-    <wizard
-      id = "org.eclipse.papyrus.gmf.mappings.presentation.GMFMapModelWizardID"
-      name = "%_UI_GMFMapModelWizard_label"
-      class = "org.eclipse.papyrus.gmf.mappings.presentation.GMFMapModelWizard"
-      category = "org.eclipse.gmf.tooling.wizardCategory/org.eclipse.gmf.tooling.wizardsDefault"
-      icon = "icons/full/obj16/GMFMapModelFile.gif">
-      <description>%_UI_GMFMapModelWizard_description</description>
-      <selection class = "org.eclipse.core.resources.IResource" />
-    </wizard>
-  </extension>
-
-  <extension point = "org.eclipse.ui.editors">
-    <editor
-        id = "org.eclipse.papyrus.gmf.mappings.presentation.GMFMapEditorID"
-        name = "%_UI_GMFMapEditor_label"
-        icon = "icons/full/obj16/GMFMapModelFile.gif"
-        extensions = "gmfmap"
-        class = "org.eclipse.papyrus.gmf.mappings.presentation.GMFMapEditor" 
-        contributorClass="org.eclipse.papyrus.gmf.mappings.presentation.GMFMapActionBarContributor" >
-    </editor>
-  </extension>    
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/pom.xml
deleted file mode 100644
index 4a4426c5e26..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.map.edit</artifactId>
-	<version>2.9.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/FilterUtil.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/FilterUtil.java
deleted file mode 100644
index 1249bff5779..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/FilterUtil.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    vano - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.mappings.presentation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-
-public class FilterUtil {
-
-	public static <T> List<T> sort(Collection<T> eObjects) {
-		ArrayList<T> result = new ArrayList<T>(eObjects);
-		Collections.sort(result, new EObjectsComparator());
-		return result;
-	}
-
-	public static <T extends EObject> List<T> filterByResourceSet(Collection<T> eClasses, ResourceSet resourceSet) {
-		return sort(filterValidEObjectsFrom(eClasses, resourceSet));
-	}
-
-	public static List<EClass> filterByContainmentFeature(Collection<EClass> eClasses, MappingEntry mappingEntry) {
-		EClass superType = null;
-		if (mappingEntry instanceof NodeMapping) {
-			NodeReference nodeReference = (NodeReference) mappingEntry.eContainer();
-			if (nodeReference != null) {
-				EReference modelReference = nodeReference.getChildrenFeature() != null ? nodeReference.getChildrenFeature() : nodeReference.getContainmentFeature();
-				if (modelReference != null) {
-					superType = modelReference.getEReferenceType();
-				}
-			}
-		} else if (mappingEntry instanceof LinkMapping) {
-			if (((LinkMapping) mappingEntry).getContainmentFeature() != null) {
-				superType = ((LinkMapping) mappingEntry).getContainmentFeature().getEReferenceType();
-			}
-		}
-		return sort(getConcreteEClasses(getSubtypesOf(filterValidEObjectsFrom(eClasses, mappingEntry.eResource().getResourceSet()), superType)));
-	}
-
-	public static List<EStructuralFeature> filterByContainerMetaclass(Collection<EStructuralFeature> eReferences, MappingEntry mappingEntry) {
-		EClass containerMetaClass = mappingEntry.getDomainMetaElement();
-		return sort(getEStructuralFeaturesOf(eReferences, containerMetaClass));
-	}
-
-	public static List<EReference> filterByContainerMetaclass(Collection<EReference> eReferences, NodeReference nodeReference, boolean containmentOnly) {
-		EClass containerMetaClass = null;
-		EClass targetMetaClass = null;
-		if (nodeReference instanceof ChildReference) {
-			containerMetaClass = ((ChildReference) nodeReference).getParentNode().getDomainMetaElement();
-		} else if (nodeReference instanceof TopNodeReference) {
-			CanvasMapping diagram = ((Mapping) nodeReference.eContainer()).getDiagram();
-			if (diagram != null) {
-				containerMetaClass = diagram.getDomainMetaElement();
-			}
-		}
-		if (nodeReference.isSetChild()) {
-			targetMetaClass = nodeReference.getChild().getDomainMetaElement();
-		}
-		List<EReference> fromHierarchy = sort(getEReferences(getEStructuralFeaturesOf(eReferences, containerMetaClass), containmentOnly));
-		if (targetMetaClass == null) {
-			// no child known, thus can take references from metaelement's hierarchy only
-			return fromHierarchy;
-		}
-		List<EReference> targetsToChild = sort(getEReferences(getEReferencesOfType(eReferences, targetMetaClass), containmentOnly));
-		for (Iterator<EReference> it = targetsToChild.iterator(); it.hasNext();) {
-			if (fromHierarchy.contains(it.next())) {
-				it.remove();
-			}
-		}
-		ArrayList<EReference> rv = new ArrayList<EReference>(fromHierarchy.size() + targetsToChild.size());
-		rv.addAll(fromHierarchy);
-		rv.addAll(targetsToChild);
-		return rv;
-	}
-
-	public static List<EReference> filterByReferenceType(Collection<EReference> eReferences, LinkMapping linkMapping) {
-		EClass referenceType = linkMapping.getDomainMetaElement();
-		return sort(getEReferences(getEReferencesOfType(eReferences, referenceType), true));
-	}
-
-	public static Collection<EObject> filterByNodeMapping(Collection<EObject> childReferences, CompartmentMapping mapping) {
-		return sort(getChildrenOf(childReferences, mapping.getParentNode(), false));
-	}
-	
-	public static Collection<EObject> filterByNodeMapping(Collection<EObject> compartments, ChildReference childReference) {
-		return getChildrenOf(compartments, childReference.getParentNode(), true);
-	}
-	
-	public static Collection<?> filterBySuperClasses(Collection<?> instances, Class<?>[] classes) {
-		return sort(getSubClassesOf(instances, classes));
-	}
-	
-	public static Collection<EStructuralFeature> filterByFeatureInitializer(Collection<EStructuralFeature> features, FeatureInitializer featureInitializer) {
-		if(featureInitializer.getFeatureSeqInitializer() == null ||
-			featureInitializer.getFeatureSeqInitializer().getElementClass() == null) {
-			return features;
-		}
-		EClass eClass = featureInitializer.getFeatureSeqInitializer().getElementClass();		
-		List<EStructuralFeature> result = new ArrayList<EStructuralFeature>(getEStructuralFeaturesOf(features, eClass));
-		for (Iterator<EStructuralFeature> it = result.iterator(); it.hasNext();) {
-			EStructuralFeature nextFeature = it.next();
-			if(nextFeature == null || !nextFeature.isChangeable()) {
-				it.remove();
-			}
-		}
-		return result;
-	}
-	
-	public static Collection<EClass> filterByFeatureSeqInitializer(Collection<EClass> eClasses, FeatureSeqInitializer featureSeqInitializer) {
-		if(featureSeqInitializer.getCreatingInitializer() != null) {
-			EStructuralFeature feature = featureSeqInitializer.getCreatingInitializer().getFeature();
-			if(feature != null && feature.getEType() instanceof EClass) {
-				for (Iterator<EClass> it = eClasses.iterator(); it.hasNext();) {
-					EClass nextEClass = it.next();
-					EClass typeEClass = (EClass)feature.getEType();
-					if(nextEClass == null || nextEClass.isAbstract() || nextEClass.isInterface() || !typeEClass.isSuperTypeOf(nextEClass)) {
-						it.remove();
-					}
-				}
-			}
-		} else if(featureSeqInitializer.getElementClass() != null) {
-			return Collections.singleton(featureSeqInitializer.getElementClass());
-		} 
-				
-		return eClasses;
-	}	
-
-	public static Collection<EClass> getSubtypesOf(Collection<EClass> eClasses, EClass superType) {
-		if (superType == null) {
-			return eClasses;
-		}
-		for (Iterator<EClass> it = eClasses.iterator(); it.hasNext();) {
-			EClass nextEClass = it.next();
-			if (nextEClass != null && !superType.isSuperTypeOf(nextEClass)) {
-				it.remove();
-			}
-		}
-		return eClasses;
-	}
-	
-	public static Collection<EClass> getConcreteEClasses(Collection<EClass> eClasses) {
-		for (Iterator<EClass> it = eClasses.iterator(); it.hasNext();) {
-			EClass nextEClass = it.next();
-			if (nextEClass != null && (nextEClass.isAbstract() || nextEClass.isInterface())) {
-				it.remove();
-			}
-			
-		}
-		return eClasses;
-	}
-
-	public static Collection<EReference> getEReferences(Collection<EReference> eReferences, boolean containmentOnly) {
-		if (!containmentOnly) {
-			return eReferences;
-		}
-		for (Iterator<EReference> it = eReferences.iterator(); it.hasNext();) {
-			EReference nextReference = it.next();
-			if (nextReference != null && !nextReference.isContainment()) {
-				it.remove();
-			}
-		}
-		return eReferences;
-	}
-
-	public static <T extends EStructuralFeature> Collection<T> getEStructuralFeaturesOf(Collection<T> structuralFeatures, EClass featureContainerEClass) {
-		Collection<T> result = getValidEStructuralFeatures(structuralFeatures);
-		if (featureContainerEClass == null) {
-			return result;
-		}
-		for (Iterator<T> it = result.iterator(); it.hasNext();) {
-			EStructuralFeature nextFeature = it.next();
-			if (nextFeature != null && !nextFeature.getEContainingClass().isSuperTypeOf(featureContainerEClass)) {
-				it.remove();
-			}
-		}
-		return result;
-	}
-
-	public static Collection<EReference> getEReferencesOfType(Collection<EReference> references, EClass referenceType) {
-		Collection<EReference> result = getValidEStructuralFeatures(references);
-		if (referenceType == null) {
-			return result;
-		}
-		for (Iterator<EReference> it = result.iterator(); it.hasNext();) {
-			EReference nextFeature = it.next();
-			if (nextFeature != null && !nextFeature.getEReferenceType().isSuperTypeOf(referenceType)) {
-				it.remove();
-			}
-		}
-		return result;
-	}
-
-	public static <T extends EStructuralFeature> Collection<T> getValidEStructuralFeatures(Collection<T> structuralFeatures) {
-		Collection<T> result = getValidEObjects(structuralFeatures);
-		for (Iterator<T> it = result.iterator(); it.hasNext();) {
-			EStructuralFeature nextFeature = it.next();
-			if (nextFeature != null && (nextFeature.getEContainingClass() == null)) {
-				it.remove();
-			}
-		}
-		return result;
-	}
-
-	public static <T extends EObject> Collection<T> filterValidEObjectsFrom(Collection<T> eClasses, ResourceSet resourceSet) {
-		Collection<T> result = getValidEObjects(eClasses);
-		for (Iterator<T> it = result.iterator(); it.hasNext();) {
-			EObject nextEClass = it.next();
-			if (nextEClass == null) {
-				continue;
-			}
-			if (nextEClass.eResource().getResourceSet() != resourceSet) {
-				it.remove();
-			}
-		}
-		return result;
-	}
-
-	public static <T extends EObject> Collection<T> getValidEObjects(Collection<T> eObjects) {
-		LinkedList<T> result = new LinkedList<T>();
-		for (T nextEObject : eObjects) {
-			if (nextEObject != null && (nextEObject.eContainer() == null)) {
-				continue;
-			}
-			result.add(nextEObject);
-		}
-		return result;
-	}
-	
-	public static <T extends EObject> Collection<T> getChildrenOf(Collection<T> elements, EObject container, boolean addNull) {
-		LinkedList<T> result = new LinkedList<T>();
-		for (T nextEObject : elements) {
-			if (nextEObject == null ? addNull : nextEObject.eContainer() == container) {
-				result.add(nextEObject);
-			}
-		}
-		return result;
-	}
-
-	public static Collection<?> getSubClassesOf(Collection<?> instances, Class<?>[] classes) {
-		LinkedList<Object> result = new LinkedList<Object>();
-		for (Object nextInstance : instances) {
-			for (int i = 0; i < classes.length; i++) {
-				if (nextInstance == null || classes[i].isAssignableFrom(nextInstance.getClass())) {
-					result.add(nextInstance);
-					break;
-				}
-			}
-		}
-		return result;
-	}
-	
-	private static class EObjectsComparator implements Comparator<Object> {
-
-		public int compare(Object o1, Object o2) {
-			if (o1 instanceof EObject && o2 instanceof EObject) {
-				EObject firstEObject = (EObject) o1;
-				EObject secondEObject = (EObject) o2;
-				return compareLabels(firstEObject, secondEObject);
-			}
-			return compareObjects(o1, o2);
-		}
-
-		private int compareObjects(Object o1, Object o2) {
-			if (o1 == null) {
-				return o2 == null ? 0 : 1;
-			} else {
-				return o2 == null ? -1 : 0;
-			}
-		}
-
-		private int compareLabels(EObject firstEObject, EObject secondEObject) {
-			String firstLabel = getLabel(firstEObject);
-			String secondLabel = getLabel(secondEObject);
-			return firstLabel == null ? (secondLabel == null ? 0 : 1) : (secondLabel == null ? -1 : firstLabel.compareTo(secondLabel));
-		}
-
-		private String getLabel(EObject eObject) {
-			AdapterFactory adapterFactory = getAdapterFactory(eObject);
-			if (adapterFactory == null) {
-				return "";
-			}
-			IItemLabelProvider itemLabelProvider = (IItemLabelProvider) adapterFactory.adapt(eObject, IItemLabelProvider.class);
-			return itemLabelProvider != null ? itemLabelProvider.getText(eObject) : eObject == null ? "" : eObject.toString();
-		}
-
-		private AdapterFactory getAdapterFactory(EObject eObject) {
-			EditingDomain editingDomain = AdapterFactoryEditingDomain.getEditingDomainFor(eObject);
-			if (editingDomain instanceof AdapterFactoryEditingDomain) {
-				return ((AdapterFactoryEditingDomain) editingDomain).getAdapterFactory();
-			}
-			return null;
-		}
-
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapActionBarContributor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapActionBarContributor.java
deleted file mode 100644
index 3084098043f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapActionBarContributor.java
+++ /dev/null
@@ -1,451 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-package org.eclipse.papyrus.gmf.mappings.presentation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.ControlAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.gmf.mappings.provider.GMFMapEditPlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This is the action bar contributor for the GMFMap model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFMapActionBarContributor
-	extends EditingDomainActionBarContributor
-	implements ISelectionChangedListener {
-	/**
-	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IEditorPart activeEditorPart;
-
-	/**
-	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelectionProvider selectionProvider;
-
-	/**
-	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IAction showPropertiesViewAction =
-		new Action(GMFMapEditPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
-			@Override
-			public void run() {
-				try {
-					getPage().showView("org.eclipse.ui.views.PropertySheet");
-				}
-				catch (PartInitException exception) {
-					GMFMapEditPlugin.INSTANCE.log(exception);
-				}
-			}
-		};
-
-	/**
-	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IAction refreshViewerAction =
-		new Action(GMFMapEditPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
-			@Override
-			public boolean isEnabled() {
-				return activeEditorPart instanceof IViewerProvider;
-			}
-
-			@Override
-			public void run() {
-				if (activeEditorPart instanceof IViewerProvider) {
-					Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
-					if (viewer != null) {
-						viewer.refresh();
-					}
-				}
-			}
-		};
-
-	protected final ToggleQualifiedLabels toggleLabelsAction = new ToggleQualifiedLabels();
-		
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> createChildActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IMenuManager createChildMenuManager;
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> createSiblingActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IMenuManager createSiblingMenuManager;
-
-	/**
-	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapActionBarContributor() {
-		super(ADDITIONS_LAST_STYLE);
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new ValidateAction();
-		controlAction = new ControlAction();
-	}
-
-	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("gmfmap-settings"));
-		toolBarManager.add(new Separator("gmfmap-additions"));
-	}
-
-	/**
-	 * This adds to the menu bar a menu and some separators for editor additions,
-	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-
-		IMenuManager submenuManager = new MenuManager(GMFMapEditPlugin.INSTANCE.getString("_UI_GMFMapEditor_menu"), "org.eclipse.papyrus.gmf.mappingsMenuID");
-		menuManager.insertAfter("additions", submenuManager);
-		submenuManager.add(new Separator("settings"));
-		submenuManager.add(new Separator("actions"));
-		submenuManager.add(new Separator("additions"));
-		submenuManager.add(new Separator("additions-end"));
-
-		// Prepare for CreateChild item addition or removal.
-		//
-		createChildMenuManager = new MenuManager(GMFMapEditPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		submenuManager.insertBefore("additions", createChildMenuManager);
-
-		// Prepare for CreateSibling item addition or removal.
-		//
-		createSiblingMenuManager = new MenuManager(GMFMapEditPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		submenuManager.insertBefore("additions", createSiblingMenuManager);
-
-		// Force an update because Eclipse hides empty menus now.
-		//
-		submenuManager.addMenuListener
-			(new IMenuListener() {
-				 public void menuAboutToShow(IMenuManager menuManager) {
-					 menuManager.updateAll(true);
-				 }
-			 });
-
-		addGlobalActions(submenuManager);
-	}
-
-	/**
-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-		activeEditorPart = part;
-
-		// Switch to the new selection provider.
-		//
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		}
-		if (part == null) {
-			selectionProvider = null;
-		}
-		else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-
-			// Fake a selection changed event to update the menus.
-			//
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-			}
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-	 * that can be added to the selected object and updating the menus accordingly.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		//
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-
-		// Query the new selection for appropriate new child/sibling descriptors
-		//
-		Collection<?> newChildDescriptors = null;
-		Collection<?> newSiblingDescriptors = null;
-
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
-			Object object = ((IStructuredSelection)selection).getFirstElement();
-
-			EditingDomain domain = ((IEditingDomainProvider)activeEditorPart).getEditingDomain();
-
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-		}
-
-		// Generate actions for selection; populate and redraw the menus.
-		//
-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingActions, null);
-			createSiblingMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-	 * by inserting them before the specified contribution item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
-		if (actions != null) {
-			for (IAction action : actions) {
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				}
-				else {
-					manager.add(action);
-				}
-			}
-		}
-	}
-		
-	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				//
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem)contributionItem).getInnerItem();
-				}
-
-				// Delete the ActionContributionItems with matching action.
-				//
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem)contributionItem).getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-		MenuManager submenuManager = null;
-
-		submenuManager = new MenuManager(GMFMapEditPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-
-		submenuManager = new MenuManager(GMFMapEditPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		populateManager(submenuManager, createSiblingActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-	}
-
-	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
-
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());		
-		menuManager.insertAfter("ui-actions", refreshViewerAction);
-
-		super.addGlobalActions(menuManager);
-		// handwritten code starts
-		toggleLabelsAction.update();
-		menuManager.insertBefore("ui-actions", toggleLabelsAction);
-		// handwritten code ends
-	}
-
-	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean removeAllReferencesOnDelete() {
-		return true;
-	}
-
-	private static class ToggleQualifiedLabels extends Action {
-		public ToggleQualifiedLabels() {
-			super(GMFMapEditPlugin.INSTANCE.getString("_UI_ToggleQualifiedLabels_menu_item"), Action.AS_CHECK_BOX);
-		}
-		@Override
-		public void run() {
-			GMFMapEditPlugin.toggleQualifiedFeatureLabelPresentation();
-			update();
-		}
-
-		void update() {
-			setChecked(GMFMapEditPlugin.isQualifiedFeatureLabels());
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapEditor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapEditor.java
deleted file mode 100644
index ed722a18645..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapEditor.java
+++ /dev/null
@@ -1,1590 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-package org.eclipse.papyrus.gmf.mappings.presentation;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.util.EditUIUtil;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphItemProviderAdapterFactory;
-import org.eclipse.papyrus.gmf.mappings.provider.EcoreItemProviderAdapterFactoryEx;
-import org.eclipse.papyrus.gmf.mappings.provider.GMFMapEditPlugin;
-import org.eclipse.papyrus.gmf.mappings.provider.GMFMapItemProviderAdapterFactory;
-import org.eclipse.papyrus.gmf.tooldef.provider.GMFToolItemProviderAdapterFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-
-/**
- * This is an example of a GMFMap model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFMapEditor
-	extends MultiPageEditorPart
-	implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
-	/**
-	 * This keeps track of the editing domain that is used to track all changes to the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AdapterFactoryEditingDomain editingDomain;
-
-	/**
-	 * This is the one adapter factory used for providing views of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory adapterFactory;
-
-	/**
-	 * This is the content outline page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IContentOutlinePage contentOutlinePage;
-
-	/**
-	 * This is a kludge...
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IStatusLineManager contentOutlineStatusLineManager;
-
-	/**
-	 * This is the content outline page's viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TreeViewer contentOutlineViewer;
-
-	/**
-	 * This is the property sheet page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PropertySheetPage propertySheetPage;
-
-	/**
-	 * This is the viewer that shadows the selection in the content outline.
-	 * The parent relation must be correctly defined for this to work.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TreeViewer selectionViewer;
-
-	/**
-	 * This keeps track of the active viewer pane, in the book.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ViewerPane currentViewerPane;
-
-	/**
-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Viewer currentViewer;
-
-	/**
-	 * This listens to which ever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelectionChangedListener selectionChangedListener;
-
-	/**
-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
-
-	/**
-	 * This keeps track of the selection of the editor as a whole.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelection editorSelection = StructuredSelection.EMPTY;
-
-	/**
-	 * The MarkerHelper is responsible for creating workspace resource markers presented
-	 * in Eclipse's Problems View.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
-
-	/**
-	 * This listens for when the outline becomes active
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IPartListener partListener =
-		new IPartListener() {
-			public void partActivated(IWorkbenchPart p) {
-				if (p instanceof ContentOutline) {
-					if (((ContentOutline)p).getCurrentPage() == contentOutlinePage) {
-						getActionBarContributor().setActiveEditor(GMFMapEditor.this);
-
-						setCurrentViewer(contentOutlineViewer);
-					}
-				}
-				else if (p instanceof PropertySheet) {
-					if (((PropertySheet)p).getCurrentPage() == propertySheetPage) {
-						getActionBarContributor().setActiveEditor(GMFMapEditor.this);
-						handleActivate();
-					}
-				}
-				else if (p == GMFMapEditor.this) {
-					handleActivate();
-				}
-			}
-			public void partBroughtToTop(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partClosed(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partDeactivated(IWorkbenchPart p) {
-				// Ignore.
-			}
-			public void partOpened(IWorkbenchPart p) {
-				// Ignore.
-			}
-		};
-
-	/**
-	 * Resources that have been removed since last activation.
-	 * @generated
-	 */
-	protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been changed since last activation.
-	 * @generated
-	 */
-	protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been saved.
-	 * @generated
-	 */
-	protected Collection<Resource> savedResources = new ArrayList<Resource>();
-
-	/**
-	 * Map to store the diagnostic associated with a resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
-	
-	/**
-	 * Controls whether the problem indication should be updated.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected boolean updateProblemIndication = true;
-
-	/**
-	 * Adapter used to update the problem indication when resources are demanded loaded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	protected EContentAdapter problemIndicationAdapter = 
-		new EContentAdapter() {
-			@Override
-			public void notifyChanged(Notification notification) {
-				if (notification.getNotifier() instanceof Resource) {
-					switch (notification.getFeatureID(Resource.class)) {
-						case Resource.RESOURCE__IS_LOADED:
-						case Resource.RESOURCE__ERRORS:
-						case Resource.RESOURCE__WARNINGS: {
-							Resource resource = (Resource)notification.getNotifier();
-							Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-							if (diagnostic.getSeverity() != Diagnostic.OK) {
-								resourceToDiagnosticMap.put(resource, diagnostic);
-							}
-							else {
-								resourceToDiagnosticMap.remove(resource);
-							}
-
-							if (updateProblemIndication) {
-								getSite().getShell().getDisplay().asyncExec
-									(new Runnable() {
-										 public void run() {
-											 updateProblemIndication();
-										 }
-									 });
-							}
-							break;
-						}
-					}
-				}
-				else {
-					super.notifyChanged(notification);
-				}
-			}
-
-			@Override
-			protected void setTarget(Resource target) {
-				basicSetTarget(target);
-			}
-
-			@Override
-			protected void unsetTarget(Resource target) {
-				basicUnsetTarget(target);
-			}
-		};
-
-	/**
-	 * This listens for workspace changes.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IResourceChangeListener resourceChangeListener =
-		new IResourceChangeListener() {
-			public void resourceChanged(IResourceChangeEvent event) {
-				IResourceDelta delta = event.getDelta();
-				try {
-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-						protected ResourceSet resourceSet = editingDomain.getResourceSet();
-						protected Collection<Resource> changedResources = new ArrayList<Resource>();
-						protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-						public boolean visit(IResourceDelta delta) {
-							if (delta.getResource().getType() == IResource.FILE) {
-								if (delta.getKind() == IResourceDelta.REMOVED ||
-								    delta.getKind() == IResourceDelta.CHANGED && delta.getFlags() != IResourceDelta.MARKERS) {
-									Resource resource = resourceSet.getResource(URI.createPlatformResourceURI(delta.getFullPath().toString(), true), false);
-									if (resource != null) {
-										if (delta.getKind() == IResourceDelta.REMOVED) {
-											removedResources.add(resource);
-										}
-										else if (!savedResources.remove(resource)) {
-											changedResources.add(resource);
-										}
-									}
-								}
-							}
-
-							return true;
-						}
-
-						public Collection<Resource> getChangedResources() {
-							return changedResources;
-						}
-
-						public Collection<Resource> getRemovedResources() {
-							return removedResources;
-						}
-					}
-
-					final ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-					delta.accept(visitor);
-
-					if (!visitor.getRemovedResources().isEmpty()) {
-						getSite().getShell().getDisplay().asyncExec
-							(new Runnable() {
-								 public void run() {
-									 removedResources.addAll(visitor.getRemovedResources());
-									 if (!isDirty()) {
-										 getSite().getPage().closeEditor(GMFMapEditor.this, false);
-									 }
-								 }
-							 });
-					}
-
-					if (!visitor.getChangedResources().isEmpty()) {
-						getSite().getShell().getDisplay().asyncExec
-							(new Runnable() {
-								 public void run() {
-									 changedResources.addAll(visitor.getChangedResources());
-									 if (getSite().getPage().getActiveEditor() == GMFMapEditor.this) {
-										 handleActivate();
-									 }
-								 }
-							 });
-					}
-				}
-				catch (CoreException exception) {
-					GMFMapEditPlugin.INSTANCE.log(exception);
-				}
-			}
-		};
-
-	/**
-	 * Handles activation of the editor or it's associated views.
-	 * @generated
-	 */
-	protected void handleActivate() {
-		// Recompute the read only state.
-		//
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-		  editingDomain.getResourceToReadOnlyMap().clear();
-
-		  // Refresh any actions that may become enabled or disabled.
-		  //
-		  setSelection(getSelection());
-		}
-
-		if (!removedResources.isEmpty()) {
-			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(GMFMapEditor.this, false);
-			}
-			else {
-				removedResources.clear();
-				changedResources.clear();
-				savedResources.clear();
-			}
-		}
-		else if (!changedResources.isEmpty()) {
-			changedResources.removeAll(savedResources);
-			handleChangedResources();
-			changedResources.clear();
-			savedResources.clear();
-		}
-	}
-
-	/**
-	 * Handles what to do with changed resources on activation.
-	 * @generated
-	 */
-	protected void handleChangedResources() {
-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
-			if (isDirty()) {
-				changedResources.addAll(editingDomain.getResourceSet().getResources());
-			}
-			editingDomain.getCommandStack().flush();
-
-			updateProblemIndication = false;
-			for (Resource resource : changedResources) {
-				if (resource.isLoaded()) {
-					resource.unload();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					}
-					catch (IOException exception) {
-						if (!resourceToDiagnosticMap.containsKey(resource)) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-					}
-				}
-			}
-
-			if (AdapterFactoryEditingDomain.isStale(editorSelection)) {
-				setSelection(StructuredSelection.EMPTY);
-			}
-
-			updateProblemIndication = true;
-			updateProblemIndication();
-		}
-	}
-  
-	/**
-	 * Updates the problems indication with the information described in the specified diagnostic.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void updateProblemIndication() {
-		if (updateProblemIndication) {
-			BasicDiagnostic diagnostic =
-				new BasicDiagnostic
-					(Diagnostic.OK,
-					 "org.eclipse.papyrus.gmf.map.edit",
-					 0,
-					 null,
-					 new Object [] { editingDomain.getResourceSet() });
-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
-					diagnostic.add(childDiagnostic);
-				}
-			}
-
-			int lastEditorPage = getPageCount() - 1;
-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
-				((ProblemEditorPart)getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					setActivePage(lastEditorPage);
-				}
-			}
-			else if (diagnostic.getSeverity() != Diagnostic.OK) {
-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
-				problemEditorPart.setDiagnostic(diagnostic);
-				problemEditorPart.setMarkerHelper(markerHelper);
-				try {
-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
-					setPageText(lastEditorPage, problemEditorPart.getPartName());
-					setActivePage(lastEditorPage);
-					showTabs();
-				}
-				catch (PartInitException exception) {
-					GMFMapEditPlugin.INSTANCE.log(exception);
-				}
-			}
-
-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
-				markerHelper.deleteMarkers(editingDomain.getResourceSet());
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					try {
-						markerHelper.createMarkers(diagnostic);
-					}
-					catch (CoreException exception) {
-						GMFMapEditPlugin.INSTANCE.log(exception);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * @generated
-	 */
-	protected boolean handleDirtyConflict() {
-		return
-			MessageDialog.openQuestion
-				(getSite().getShell(),
-				 getString("_UI_FileConflict_label"),
-				 getString("_WARN_FileConflict"));
-	}
-
-	/**
-	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapEditor() {
-		super();
-		initializeEditingDomain();
-	}
-
-	/**
-	 * This sets up the editing domain for the model editor.
-	 * <!-- begin-user-doc -->
-	 * Do not forget to use EcoreItemProviderAdapterFactoryEx
-	 * instead of default
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void initializeEditingDomainGen() {
-		// Create an adapter factory that yields item providers.
-		//
-		adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
-
-		adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new GMFMapItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new GMFGraphItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new GMFToolItemProviderAdapterFactory());
-		adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactoryEx());
-		adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
-
-		// Create the command stack that will notify this editor as commands are executed.
-		//
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener
-			(new CommandStackListener() {
-				 public void commandStackChanged(final EventObject event) {
-					 getContainer().getDisplay().asyncExec
-						 (new Runnable() {
-							  public void run() {
-								  firePropertyChange(IEditorPart.PROP_DIRTY);
-
-								  // Try to select the affected objects.
-								  //
-								  Command mostRecentCommand = ((CommandStack)event.getSource()).getMostRecentCommand();
-								  if (mostRecentCommand != null) {
-									  setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-								  }
-								  if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
-									  propertySheetPage.refresh();
-								  }
-							  }
-						  });
-				 }
-			 });
-
-		// Create the editing domain with a special command stack.
-		//
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
-	}
-
-	protected void initializeEditingDomain() {
-		initializeEditingDomainGen();
-		editingDomain.getResourceSet().getURIConverter().getURIMap().putAll(EcorePlugin.computePlatformURIMap());
-	}
-
-	/**
-	 * This is here for the listener to be able to call it.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void firePropertyChange(int action) {
-		super.firePropertyChange(action);
-	}
-
-	/**
-	 * This sets the selection into whichever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSelectionToViewer(Collection<?> collection) {
-		final Collection<?> theSelection = collection;
-		// Make sure it's okay.
-		//
-		if (theSelection != null && !theSelection.isEmpty()) {
-			Runnable runnable =
-				new Runnable() {
-					public void run() {
-						// Try to select the items in the current content viewer of the editor.
-						//
-						if (currentViewer != null) {
-							currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-						}
-					}
-				};
-			getSite().getShell().getDisplay().asyncExec(runnable);
-		}
-	}
-
-	/**
-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-		}
-
-		public Object [] getElements(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		public Object [] getChildren(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		public boolean hasChildren(Object object) {
-			Object parent = super.getParent(object);
-			return parent != null;
-		}
-
-		public Object getParent(Object object) {
-			return null;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrentViewerPane(ViewerPane viewerPane) {
-		if (currentViewerPane != viewerPane) {
-			if (currentViewerPane != null) {
-				currentViewerPane.showFocus(false);
-			}
-			currentViewerPane = viewerPane;
-		}
-		setCurrentViewer(currentViewerPane.getViewer());
-	}
-
-	/**
-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
-	 * is the current one.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrentViewer(Viewer viewer) {
-		// If it is changing...
-		//
-		if (currentViewer != viewer) {
-			if (selectionChangedListener == null) {
-				// Create the listener on demand.
-				//
-				selectionChangedListener =
-					new ISelectionChangedListener() {
-						// This just notifies those things that are affected by the section.
-						//
-						public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
-							setSelection(selectionChangedEvent.getSelection());
-						}
-					};
-			}
-
-			// Stop listening to the old one.
-			//
-			if (currentViewer != null) {
-				currentViewer.removeSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Start listening to the new one.
-			//
-			if (viewer != null) {
-				viewer.addSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Remember it.
-			//
-			currentViewer = viewer;
-
-			// Set the editors selection based on the current viewer's selection.
-			//
-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
-		}
-	}
-
-	/**
-	 * This returns the viewer as required by the {@link IViewerProvider} interface.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Viewer getViewer() {
-		return currentViewer;
-	}
-
-	/**
-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createContextMenuFor(StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp");
-		contextMenu.add(new Separator("additions"));
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu= contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, new UnwrappingSelectionProvider(viewer));
-
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
-	}
-
-	public void createModel() {
-		if (getEditorInput() instanceof IFileEditorInput) {
-			createModelGen();
-		} else {
-			Exception exception = null;
-			Resource resource = null;
-			IStorageEditorInput storageEditorInput = (IStorageEditorInput)getEditorInput();
-			try
-			{
-				IStorage storage = storageEditorInput.getStorage();
-				resource = editingDomain.createResource("*.gmfmap");
-				resource.setURI(URI.createURI(storage.getFullPath().toString()));
-				resource.load(storage.getContents(), null);
-			}
-			catch (Exception e)
-			{
-				exception = e;
-			}
-
-			Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-			if (diagnostic.getSeverity() != Diagnostic.OK)
-			{
-				resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
-			}
-			editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);      
-		}
-		
-	}
-
-	/**
-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createModelGen() {
-		URI resourceURI = EditUIUtil.getURI(getEditorInput());
-		Exception exception = null;
-		Resource resource = null;
-		try {
-			// Load the resource through the editing domain.
-			//
-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-		}
-		catch (Exception e) {
-			exception = e;
-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
-		}
-
-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-		if (diagnostic.getSeverity() != Diagnostic.OK) {
-			resourceToDiagnosticMap.put(resource,  analyzeResourceProblems(resource, exception));
-		}
-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-	}
-
-	/**
-	 * Returns a diagnostic describing the errors and warnings listed in the resource
-	 * and the specified exception (if any).
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
-			BasicDiagnostic basicDiagnostic =
-				new BasicDiagnostic
-					(Diagnostic.ERROR,
-					 "org.eclipse.papyrus.gmf.map.edit",
-					 0,
-					 getString("_UI_CreateModelError_message", resource.getURI()),
-					 new Object [] { exception == null ? (Object)resource : exception });
-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
-			return basicDiagnostic;
-		}
-		else if (exception != null) {
-			return
-				new BasicDiagnostic
-					(Diagnostic.ERROR,
-					 "org.eclipse.papyrus.gmf.map.edit",
-					 0,
-					 getString("_UI_CreateModelError_message", resource.getURI()),
-					 new Object[] { exception });
-		}
-		else {
-			return Diagnostic.OK_INSTANCE;
-		}
-	}
-
-	/**
-	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void createPages() {
-		// Creates the model from the editor input
-		//
-		createModel();
-
-		// Only creates the other pages if there is something that can be edited
-		//
-		if (!getEditingDomain().getResourceSet().getResources().isEmpty()) {
-			// Create a page for the selection tree view.
-			//
-			{
-				ViewerPane viewerPane =
-					new ViewerPane(getSite().getPage(), GMFMapEditor.this) {
-						@Override
-						public Viewer createViewer(Composite composite) {
-							Tree tree = new Tree(composite, SWT.MULTI);
-							TreeViewer newTreeViewer = new TreeViewer(tree);
-							return newTreeViewer;
-						}
-						@Override
-						public void requestActivation() {
-							super.requestActivation();
-							setCurrentViewerPane(this);
-						}
-					};
-				viewerPane.createControl(getContainer());
-
-				selectionViewer = (TreeViewer)viewerPane.getViewer();
-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				selectionViewer.setInput(editingDomain.getResourceSet());
-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-				viewerPane.setTitle(editingDomain.getResourceSet());
-
-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(selectionViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));
-			}
-
-			getSite().getShell().getDisplay().asyncExec
-				(new Runnable() {
-					 public void run() {
-						 setActivePage(0);
-					 }
-				 });
-		}
-
-		// Ensures that this editor will only display the page's tab
-		// area if there are more than one page
-		//
-		getContainer().addControlListener
-			(new ControlAdapter() {
-				boolean guard = false;
-				@Override
-				public void controlResized(ControlEvent event) {
-					if (!guard) {
-						guard = true;
-						hideTabs();
-						guard = false;
-					}
-				}
-			 });
-
-		getSite().getShell().getDisplay().asyncExec
-			(new Runnable() {
-				 public void run() {
-					 updateProblemIndication();
-				 }
-			 });
-	}
-
-	/**
-	 * If there is just one page in the multi-page editor part,
-	 * this hides the single tab at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void hideTabs() {
-		if (getPageCount() <= 1) {
-			setPageText(0, "");
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder)getContainer()).setTabHeight(1);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y + 6);
-			}
-		}
-	}
-
-	/**
-	 * If there is more than one page in the multi-page editor part,
-	 * this shows the tabs at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void showTabs() {
-		if (getPageCount() > 1) {
-			setPageText(0, getString("_UI_SelectionPage_label"));
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder)getContainer()).setTabHeight(SWT.DEFAULT);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y - 6);
-			}
-		}
-	}
-
-	/**
-	 * This is used to track the active viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void pageChange(int pageIndex) {
-		super.pageChange(pageIndex);
-
-		if (contentOutlinePage != null) {
-			handleContentOutlineSelection(contentOutlinePage.getSelection());
-		}
-	}
-
-	/**
-	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("rawtypes")
-	@Override
-	public Object getAdapter(Class key) {
-		if (key.equals(IContentOutlinePage.class)) {
-			return showOutlineView() ? getContentOutlinePage() : null;
-		}
-		else if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheetPage();
-		}
-		else if (key.equals(IGotoMarker.class)) {
-			return this;
-		}
-		else {
-			return super.getAdapter(key);
-		}
-	}
-
-	/**
-	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IContentOutlinePage getContentOutlinePage() {
-		if (contentOutlinePage == null) {
-			// The content outline is just a tree.
-			//
-			class MyContentOutlinePage extends ContentOutlinePage {
-				@Override
-				public void createControl(Composite parent) {
-					super.createControl(parent);
-					contentOutlineViewer = getTreeViewer();
-					contentOutlineViewer.addSelectionChangedListener(this);
-
-					// Set up the tree viewer.
-					//
-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-					contentOutlineViewer.setInput(editingDomain.getResourceSet());
-
-					// Make sure our popups work.
-					//
-					createContextMenuFor(contentOutlineViewer);
-
-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
-					  // Select the root object in the view.
-					  //
-					  contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-					}
-				}
-
-				@Override
-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-					super.makeContributions(menuManager, toolBarManager, statusLineManager);
-					contentOutlineStatusLineManager = statusLineManager;
-				}
-
-				@Override
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			}
-
-			contentOutlinePage = new MyContentOutlinePage();
-
-			// Listen to selection so that we can handle it is a special way.
-			//
-			contentOutlinePage.addSelectionChangedListener
-				(new ISelectionChangedListener() {
-					 // This ensures that we handle selections correctly.
-					 //
-					 public void selectionChanged(SelectionChangedEvent event) {
-						 handleContentOutlineSelection(event.getSelection());
-					 }
-				 });
-		}
-
-		return contentOutlinePage;
-	}
-
-	/**
-	 * This accesses a cached version of the property sheet.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage == null) {
-			propertySheetPage =
-				new ExtendedPropertySheetPage(editingDomain) {
-					@Override
-					public void setSelectionToViewer(List<?> selection) {
-						GMFMapEditor.this.setSelectionToViewer(selection);
-						GMFMapEditor.this.setFocus();
-					}
-
-					@Override
-					public void setActionBars(IActionBars actionBars) {
-						super.setActionBars(actionBars);
-						getActionBarContributor().shareGlobalActions(this, actionBars);
-					}
-				};
-			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
-		}
-
-		return propertySheetPage;
-	}
-
-	/**
-	 * This deals with how we want selection in the outliner to affect the other views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void handleContentOutlineSelection(ISelection selection) {
-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
-			if (selectedElements.hasNext()) {
-				// Get the first selected element.
-				//
-				Object selectedElement = selectedElements.next();
-
-				// If it's the selection viewer, then we want it to select the same selection as this selection.
-				//
-				if (currentViewerPane.getViewer() == selectionViewer) {
-					ArrayList<Object> selectionList = new ArrayList<Object>();
-					selectionList.add(selectedElement);
-					while (selectedElements.hasNext()) {
-						selectionList.add(selectedElements.next());
-					}
-
-					// Set the selection to the widget.
-					//
-					selectionViewer.setSelection(new StructuredSelection(selectionList));
-				}
-				else {
-					// Set the input to the widget.
-					//
-					if (currentViewerPane.getViewer().getInput() != selectedElement) {
-						currentViewerPane.getViewer().setInput(selectedElement);
-						currentViewerPane.setTitle(selectedElement);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return ((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded();
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// Save only resources that have actually changed.
-		//
-		final Map<Object, Object> saveOptions = new HashMap<Object, Object>();
-		saveOptions.put(Resource.OPTION_SAVE_ONLY_IF_CHANGED, Resource.OPTION_SAVE_ONLY_IF_CHANGED_MEMORY_BUFFER);
-
-		// Do the work within an operation because this is a long running activity that modifies the workbench.
-		//
-		WorkspaceModifyOperation operation =
-			new WorkspaceModifyOperation() {
-				// This is the method that gets invoked when the operation runs.
-				//
-				@Override
-				public void execute(IProgressMonitor monitor) {
-					// Save the resources to the file system.
-					//
-					boolean first = true;
-					for (Resource resource : editingDomain.getResourceSet().getResources()) {
-						if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
-							try {
-								long timeStamp = resource.getTimeStamp();
-								resource.save(saveOptions);
-								if (resource.getTimeStamp() != timeStamp) {
-									savedResources.add(resource);
-								}
-							}
-							catch (Exception exception) {
-								resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-							}
-							first = false;
-						}
-					}
-				}
-			};
-
-		updateProblemIndication = false;
-		try {
-			// This runs the options, and shows progress.
-			//
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-			// Refresh the necessary state.
-			//
-			((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-		}
-		catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			//
-			GMFMapEditPlugin.INSTANCE.log(exception);
-		}
-		updateProblemIndication = true;
-		updateProblemIndication();
-	}
-
-	/**
-	 * This returns whether something has been persisted to the URI of the specified resource.
-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean isPersisted(Resource resource) {
-		boolean result = false;
-		try {
-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
-			if (stream != null) {
-				result = true;
-				stream.close();
-			}
-		}
-		catch (IOException e) {
-			// Ignore
-		}
-		return result;
-	}
-
-	/**
-	 * This always returns true because it is not currently supported.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * This also changes the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
-		saveAsDialog.open();
-		IPath path = saveAsDialog.getResult();
-		if (path != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (file != null) {
-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
-			}
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void doSaveAs(URI uri, IEditorInput editorInput) {
-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		IProgressMonitor progressMonitor =
-			getActionBars().getStatusLineManager() != null ?
-				getActionBars().getStatusLineManager().getProgressMonitor() :
-				new NullProgressMonitor();
-		doSave(progressMonitor);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Ensures that the tree editor page is selected for the marker target navigation
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void gotoMarker(IMarker marker) {
-		updateProblemIndication = false;
-		try {
-			setActivePage(0);
-			gotoMarkerGen(marker);
-		} finally {
-			updateProblemIndication = true;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */	
-	public void gotoMarkerGen(IMarker marker) {
-		try {
-			if (marker.getType().equals(EValidator.MARKER)) {
-				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
-				if (uriAttribute != null) {
-					URI uri = URI.createURI(uriAttribute);
-					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
-					if (eObject != null) {
-					  setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
-					}
-				}
-			}
-		}
-		catch (CoreException exception) {
-			GMFMapEditPlugin.INSTANCE.log(exception);
-		}
-	}
-
-	/**
-	 * This is called during startup.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput editorInput) {
-		setSite(site);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setFocus() {
-		if (currentViewerPane != null) {
-			currentViewerPane.setFocus();
-		}
-		else {
-			getControl(getActivePage()).setFocus();
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ISelection getSelection() {
-		return editorSelection;
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
-	 * Calling this result will notify the listeners.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSelection(ISelection selection) {
-		editorSelection = selection;
-
-		for (ISelectionChangedListener listener : selectionChangedListeners) {
-			listener.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-		setStatusLineManager(selection);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatusLineManager(ISelection selection) {
-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ?
-			contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
-
-		if (statusLineManager != null) {
-			if (selection instanceof IStructuredSelection) {
-				Collection<?> collection = ((IStructuredSelection)selection).toList();
-				switch (collection.size()) {
-					case 0: {
-						statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
-						break;
-					}
-					case 1: {
-						String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-						statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
-						break;
-					}
-					default: {
-						statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
-						break;
-					}
-				}
-			}
-			else {
-				statusLineManager.setMessage("");
-			}
-		}
-	}
-
-	/**
-	 * This looks up a string in the plugin's plugin.properties file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static String getString(String key) {
-		return GMFMapEditPlugin.INSTANCE.getString(key);
-	}
-
-	/**
-	 * This looks up a string in plugin.properties, making a substitution.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static String getString(String key, Object s1) {
-		return GMFMapEditPlugin.INSTANCE.getString(key, new Object [] { s1 });
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		((IMenuListener)getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EditingDomainActionBarContributor getActionBarContributor() {
-		return (EditingDomainActionBarContributor)getEditorSite().getActionBarContributor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IActionBars getActionBars() {
-		return getActionBarContributor().getActionBars();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		updateProblemIndication = false;
-
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-
-		getSite().getPage().removePartListener(partListener);
-
-		adapterFactory.dispose();
-
-		if (getActionBarContributor().getActiveEditor() == this) {
-			getActionBarContributor().setActiveEditor(null);
-		}
-
-		if (propertySheetPage != null) {
-			propertySheetPage.dispose();
-		}
-
-		if (contentOutlinePage != null) {
-			contentOutlinePage.dispose();
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * Returns whether the outline view should be presented to the user.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean showOutlineView() {
-		return true;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapModelWizard.java
deleted file mode 100644
index cbbffee6c3e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/GMFMapModelWizard.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- *  Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-package org.eclipse.papyrus.gmf.mappings.presentation;
-
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.papyrus.gmf.mappings.provider.GMFMapEditPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-/**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
-public class GMFMapModelWizard extends Wizard implements INewWizard {
-
-	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GMFMapModelWizardNewFileCreationPage newFileCreationPage;
-
-	protected MapRefModelPages refPages;
-
-	/**
-	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
-
-	/**
-	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IWorkbench workbench;
-
-	/**
-	 * This just records the information.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-		setWindowTitle(GMFMapEditPlugin.INSTANCE.getString("_UI_Wizard_label"));
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(GMFMapEditPlugin.INSTANCE.getImage("full/wizban/NewGMFMap")));
-		refPages = new MapRefModelPages(true, null);
-	}
-
-	/**
-	 * Create a new model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected EObject createInitialModel() {
-		return refPages.createMapping();
-	}
-
-	/**
-	 * Do the work after everything is specified.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public boolean performFinish() {
-		try {
-			// Remember the file.
-			//
-			final IFile modelFile = getModelFile();
-
-			// Do the work within an operation.
-			//
-			WorkspaceModifyOperation operation =
-				new WorkspaceModifyOperation() {
-					protected void execute(IProgressMonitor progressMonitor) {
-						try {
-							// Create a resource set
-							//
-							ResourceSet resourceSet = new ResourceSetImpl();
-
-							// Get the URI of the model file.
-							//
-							URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), true);
-
-							// Create a resource for this file.
-							//
-							Resource resource = resourceSet.createResource(fileURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-
-							// Add the initial model object to the contents.
-							//
-							EObject rootObject = createInitialModel();
-							if (rootObject != null) {
-								resource.getContents().add(rootObject);
-							}
-
-							// Save the contents of the resource to the file system.
-							//
-							Map<String, String> options = new HashMap<String, String>();
-							options.put(XMLResource.OPTION_ENCODING, "UTF-8");
-							resource.save(options);
-						}
-						catch (Exception exception) {
-							GMFMapEditPlugin.INSTANCE.log(exception);
-						}
-						finally {
-							progressMonitor.done();
-						}
-					}
-				};
-
-			getContainer().run(false, false, operation);
-
-			// Select the new file resource in the current view.
-			//
-			IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-			IWorkbenchPage page = workbenchWindow.getActivePage();
-			final IWorkbenchPart activePart = page.getActivePart();
-			if (activePart instanceof ISetSelectionTarget) {
-				final ISelection targetSelection = new StructuredSelection(modelFile);
-				getShell().getDisplay().asyncExec
-					(new Runnable() {
-						 public void run() {
-							 ((ISetSelectionTarget)activePart).selectReveal(targetSelection);
-						 }
-					 });
-			}
-
-			// Open an editor on the new file.
-			//
-			try {
-				page.openEditor
-					(new FileEditorInput(modelFile),
-					 workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-			}
-			catch (PartInitException exception) {
-				MessageDialog.openError(workbenchWindow.getShell(), GMFMapEditPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
-				return false;
-			}
-
-			return true;
-		}
-		catch (Exception exception) {
-			GMFMapEditPlugin.INSTANCE.log(exception);
-			return false;
-		}
-	}
-
-	/**
-	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public class GMFMapModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
-		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public GMFMapModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
-			super(pageId, selection);
-		}
-
-		/**
-		 * The framework calls this to see if the file is correct.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected boolean validatePage() {
-			if (super.validatePage()) {
-				// Make sure the file ends in ".gmfmap".
-				//
-				String requiredExt = GMFMapEditPlugin.INSTANCE.getString("_UI_GMFMapEditorFilenameExtension");
-				String enteredExt = new Path(getFileName()).getFileExtension();
-				if (enteredExt == null || !enteredExt.equals(requiredExt)) {
-					setErrorMessage(GMFMapEditPlugin.INSTANCE.getString("_WARN_FilenameExtension", new Object [] { requiredExt }));
-					return false;
-				}
-				else {
-					return true;
-				}
-			}
-			else {
-				return false;
-			}
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public IFile getModelFile() {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
-		}
-	}
-
-	/**
-	 * The framework calls this to create the contents of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void addPages() {
-		// Create a page, set the title, and the initial model file name.
-		//
-		newFileCreationPage = new GMFMapModelWizardNewFileCreationPage("Whatever", selection);
-		newFileCreationPage.setTitle(GMFMapEditPlugin.INSTANCE.getString("_UI_GMFMapModelWizard_label"));
-		newFileCreationPage.setDescription(GMFMapEditPlugin.INSTANCE.getString("_UI_GMFMapModelWizard_description"));
-		newFileCreationPage.setFileName(GMFMapEditPlugin.INSTANCE.getString("_UI_GMFMapEditorFilenameDefaultBase") + "." + GMFMapEditPlugin.INSTANCE.getString("_UI_GMFMapEditorFilenameExtension"));
-		addPage(newFileCreationPage);
-
-		// Try and get the resource selection to determine a current directory for the file dialog.
-		//
-		if (selection != null && !selection.isEmpty()) {
-			// Get the resource...
-			//
-			Object selectedElement = selection.iterator().next();
-			if (selectedElement instanceof IResource) {
-				// Get the resource parent, if its a file.
-				//
-				IResource selectedResource = (IResource)selectedElement;
-				if (selectedResource.getType() == IResource.FILE) {
-					selectedResource = selectedResource.getParent();
-				}
-
-				// This gives us a directory...
-				//
-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
-					// Set this for the container.
-					//
-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
-
-					// Make up a unique new name here.
-					//
-					String defaultModelBaseFilename = GMFMapEditPlugin.INSTANCE.getString("_UI_GMFMapEditorFilenameDefaultBase");
-					String defaultModelFilenameExtension = GMFMapEditPlugin.INSTANCE.getString("_UI_GMFMapEditorFilenameExtension");
-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
-					for (int i = 1; ((IContainer)selectedResource).findMember(modelFilename) != null; ++i) {
-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
-					}
-					newFileCreationPage.setFileName(modelFilename);
-				}
-			}
-		}
-
-		refPages.addPages(this, selection);
-	}
-
-	/**
-	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IFile getModelFile() {
-		return newFileCreationPage.getModelFile();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/MapRefModelPages.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/MapRefModelPages.java
deleted file mode 100644
index 7f4dc7c7e5f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/presentation/MapRefModelPages.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Dmitry Stadnik - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.mappings.presentation;
-
-import java.util.List;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.util.Assistant;
-import org.eclipse.papyrus.gmf.internal.common.ui.ComboElementSelectorExtension;
-import org.eclipse.papyrus.gmf.internal.common.ui.CreateNewModelExtension;
-import org.eclipse.papyrus.gmf.internal.common.ui.ElementSelectorExtension;
-import org.eclipse.papyrus.gmf.internal.common.ui.ExtensibleModelSelectionPage;
-import org.eclipse.papyrus.gmf.internal.common.ui.ListElementSelectorExtension;
-import org.eclipse.papyrus.gmf.internal.common.ui.PredefinedModelExtension;
-import org.eclipse.papyrus.gmf.internal.common.ui.ResourceLocationProvider;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-
-/**
- * @author dstadnik
- */
-public class MapRefModelPages {
-
-	private final boolean withSelectors;
-
-	private ResourceSet resourceSet;
-
-	private ExtensibleModelSelectionPage domainModelSelectionPage;
-
-	private ExtensibleModelSelectionPage graphModelSelectionPage;
-
-	private ExtensibleModelSelectionPage toolModelSelectionPage;
-
-	public MapRefModelPages(boolean withSelectors, ResourceSet resourceSet) {
-		this.withSelectors = withSelectors;
-		this.resourceSet = resourceSet;
-	}
-
-	protected ResourceSet getResourceSet() {
-		if (resourceSet == null) {
-			resourceSet = new ResourceSetImpl();
-		}
-		return resourceSet;
-	}
-
-	public ExtensibleModelSelectionPage getDomainModelSelectionPage() {
-		return domainModelSelectionPage;
-	}
-
-	public ExtensibleModelSelectionPage getGraphModelSelectionPage() {
-		return graphModelSelectionPage;
-	}
-
-	public ExtensibleModelSelectionPage getToolModelSelectionPage() {
-		return toolModelSelectionPage;
-	}
-
-	public void addPages(Wizard wizard, ISelection selection) {
-		ResourceLocationProvider rloc = new ResourceLocationProvider(selection);
-		addDomainPage(wizard, rloc);
-		addGraphPage(wizard, rloc);
-		addToolPage(wizard, rloc);
-	}
-
-	protected void addDomainPage(Wizard wizard, ResourceLocationProvider rloc) {
-		domainModelSelectionPage = new ExtensibleModelSelectionPage("domain", rloc, getResourceSet(), "ecore"); //$NON-NLS-1$ //$NON-NLS-2$
-		domainModelSelectionPage.setTitle("Select Domain Model");
-		domainModelSelectionPage.setDescription("Load domain model and select element for canvas mapping.");
-		List<URI> uris = rloc.getSelectedURIs("ecore"); //$NON-NLS-1$
-		uris.add(URI.createURI("platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore")); //$NON-NLS-1$
-		domainModelSelectionPage.addExtension("prem", new PredefinedModelExtension(domainModelSelectionPage, uris)); //$NON-NLS-1$
-		if (withSelectors) {
-			domainModelSelectionPage.addExtension("domainModel", new ComboElementSelectorExtension() { //$NON-NLS-1$
-
-						protected String getModelElementName() {
-							return "Package:";
-						}
-
-						protected String getModelElementLabel(EObject modelElement) {
-							String name = ((EPackage) modelElement).getName();
-							if (name == null || name.trim().length() == 0) {
-								name = "<unnamed>";
-							}
-							return name;
-						}
-
-						protected EClass getModelElementClass() {
-							return EcorePackage.eINSTANCE.getEPackage();
-						}
-					});
-			domainModelSelectionPage.addExtension("domainElement", new ListElementSelectorExtension() { //$NON-NLS-1$
-
-						protected String getModelElementName() {
-							return "Class:";
-						}
-
-						protected String getModelElementLabel(EObject modelElement) {
-							String name = ((EClass) modelElement).getName();
-							if (name == null || name.trim().length() == 0) {
-								name = "<unnamed>";
-							}
-							return name;
-						}
-
-						protected EClass getModelElementClass() {
-							return EcorePackage.eINSTANCE.getEClass();
-						}
-					});
-		}
-		wizard.addPage(domainModelSelectionPage);
-	}
-
-	protected void addGraphPage(Wizard wizard, ResourceLocationProvider rloc) {
-		graphModelSelectionPage = new ExtensibleModelSelectionPage("graph", rloc, getResourceSet(), "gmfgraph"); //$NON-NLS-1$ //$NON-NLS-2$
-		graphModelSelectionPage.setTitle("Select Diagram Canvas");
-		graphModelSelectionPage.setDescription("Load graphical definition model and select diagram canvas for canvas mapping.");
-		List<URI> uris = rloc.getSelectedURIs("gmfgraph"); //$NON-NLS-1$
-		uris.add(Assistant.getBasicGraphDef());
-		graphModelSelectionPage.addExtension("prem", new PredefinedModelExtension(graphModelSelectionPage, uris)); //$NON-NLS-1$
-		if (withSelectors) {
-			graphModelSelectionPage.addExtension("canvas", new ComboElementSelectorExtension() { //$NON-NLS-1$
-
-						protected String getModelElementName() {
-							return "Diagram Canvas:";
-						}
-
-						protected String getModelElementLabel(EObject modelElement) {
-							String name = ((Canvas) modelElement).getName();
-							if (name == null || name.trim().length() == 0) {
-								name = "<unnamed>";
-							}
-							return name;
-						}
-
-						protected EClass getModelElementClass() {
-							return GMFGraphPackage.eINSTANCE.getCanvas();
-						}
-					});
-		}
-		wizard.addPage(graphModelSelectionPage);
-	}
-
-	protected void addToolPage(Wizard wizard, ResourceLocationProvider rloc) {
-		toolModelSelectionPage = new ExtensibleModelSelectionPage("tool", rloc, getResourceSet(), "gmftool") { //$NON-NLS-1$ //$NON-NLS-2$
-
-			public void validatePage() {
-				CreateNewModelExtension ext = (CreateNewModelExtension) getExtension("new"); //$NON-NLS-1$
-				if (ext != null) {
-					ext.validatePage();
-				} else {
-					super.validatePage();
-				}
-			}
-		};
-		toolModelSelectionPage.setTitle("Select Diagram Palette");
-		toolModelSelectionPage.setDescription("Load tooling definition model and select diagram palette for canvas mapping.");
-		if (withSelectors) {
-			toolModelSelectionPage.addExtension("palette", new ComboElementSelectorExtension() { //$NON-NLS-1$
-
-						protected String getModelElementName() {
-							return "Diagram Palette:";
-						}
-
-						protected String getModelElementLabel(EObject modelElement) {
-							String title = ((Palette) modelElement).getTitle();
-							if (title == null || title.trim().length() == 0) {
-								title = "<untitled>";
-							}
-							return title;
-						}
-
-						protected EClass getModelElementClass() {
-							return GMFToolPackage.eINSTANCE.getPalette();
-						}
-					});
-		}
-		wizard.addPage(toolModelSelectionPage);
-	}
-
-	public void allowNewToolingModel() {
-		toolModelSelectionPage.addExtension("new", new CreateNewModelExtension(toolModelSelectionPage)); //$NON-NLS-1$
-	}
-
-	public CreateNewModelExtension getCreateNewToolingModelExt() {
-		if (toolModelSelectionPage == null) {
-			return null;
-		}
-		return (CreateNewModelExtension) toolModelSelectionPage.getExtension("new"); //$NON-NLS-1$
-	}
-
-	public boolean shouldCreateNewToolingModel(boolean defaultValue) {
-		CreateNewModelExtension ext = getCreateNewToolingModelExt();
-		if (ext == null) {
-			return defaultValue;
-		}
-		return ext.shouldCreateNewModel();
-	}
-
-	protected ElementSelectorExtension getElementSelectorExtension(ExtensibleModelSelectionPage page, String selectorId) {
-		if (page == null) {
-			return null;
-		}
-		return (ElementSelectorExtension) page.getExtension(selectorId);
-	}
-
-	protected EObject getSelectedElement(ExtensibleModelSelectionPage page, String selectorId) {
-		ElementSelectorExtension ext = getElementSelectorExtension(page, selectorId);
-		if (ext == null) {
-			return null;
-		}
-		return ext.getModelElement();
-	}
-
-	public ElementSelectorExtension getDomainModelExt() {
-		return getElementSelectorExtension(domainModelSelectionPage, "domainModel"); //$NON-NLS-1$
-	}
-
-	public ElementSelectorExtension getDomainElementExt() {
-		return getElementSelectorExtension(domainModelSelectionPage, "domainElement"); //$NON-NLS-1$
-	}
-
-	public ElementSelectorExtension getCanvasExt() {
-		return getElementSelectorExtension(graphModelSelectionPage, "canvas"); //$NON-NLS-1$
-	}
-
-	public ElementSelectorExtension getPaletteExt() {
-		return getElementSelectorExtension(toolModelSelectionPage, "palette"); //$NON-NLS-1$
-	}
-
-	public EPackage getDomainModel() {
-		return (EPackage) getSelectedElement(domainModelSelectionPage, "domainModel"); //$NON-NLS-1$
-	}
-
-	public EClass getDomainElement() {
-		return (EClass) getSelectedElement(domainModelSelectionPage, "domainElement"); //$NON-NLS-1$
-	}
-
-	public Canvas getCanvas() {
-		return (Canvas) getSelectedElement(graphModelSelectionPage, "canvas"); //$NON-NLS-1$
-	}
-
-	public Palette getPalette() {
-		return (Palette) getSelectedElement(toolModelSelectionPage, "palette"); //$NON-NLS-1$
-	}
-
-	public Mapping createMapping() {
-		Mapping mapping = GMFMapPackage.eINSTANCE.getGMFMapFactory().createMapping();
-		CanvasMapping canvasMapping = GMFMapPackage.eINSTANCE.getGMFMapFactory().createCanvasMapping();
-		mapping.setDiagram(canvasMapping);
-		EPackage domainModel = getDomainModel();
-		if (domainModel != null) {
-			canvasMapping.setDomainModel(domainModel);
-		}
-		EClass domainElement = getDomainElement();
-		if (domainElement != null) {
-			canvasMapping.setDomainMetaElement(domainElement);
-		}
-		Canvas canvas = getCanvas();
-		if (canvas != null) {
-			canvasMapping.setDiagramCanvas(canvas);
-		}
-		Palette palette = getPalette();
-		if (palette != null) {
-			canvasMapping.setPalette(palette);
-		}
-		return mapping;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditContainerItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditContainerItemProvider.java
deleted file mode 100644
index dc4cd95999a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditContainerItemProvider.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.AuditContainer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AuditContainerItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditContainerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdPropertyDescriptor(object);
-			addNamePropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AuditContainer_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AuditContainer_id_feature", "_UI_AuditContainer_type"),
-				 GMFMapPackage.eINSTANCE.getAuditContainer_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AuditContainer_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AuditContainer_name_feature", "_UI_AuditContainer_type"),
-				 GMFMapPackage.eINSTANCE.getAuditContainer_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AuditContainer_description_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AuditContainer_description_feature", "_UI_AuditContainer_type"),
-				 GMFMapPackage.eINSTANCE.getAuditContainer_Description(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getAuditContainer_Audits());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getAuditContainer_ChildContainers());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns AuditContainer.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AuditContainer"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AuditContainer)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AuditContainer_type") :
-			getString("_UI_AuditContainer_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(AuditContainer.class)) {
-			case GMFMapPackage.AUDIT_CONTAINER__ID:
-			case GMFMapPackage.AUDIT_CONTAINER__NAME:
-			case GMFMapPackage.AUDIT_CONTAINER__DESCRIPTION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__AUDITS:
-			case GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getAuditContainer_Audits(),
-				 GMFMapFactory.eINSTANCE.createAuditRule()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getAuditContainer_ChildContainers(),
-				 GMFMapFactory.eINSTANCE.createAuditContainer()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditRuleItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditRuleItemProvider.java
deleted file mode 100644
index 51e999f4e84..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditRuleItemProvider.java
+++ /dev/null
@@ -1,359 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.AuditRule;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.AuditRule} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AuditRuleItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditRuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-			addIdPropertyDescriptor(object);
-			addSeverityPropertyDescriptor(object);
-			addUseInLiveModePropertyDescriptor(object);
-			addMessagePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Id feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIdPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AuditRule_id_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AuditRule_id_feature", "_UI_AuditRule_type"),
-				 GMFMapPackage.eINSTANCE.getAuditRule_Id(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RuleBase_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RuleBase_name_feature", "_UI_RuleBase_type"),
-				 GMFMapPackage.eINSTANCE.getRuleBase_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Severity feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addSeverityPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AuditRule_severity_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AuditRule_severity_feature", "_UI_AuditRule_type"),
-				 GMFMapPackage.eINSTANCE.getAuditRule_Severity(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Use In Live Mode feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addUseInLiveModePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AuditRule_useInLiveMode_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AuditRule_useInLiveMode_feature", "_UI_AuditRule_type"),
-				 GMFMapPackage.eINSTANCE.getAuditRule_UseInLiveMode(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Message feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMessagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AuditRule_message_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AuditRule_message_feature", "_UI_AuditRule_type"),
-				 GMFMapPackage.eINSTANCE.getAuditRule_Message(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RuleBase_description_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RuleBase_description_feature", "_UI_RuleBase_type"),
-				 GMFMapPackage.eINSTANCE.getRuleBase_Description(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getAuditRule_Rule());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getAuditRule_Target());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns AuditRule.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AuditRule"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AuditRule)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_AuditRule_type") :
-			getString("_UI_AuditRule_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(AuditRule.class)) {
-			case GMFMapPackage.AUDIT_RULE__NAME:
-			case GMFMapPackage.AUDIT_RULE__DESCRIPTION:
-			case GMFMapPackage.AUDIT_RULE__ID:
-			case GMFMapPackage.AUDIT_RULE__SEVERITY:
-			case GMFMapPackage.AUDIT_RULE__USE_IN_LIVE_MODE:
-			case GMFMapPackage.AUDIT_RULE__MESSAGE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFMapPackage.AUDIT_RULE__RULE:
-			case GMFMapPackage.AUDIT_RULE__TARGET:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getAuditRule_Rule(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getAuditRule_Target(),
-				 GMFMapFactory.eINSTANCE.createDomainElementTarget()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getAuditRule_Target(),
-				 GMFMapFactory.eINSTANCE.createDomainAttributeTarget()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getAuditRule_Target(),
-				 GMFMapFactory.eINSTANCE.createDiagramElementTarget()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getAuditRule_Target(),
-				 GMFMapFactory.eINSTANCE.createNotationElementTarget()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getAuditRule_Target(),
-				 GMFMapFactory.eINSTANCE.createAuditedMetricTarget()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditedMetricTargetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditedMetricTargetItemProvider.java
deleted file mode 100644
index dab36ed096d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/AuditedMetricTargetItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AuditedMetricTargetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditedMetricTargetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addMetricPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Metric feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMetricPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AuditedMetricTarget_metric_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AuditedMetricTarget_metric_feature", "_UI_AuditedMetricTarget_type"),
-				 GMFMapPackage.eINSTANCE.getAuditedMetricTarget_Metric(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns AuditedMetricTarget.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/AuditedMetricTarget"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_AuditedMetricTarget_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/CanvasMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/CanvasMappingItemProvider.java
deleted file mode 100644
index 9cd71fdc0a9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/CanvasMappingItemProvider.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.CanvasMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CanvasMappingItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CanvasMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDiagramCanvasPropertyDescriptor(object);
-			addDomainModelPropertyDescriptor(object);
-			addDomainMetaElementPropertyDescriptor(object);
-			addPalettePropertyDescriptor(object);
-			addMenuContributionsPropertyDescriptor(object);
-			addToolbarContributionsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Diagram Canvas feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addDiagramCanvasPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CanvasMapping_diagramCanvas_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CanvasMapping_diagramCanvas_feature", "_UI_CanvasMapping_type"),
-				 GMFMapPackage.eINSTANCE.getCanvasMapping_DiagramCanvas(),
-				 true,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.sort(super.getComboBoxObjects(object));
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Domain Model feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addDomainModelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CanvasMapping_domainModel_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CanvasMapping_domainModel_feature", "_UI_CanvasMapping_type"),
-				 GMFMapPackage.eINSTANCE.getCanvasMapping_DomainModel(),
-				 true,
-				 null,
-				 getString("_UI_DomainmetainformationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.sort(super.getComboBoxObjects(object));
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Domain Meta Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addDomainMetaElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CanvasMapping_domainMetaElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CanvasMapping_domainMetaElement_feature", "_UI_CanvasMapping_type"),
-				 GMFMapPackage.eINSTANCE.getCanvasMapping_DomainMetaElement(),
-				 true,
-				 null,
-				 getString("_UI_DomainmetainformationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EClass> original = (Collection<EClass>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByResourceSet(original, ((CanvasMapping) object).eResource().getResourceSet());
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Palette feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addPalettePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CanvasMapping_palette_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CanvasMapping_palette_feature", "_UI_CanvasMapping_type"),
-				 GMFMapPackage.eINSTANCE.getCanvasMapping_Palette(),
-				 true,
-				 null,
-				 null,
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.sort(super.getComboBoxObjects(object));
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Menu Contributions feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addMenuContributionsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CanvasMapping_menuContributions_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CanvasMapping_menuContributions_feature", "_UI_CanvasMapping_type"),
-				 GMFMapPackage.eINSTANCE.getCanvasMapping_MenuContributions(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Toolbar Contributions feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addToolbarContributionsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CanvasMapping_toolbarContributions_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CanvasMapping_toolbarContributions_feature", "_UI_CanvasMapping_type"),
-				 GMFMapPackage.eINSTANCE.getCanvasMapping_ToolbarContributions(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns CanvasMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CanvasMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_CanvasMapping_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ChildReferenceItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ChildReferenceItemProvider.java
deleted file mode 100644
index 53587045d1e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ChildReferenceItemProvider.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.ChildReference} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ChildReferenceItemProvider
-	extends NodeReferenceItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildReferenceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCompartmentPropertyDescriptor(object);
-			addReferencedChildPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Compartment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addCompartmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ChildReference_compartment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ChildReference_compartment_feature", "_UI_ChildReference_type"),
-				 GMFMapPackage.eINSTANCE.getChildReference_Compartment(),
-				 true,
-				 null,
-				 null,
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EObject> original = (Collection<EObject>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByNodeMapping(original, (ChildReference) object);
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Referenced Child feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addReferencedChildPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ChildReference_referencedChild_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ChildReference_referencedChild_feature", "_UI_ChildReference_type"),
-				 GMFMapPackage.eINSTANCE.getChildReference_ReferencedChild(),
-				 true,
-				 null,
-				 null,
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.sort(super.getComboBoxObjects(object));
-						}
-			});
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getChildReference_OwnedChild());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ChildReference.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ChildReference"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-        if (object instanceof NodeReference) { 
-        	NodeReference reference = (NodeReference) object;
-            String result = " <"; 
-            if (reference.getContainmentFeature() != null) { 
-                 result += reference.getContainmentFeature().getName(); 
-            } 
-            if (reference.getChildrenFeature() != null) {
-            	result += "|";
-            	result += reference.getChildrenFeature().getName();
-            }
-            if (reference.isSetChild()) {
-            	NodeMapping mapping = reference.getChild();
-                if (mapping.getDomainMetaElement() != null) {
-                	result += ":";
-                	result += mapping.getDomainMetaElement().getName();
-                }
-                result += "/";
-                if (mapping.getDiagramNode() != null) { 
-                    result += reference.getChild().getDiagramNode().getName(); 
-                } 
-            }
-            result += ">"; 
-            return getString("_UI_ChildReference_type") + result; 
-
-        }
-		return getString("_UI_ChildReference_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChangedGen(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ChildReference.class)) {
-			case GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(NodeMapping.class)) {
-		case GMFMapPackage.NODE_REFERENCE__CONTAINMENT_FEATURE:
-		case GMFMapPackage.NODE_REFERENCE__CHILDREN_FEATURE:
-			fireNotifyChanged(new ViewerNotification(notification, null));
-			break;
-		}
-		notifyChangedGen(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getChildReference_OwnedChild(),
-				 GMFMapFactory.eINSTANCE.createNodeMapping()));
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/CompartmentMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/CompartmentMappingItemProvider.java
deleted file mode 100644
index 0ef04c6a803..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/CompartmentMappingItemProvider.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompartmentMappingItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompartmentMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCompartmentPropertyDescriptor(object);
-			addChildrenPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Compartment feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addCompartmentPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CompartmentMapping_compartment_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CompartmentMapping_compartment_feature", "_UI_CompartmentMapping_type"),
-				 GMFMapPackage.eINSTANCE.getCompartmentMapping_Compartment(),
-				 true,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.sort(super.getComboBoxObjects(object));
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Children feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addChildrenPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_CompartmentMapping_children_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_CompartmentMapping_children_feature", "_UI_CompartmentMapping_type"),
-				 GMFMapPackage.eINSTANCE.getCompartmentMapping_Children(),
-				 true,
-				 null,
-				 null,
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EObject> original = (Collection<EObject>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByNodeMapping(original, (CompartmentMapping) object);
-						}
-			});
-	}
-
-	/**
-	 * This returns CompartmentMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CompartmentMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		if (object instanceof CompartmentMapping) {
-			CompartmentMapping mapping = (CompartmentMapping) object;
-			String result = " <";
-			if (mapping.getCompartment() != null) {
-				result += mapping.getCompartment().getName();
-			}	
-			result += ">";
-			return getString("_UI_CompartmentMapping_type") + result;
-		}
-		return getString("_UI_CompartmentMapping_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChangedGen(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	public void notifyChanged(Notification notification) {
-		if (notification.getFeatureID(CompartmentMapping.class) == GMFMapPackage.COMPARTMENT_MAPPING__COMPARTMENT) {
-			fireNotifyChanged(new ViewerNotification(notification, null));
-		}
-		notifyChangedGen(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ConstraintItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ConstraintItemProvider.java
deleted file mode 100644
index d1a9fd0c73d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ConstraintItemProvider.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.Constraint} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ConstraintItemProvider
-	extends ValueExpressionItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ConstraintItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Constraint.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Constraint"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = crop(((Constraint)object).getBody());
-		return label == null || label.length() == 0 ?
-			getString("_UI_Constraint_type") :
-			getString("_UI_Constraint_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DesignLabelMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DesignLabelMappingItemProvider.java
deleted file mode 100644
index 596f4662665..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DesignLabelMappingItemProvider.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.mappings.DesignLabelMapping;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.DesignLabelMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DesignLabelMappingItemProvider
-	extends LabelMappingItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DesignLabelMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns DesignLabelMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DesignLabelMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		DesignLabelMapping designLabelMapping = (DesignLabelMapping)object;
-		return getString("_UI_DesignLabelMapping_type") + " " + designLabelMapping.isReadOnly();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DiagramElementTargetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DiagramElementTargetItemProvider.java
deleted file mode 100644
index 7edfb4ca525..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DiagramElementTargetItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.DiagramElementTarget} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DiagramElementTargetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramElementTargetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addElementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DiagramElementTarget_element_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DiagramElementTarget_element_feature", "_UI_DiagramElementTarget_type"),
-				 GMFMapPackage.eINSTANCE.getDiagramElementTarget_Element(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns DiagramElementTarget.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DiagramElementTarget"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_DiagramElementTarget_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DomainAttributeTargetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DomainAttributeTargetItemProvider.java
deleted file mode 100644
index 77dcfe4de27..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DomainAttributeTargetItemProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DomainAttributeTargetItemProvider.java,v 1.4 2007/04/03 16:29:19 atikhomirov Exp $
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DomainAttributeTargetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DomainAttributeTargetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addAttributePropertyDescriptor(object);
-			addNullAsErrorPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Attribute feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAttributePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DomainAttributeTarget_attribute_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DomainAttributeTarget_attribute_feature", "_UI_DomainAttributeTarget_type"),
-				 GMFMapPackage.eINSTANCE.getDomainAttributeTarget_Attribute(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Null As Error feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNullAsErrorPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DomainAttributeTarget_nullAsError_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DomainAttributeTarget_nullAsError_feature", "_UI_DomainAttributeTarget_type"),
-				 GMFMapPackage.eINSTANCE.getDomainAttributeTarget_NullAsError(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns DomainAttributeTarget.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DomainAttributeTarget"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		DomainAttributeTarget domainAttributeTarget = (DomainAttributeTarget)object;
-		return getString("_UI_DomainAttributeTarget_type") + " " + domainAttributeTarget.isNullAsError();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(DomainAttributeTarget.class)) {
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__NULL_AS_ERROR:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DomainElementTargetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DomainElementTargetItemProvider.java
deleted file mode 100644
index 7f18372b908..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/DomainElementTargetItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.DomainElementTarget} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DomainElementTargetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DomainElementTargetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addElementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_DomainElementTarget_element_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_DomainElementTarget_element_feature", "_UI_DomainElementTarget_type"),
-				 GMFMapPackage.eINSTANCE.getDomainElementTarget_Element(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns DomainElementTarget.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DomainElementTarget"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_DomainElementTarget_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/EcoreItemProviderAdapterFactoryEx.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/EcoreItemProviderAdapterFactoryEx.java
deleted file mode 100644
index aec71d560a5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/EcoreItemProviderAdapterFactoryEx.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.provider.EAttributeItemProvider;
-import org.eclipse.emf.ecore.provider.EReferenceItemProvider;
-import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
-
-/**
- * @author artem
- */
-public class EcoreItemProviderAdapterFactoryEx extends EcoreItemProviderAdapterFactory {
-	
-	public EcoreItemProviderAdapterFactoryEx() {
-		eAttributeItemProvider = new EAttributeItemProvider(this) {
-			@Override
-			public String getText(Object obj) {
-				if (GMFMapEditPlugin.isQualifiedFeatureLabels()) {
-					return GMFMapEditPlugin.getFeatureLabel((EStructuralFeature) obj);
-				}
-				return super.getText(obj);
-			}
-		};
-		eReferenceItemProvider = new EReferenceItemProvider(this) {
-			@Override
-			public String getText(Object obj) {
-				if (GMFMapEditPlugin.isQualifiedFeatureLabels()) {
-					return GMFMapEditPlugin.getFeatureLabel((EStructuralFeature) obj);
-				}
-				return super.getText(obj);
-			}
-		};
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ExpressionLabelMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ExpressionLabelMappingItemProvider.java
deleted file mode 100644
index 3f48ecba52c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ExpressionLabelMappingItemProvider.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ExpressionLabelMappingItemProvider
-	extends LabelMappingItemProvider
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionLabelMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	@Override
-	protected boolean shouldComposeCreationImage() {
-		/*
-		 * Note, this allows not to keep generated createChild images:
-		 * ExpressionLabelMapping_<feature>_[ValueExpression|Constraint]
-		 * and use ValueExpression/Constraint icons instead.
-		 */
-		return true;
-	}
-	
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addViewExpressionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the View Expression feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addViewExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ExpressionLabelMapping_viewExpression_feature"),
-				 getString("_UI_ExpressionLabelMapping_viewExpression_description"),
-				 GMFMapPackage.eINSTANCE.getExpressionLabelMapping_ViewExpression(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getExpressionLabelMapping_ViewExpression());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getExpressionLabelMapping_EditExpression());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getExpressionLabelMapping_ValidateExpression());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ExpressionLabelMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ExpressionLabelMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		ExpressionLabelMapping expressionLabelMapping = (ExpressionLabelMapping)object;
-		return getString("_UI_ExpressionLabelMapping_type") + " " + expressionLabelMapping.isReadOnly();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ExpressionLabelMapping.class)) {
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION:
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION:
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getExpressionLabelMapping_ViewExpression(),
-				 GMFMapFactory.eINSTANCE.createValueExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getExpressionLabelMapping_ViewExpression(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getExpressionLabelMapping_EditExpression(),
-				 GMFMapFactory.eINSTANCE.createValueExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getExpressionLabelMapping_EditExpression(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getExpressionLabelMapping_ValidateExpression(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFMapPackage.eINSTANCE.getExpressionLabelMapping_ViewExpression() ||
-			childFeature == GMFMapPackage.eINSTANCE.getExpressionLabelMapping_EditExpression() ||
-			childFeature == GMFMapPackage.eINSTANCE.getExpressionLabelMapping_ValidateExpression();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureInitializerItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureInitializerItemProvider.java
deleted file mode 100644
index a2cf8e25e0f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureInitializerItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FeatureInitializerItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureInitializerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFeaturePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureInitializer_feature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureInitializer_feature_feature", "_UI_FeatureInitializer_type"),
-				 GMFMapPackage.eINSTANCE.getFeatureInitializer_Feature(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns FeatureInitializer.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureInitializer"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_FeatureInitializer_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FeatureInitializer.class)) {
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureLabelMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureLabelMappingItemProvider.java
deleted file mode 100644
index 38245caba3c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureLabelMappingItemProvider.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FeatureLabelMappingItemProvider
-	extends LabelMappingItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureLabelMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFeaturesPropertyDescriptor(object);
-			addEditableFeaturesPropertyDescriptor(object);
-			addViewPatternPropertyDescriptor(object);
-			addEditorPatternPropertyDescriptor(object);
-			addEditPatternPropertyDescriptor(object);
-			addViewMethodPropertyDescriptor(object);
-			addEditMethodPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Features feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addFeaturesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureLabelMapping_features_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelMapping_features_feature", "_UI_FeatureLabelMapping_type"),
-				 GMFMapPackage.eINSTANCE.getFeatureLabelMapping_Features(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 getString("_UI_DomainmetainformationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EStructuralFeature> original = (Collection<EStructuralFeature>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByContainerMetaclass(original, ((FeatureLabelMapping) object).getMapEntry());
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Editable Features feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEditableFeaturesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureLabelMapping_editableFeatures_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelMapping_editableFeatures_feature", "_UI_FeatureLabelMapping_type"),
-				 GMFMapPackage.eINSTANCE.getFeatureLabelMapping_EditableFeatures(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 getString("_UI_DomainmetainformationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the View Pattern feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addViewPatternPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureLabelMapping_viewPattern_feature"),
-				 getString("_UI_FeatureLabelMapping_viewPattern_description"),
-				 GMFMapPackage.eINSTANCE.getFeatureLabelMapping_ViewPattern(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Editor Pattern feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEditorPatternPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureLabelMapping_editorPattern_feature"),
-				 getString("_UI_FeatureLabelMapping_editorPattern_description"),
-				 GMFMapPackage.eINSTANCE.getFeatureLabelMapping_EditorPattern(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the View Method feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addViewMethodPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureLabelMapping_viewMethod_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelMapping_viewMethod_feature", "_UI_FeatureLabelMapping_type"),
-				 GMFMapPackage.eINSTANCE.getFeatureLabelMapping_ViewMethod(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Edit Pattern feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEditPatternPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureLabelMapping_editPattern_feature"),
-				 getString("_UI_FeatureLabelMapping_editPattern_description"),
-				 GMFMapPackage.eINSTANCE.getFeatureLabelMapping_EditPattern(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Edit Method feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addEditMethodPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureLabelMapping_editMethod_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureLabelMapping_editMethod_feature", "_UI_FeatureLabelMapping_type"),
-				 GMFMapPackage.eINSTANCE.getFeatureLabelMapping_EditMethod(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This returns FeatureLabelMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureLabelMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	@Override
-	public String getText(Object object) {
-		StringBuilder result = new StringBuilder(getString("_UI_FeatureLabelMapping_type"));
-		FeatureLabelMapping featureLabelMapping = (FeatureLabelMapping)object;
-		EList<EAttribute> features = featureLabelMapping.getFeatures();
-		result.append(':');
-		result.append('[');
-		if (!features.isEmpty()) {
-			appendFeatureName(result, features.get(0));
-		}
-		for (int i = 1; i < features.size(); i++) {
-			result.append(',');
-			appendFeatureName(result, features.get(i));
-		}
-		result.append(']');
-		appendReadOnly(result, featureLabelMapping);
-		return result.toString();
-	}
-
-	private void appendReadOnly(StringBuilder labelText, FeatureLabelMapping feature) {
-		if (feature.isReadOnly()) {
-			labelText.append(" Read Only");
-		}
-	}
-	
-	private void appendFeatureName(StringBuilder labelText, EAttribute attr) {
-		labelText.append(attr.getEContainingClass().getName());
-		labelText.append("." + attr.getName());
-		labelText.append(":" + attr.getEType().getName());
-	}
-	
-	
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FeatureLabelMapping.class)) {
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_PATTERN:
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITOR_PATTERN:
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_PATTERN:
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_METHOD:
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_METHOD:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureSeqInitializerItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureSeqInitializerItemProvider.java
deleted file mode 100644
index 3b30bb29aef..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureSeqInitializerItemProvider.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FeatureSeqInitializerItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureSeqInitializerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addElementClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Element Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addElementClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureSeqInitializer_elementClass_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureSeqInitializer_elementClass_feature", "_UI_FeatureSeqInitializer_type"),
-				 GMFMapPackage.eINSTANCE.getFeatureSeqInitializer_ElementClass(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null) {
-				protected Collection<?> getComboBoxObjects(Object object) {
-					if(object instanceof FeatureSeqInitializer) {
-						@SuppressWarnings("unchecked")
-						final Collection<EClass> original = (Collection<EClass>) super.getComboBoxObjects(object);
-						return FilterUtil.filterByFeatureSeqInitializer(original, (FeatureSeqInitializer)object);
-					}
-				
-					return super.getComboBoxObjects(object);
-				}
-			});
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getFeatureSeqInitializer_Initializers());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns FeatureSeqInitializer.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureSeqInitializer"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		StringBuffer buf = new StringBuffer();		
-		buf.append(getString("_UI_FeatureSeqInitializer_type"));
-		if (object instanceof FeatureSeqInitializer) {
-			FeatureSeqInitializer fSeqInitializer = (FeatureSeqInitializer) object;
-			buf.append('<');
-			if(fSeqInitializer.getElementClass() != null) {
-				if(fSeqInitializer.getCreatingInitializer() != null) {
-					buf.append("new "); //$NON-NLS-1$
-				}
-				buf.append(fSeqInitializer.getElementClass().getName());
-			}
-
-			buf.append('(');
-			for (Iterator<?> it = fSeqInitializer.getInitializers().iterator(); it.hasNext();) {
-				FeatureInitializer nextInitializer = (FeatureInitializer) it.next();
-				if(nextInitializer != null && nextInitializer.getFeature() != null) {
-					buf.append(nextInitializer.getFeature().getName());
-				}
-				if(it.hasNext()) {
-					buf.append(',');
-				}				
-			}
-			buf.append(')');			
-			buf.append('>');
-		}
-		
-		return buf.toString();		
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FeatureSeqInitializer.class)) {
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getFeatureSeqInitializer_Initializers(),
-				 GMFMapFactory.eINSTANCE.createFeatureValueSpec()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getFeatureSeqInitializer_Initializers(),
-				 GMFMapFactory.eINSTANCE.createReferenceNewElementSpec()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureValueSpecItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureValueSpecItemProvider.java
deleted file mode 100644
index 35367907fab..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/FeatureValueSpecItemProvider.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureValueSpec;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.FeatureValueSpec} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class FeatureValueSpecItemProvider
-	extends FeatureInitializerItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureValueSpecItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getFeatureValueSpec_Value());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This adds a property descriptor for the Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureInitializer_feature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureInitializer_feature_feature", "_UI_FeatureInitializer_type"),
-				 GMFMapPackage.eINSTANCE.getFeatureInitializer_Feature(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null) {
-					protected Collection<?> getComboBoxObjects(Object object) {
-						if(object instanceof FeatureInitializer) {
-							@SuppressWarnings("unchecked")
-							final Collection<EStructuralFeature> original = (Collection<EStructuralFeature>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByFeatureInitializer(original, (FeatureInitializer)object);
-						}
-					
-						return super.getComboBoxObjects(object);
-					}				
-			});
-	}
-
-	/**
-	 * This returns FeatureValueSpec.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/FeatureValueSpec"));
-	}
-
-	/**
-	 * @generated
-	 */
-	public String getTextGen(Object object) {
-		return getString("_UI_FeatureValueSpec_type");
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		StringBuilder buf = new StringBuilder();
-		buf.append(getTextGen(object));
-		if(object instanceof FeatureValueSpec) { 
-			FeatureValueSpec featureValueSpec = (FeatureValueSpec)object; 
-			buf.append('<');
-			
-			String feature = (featureValueSpec.getFeature() != null) ? featureValueSpec.getFeature().getName() : null;
-			if(feature != null && feature.length() > 0) {
-				buf.append(feature).append(":=");
-			}
-			
-			String body = crop(featureValueSpec.getValue() != null ? featureValueSpec.getValue().getBody() : null);			
-			if(body != null && body.length() > 0) {
-				buf.append(' ').append(body);
-			}
-			buf.append('>');
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(FeatureValueSpec.class)) {
-			case GMFMapPackage.FEATURE_VALUE_SPEC__VALUE:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getFeatureValueSpec_Value(),
-				 GMFMapFactory.eINSTANCE.createValueExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getFeatureValueSpec_Value(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/GMFMapEditPlugin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/GMFMapEditPlugin.java
deleted file mode 100644
index 8064477ad73..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/GMFMapEditPlugin.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
-import org.eclipse.papyrus.gmf.gmfgraph.provider.GMFGraphEditPlugin;
-import org.eclipse.papyrus.gmf.tooldef.provider.GMFToolEditPlugin;
-
-/**
- * This is the central singleton for the GMFMap editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class GMFMapEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final GMFMapEditPlugin INSTANCE = new GMFMapEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapEditPlugin() {
-		super
-			(new ResourceLocator [] {
-				GMFGraphEditPlugin.INSTANCE,
-				GMFToolEditPlugin.INSTANCE,
-				EcoreEditPlugin.INSTANCE,
-			});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	private boolean myShowQualifiedFeatureLabels = true;
-
-	public static void toggleQualifiedFeatureLabelPresentation() {
-		INSTANCE.myShowQualifiedFeatureLabels = !INSTANCE.myShowQualifiedFeatureLabels;
-	}
-
-	public static boolean isQualifiedFeatureLabels() {
-		return INSTANCE.myShowQualifiedFeatureLabels;
-	}
-
-	static String getFeatureLabel(EStructuralFeature feature) {
-		StringBuffer sb = new StringBuffer();
-		if (feature.getEContainingClass() != null) {
-			sb.append(feature.getEContainingClass().getName());
-			sb.append('.');
-		}
-		sb.append(feature.getName());
-		EClassifier type = feature.getEType();
-		if (type != null) {
-			sb.append(':');
-			sb.append(type.getName());
-		}
-		return sb.toString();
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Implementation extends EclipseUIPlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-	
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/GMFMapItemProviderAdapterFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/GMFMapItemProviderAdapterFactory.java
deleted file mode 100644
index 30c5b502aba..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/GMFMapItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,863 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.mappings.util.GMFMapAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFMapItemProviderAdapterFactory extends GMFMapAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.NodeMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NodeMappingItemProvider nodeMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.NodeMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createNodeMappingAdapter() {
-		if (nodeMappingItemProvider == null) {
-			nodeMappingItemProvider = new NodeMappingItemProvider(this);
-		}
-
-		return nodeMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompartmentMappingItemProvider compartmentMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCompartmentMappingAdapter() {
-		if (compartmentMappingItemProvider == null) {
-			compartmentMappingItemProvider = new CompartmentMappingItemProvider(this);
-		}
-
-		return compartmentMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.LinkMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LinkMappingItemProvider linkMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.LinkMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLinkMappingAdapter() {
-		if (linkMappingItemProvider == null) {
-			linkMappingItemProvider = new LinkMappingItemProvider(this);
-		}
-
-		return linkMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.CanvasMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CanvasMappingItemProvider canvasMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.CanvasMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCanvasMappingAdapter() {
-		if (canvasMappingItemProvider == null) {
-			canvasMappingItemProvider = new CanvasMappingItemProvider(this);
-		}
-
-		return canvasMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.LabelMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabelMappingItemProvider labelMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.LabelMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLabelMappingAdapter() {
-		if (labelMappingItemProvider == null) {
-			labelMappingItemProvider = new LabelMappingItemProvider(this);
-		}
-
-		return labelMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureLabelMappingItemProvider featureLabelMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFeatureLabelMappingAdapter() {
-		if (featureLabelMappingItemProvider == null) {
-			featureLabelMappingItemProvider = new FeatureLabelMappingItemProvider(this);
-		}
-
-		return featureLabelMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OclChoiceLabelMappingItemProvider oclChoiceLabelMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createOclChoiceLabelMappingAdapter() {
-		if (oclChoiceLabelMappingItemProvider == null) {
-			oclChoiceLabelMappingItemProvider = new OclChoiceLabelMappingItemProvider(this);
-		}
-
-		return oclChoiceLabelMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.DesignLabelMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DesignLabelMappingItemProvider designLabelMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.DesignLabelMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDesignLabelMappingAdapter() {
-		if (designLabelMappingItemProvider == null) {
-			designLabelMappingItemProvider = new DesignLabelMappingItemProvider(this);
-		}
-
-		return designLabelMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExpressionLabelMappingItemProvider expressionLabelMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createExpressionLabelMappingAdapter() {
-		if (expressionLabelMappingItemProvider == null) {
-			expressionLabelMappingItemProvider = new ExpressionLabelMappingItemProvider(this);
-		}
-
-		return expressionLabelMappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.Mapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MappingItemProvider mappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.Mapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createMappingAdapter() {
-		if (mappingItemProvider == null) {
-			mappingItemProvider = new MappingItemProvider(this);
-		}
-
-		return mappingItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.ChildReference} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChildReferenceItemProvider childReferenceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.ChildReference}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createChildReferenceAdapter() {
-		if (childReferenceItemProvider == null) {
-			childReferenceItemProvider = new ChildReferenceItemProvider(this);
-		}
-
-		return childReferenceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.TopNodeReference} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TopNodeReferenceItemProvider topNodeReferenceItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.TopNodeReference}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createTopNodeReferenceAdapter() {
-		if (topNodeReferenceItemProvider == null) {
-			topNodeReferenceItemProvider = new TopNodeReferenceItemProvider(this);
-		}
-
-		return topNodeReferenceItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.Constraint} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConstraintItemProvider constraintItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.Constraint}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createConstraintAdapter() {
-		if (constraintItemProvider == null) {
-			constraintItemProvider = new ConstraintItemProvider(this);
-		}
-
-		return constraintItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.LinkConstraints} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LinkConstraintsItemProvider linkConstraintsItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.LinkConstraints}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createLinkConstraintsAdapter() {
-		if (linkConstraintsItemProvider == null) {
-			linkConstraintsItemProvider = new LinkConstraintsItemProvider(this);
-		}
-
-		return linkConstraintsItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.ValueExpression} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ValueExpressionItemProvider valueExpressionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.ValueExpression}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createValueExpressionAdapter() {
-		if (valueExpressionItemProvider == null) {
-			valueExpressionItemProvider = new ValueExpressionItemProvider(this);
-		}
-
-		return valueExpressionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureSeqInitializerItemProvider featureSeqInitializerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFeatureSeqInitializerAdapter() {
-		if (featureSeqInitializerItemProvider == null) {
-			featureSeqInitializerItemProvider = new FeatureSeqInitializerItemProvider(this);
-		}
-
-		return featureSeqInitializerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.FeatureValueSpec} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureValueSpecItemProvider featureValueSpecItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.FeatureValueSpec}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createFeatureValueSpecAdapter() {
-		if (featureValueSpecItemProvider == null) {
-			featureValueSpecItemProvider = new FeatureValueSpecItemProvider(this);
-		}
-
-		return featureValueSpecItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReferenceNewElementSpecItemProvider referenceNewElementSpecItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createReferenceNewElementSpecAdapter() {
-		if (referenceNewElementSpecItemProvider == null) {
-			referenceNewElementSpecItemProvider = new ReferenceNewElementSpecItemProvider(this);
-		}
-
-		return referenceNewElementSpecItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.AuditContainer} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AuditContainerItemProvider auditContainerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.AuditContainer}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAuditContainerAdapter() {
-		if (auditContainerItemProvider == null) {
-			auditContainerItemProvider = new AuditContainerItemProvider(this);
-		}
-
-		return auditContainerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.AuditRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AuditRuleItemProvider auditRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.AuditRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAuditRuleAdapter() {
-		if (auditRuleItemProvider == null) {
-			auditRuleItemProvider = new AuditRuleItemProvider(this);
-		}
-
-		return auditRuleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.DomainElementTarget} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DomainElementTargetItemProvider domainElementTargetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.DomainElementTarget}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDomainElementTargetAdapter() {
-		if (domainElementTargetItemProvider == null) {
-			domainElementTargetItemProvider = new DomainElementTargetItemProvider(this);
-		}
-
-		return domainElementTargetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DomainAttributeTargetItemProvider domainAttributeTargetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDomainAttributeTargetAdapter() {
-		if (domainAttributeTargetItemProvider == null) {
-			domainAttributeTargetItemProvider = new DomainAttributeTargetItemProvider(this);
-		}
-
-		return domainAttributeTargetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.DiagramElementTarget} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramElementTargetItemProvider diagramElementTargetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.DiagramElementTarget}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDiagramElementTargetAdapter() {
-		if (diagramElementTargetItemProvider == null) {
-			diagramElementTargetItemProvider = new DiagramElementTargetItemProvider(this);
-		}
-
-		return diagramElementTargetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.NotationElementTarget} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NotationElementTargetItemProvider notationElementTargetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.NotationElementTarget}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createNotationElementTargetAdapter() {
-		if (notationElementTargetItemProvider == null) {
-			notationElementTargetItemProvider = new NotationElementTargetItemProvider(this);
-		}
-
-		return notationElementTargetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.MetricContainer} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MetricContainerItemProvider metricContainerItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.MetricContainer}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createMetricContainerAdapter() {
-		if (metricContainerItemProvider == null) {
-			metricContainerItemProvider = new MetricContainerItemProvider(this);
-		}
-
-		return metricContainerItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.MetricRule} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MetricRuleItemProvider metricRuleItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.MetricRule}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createMetricRuleAdapter() {
-		if (metricRuleItemProvider == null) {
-			metricRuleItemProvider = new MetricRuleItemProvider(this);
-		}
-
-		return metricRuleItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AuditedMetricTargetItemProvider auditedMetricTargetItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createAuditedMetricTargetAdapter() {
-		if (auditedMetricTargetItemProvider == null) {
-			auditedMetricTargetItemProvider = new AuditedMetricTargetItemProvider(this);
-		}
-
-		return auditedMetricTargetItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VisualEffectMappingItemProvider visualEffectMappingItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createVisualEffectMappingAdapter() {
-		if (visualEffectMappingItemProvider == null) {
-			visualEffectMappingItemProvider = new VisualEffectMappingItemProvider(this);
-		}
-
-		return visualEffectMappingItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (mappingItemProvider != null) mappingItemProvider.dispose();
-		if (childReferenceItemProvider != null) childReferenceItemProvider.dispose();
-		if (topNodeReferenceItemProvider != null) topNodeReferenceItemProvider.dispose();
-		if (nodeMappingItemProvider != null) nodeMappingItemProvider.dispose();
-		if (compartmentMappingItemProvider != null) compartmentMappingItemProvider.dispose();
-		if (linkMappingItemProvider != null) linkMappingItemProvider.dispose();
-		if (canvasMappingItemProvider != null) canvasMappingItemProvider.dispose();
-		if (labelMappingItemProvider != null) labelMappingItemProvider.dispose();
-		if (featureLabelMappingItemProvider != null) featureLabelMappingItemProvider.dispose();
-		if (oclChoiceLabelMappingItemProvider != null) oclChoiceLabelMappingItemProvider.dispose();
-		if (designLabelMappingItemProvider != null) designLabelMappingItemProvider.dispose();
-		if (expressionLabelMappingItemProvider != null) expressionLabelMappingItemProvider.dispose();
-		if (constraintItemProvider != null) constraintItemProvider.dispose();
-		if (linkConstraintsItemProvider != null) linkConstraintsItemProvider.dispose();
-		if (valueExpressionItemProvider != null) valueExpressionItemProvider.dispose();
-		if (featureSeqInitializerItemProvider != null) featureSeqInitializerItemProvider.dispose();
-		if (featureValueSpecItemProvider != null) featureValueSpecItemProvider.dispose();
-		if (referenceNewElementSpecItemProvider != null) referenceNewElementSpecItemProvider.dispose();
-		if (auditContainerItemProvider != null) auditContainerItemProvider.dispose();
-		if (auditRuleItemProvider != null) auditRuleItemProvider.dispose();
-		if (domainElementTargetItemProvider != null) domainElementTargetItemProvider.dispose();
-		if (domainAttributeTargetItemProvider != null) domainAttributeTargetItemProvider.dispose();
-		if (diagramElementTargetItemProvider != null) diagramElementTargetItemProvider.dispose();
-		if (notationElementTargetItemProvider != null) notationElementTargetItemProvider.dispose();
-		if (metricContainerItemProvider != null) metricContainerItemProvider.dispose();
-		if (metricRuleItemProvider != null) metricRuleItemProvider.dispose();
-		if (auditedMetricTargetItemProvider != null) auditedMetricTargetItemProvider.dispose();
-		if (visualEffectMappingItemProvider != null) visualEffectMappingItemProvider.dispose();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LabelMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LabelMappingItemProvider.java
deleted file mode 100644
index a9120854227..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LabelMappingItemProvider.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.LabelMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LabelMappingItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDiagramLabelPropertyDescriptor(object);
-			addReadOnlyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Diagram Label feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addDiagramLabelPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelMapping_diagramLabel_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelMapping_diagramLabel_feature", "_UI_LabelMapping_type"),
-				 GMFMapPackage.eINSTANCE.getLabelMapping_DiagramLabel(),
-				 true,
-				 null,
-				 null,
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.sort(super.getComboBoxObjects(object));
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Read Only feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addReadOnlyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LabelMapping_readOnly_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LabelMapping_readOnly_feature", "_UI_LabelMapping_type"),
-				 GMFMapPackage.eINSTANCE.getLabelMapping_ReadOnly(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns LabelMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LabelMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		LabelMapping labelMapping = (LabelMapping)object;
-		return getString("_UI_LabelMapping_type") + " " + labelMapping.isReadOnly();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(LabelMapping.class)) {
-			case GMFMapPackage.LABEL_MAPPING__READ_ONLY:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LinkConstraintsItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LinkConstraintsItemProvider.java
deleted file mode 100644
index cab614da215..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LinkConstraintsItemProvider.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LinkConstraints;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.LinkConstraints} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LinkConstraintsItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LinkConstraintsItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getLinkConstraints_SourceEnd());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getLinkConstraints_TargetEnd());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns LinkConstraints.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LinkConstraints"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_LinkConstraints_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(LinkConstraints.class)) {
-			case GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END:
-			case GMFMapPackage.LINK_CONSTRAINTS__TARGET_END:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getLinkConstraints_SourceEnd(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getLinkConstraints_TargetEnd(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFMapPackage.eINSTANCE.getLinkConstraints_SourceEnd() ||
-			childFeature == GMFMapPackage.eINSTANCE.getLinkConstraints_TargetEnd();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LinkMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LinkMappingItemProvider.java
deleted file mode 100644
index db3b0db5baa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/LinkMappingItemProvider.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.LinkMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class LinkMappingItemProvider
-	extends MappingEntryItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LinkMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addContainmentFeaturePropertyDescriptor(object);
-			addContextMenuPropertyDescriptor(object);
-			addToolPropertyDescriptor(object);
-			addAppearanceStylePropertyDescriptor(object);
-			addDiagramLinkPropertyDescriptor(object);
-			addSourceMetaFeaturePropertyDescriptor(object);
-			addLinkMetaFeaturePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Context Menu feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addContextMenuPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MenuOwner_contextMenu_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MenuOwner_contextMenu_feature", "_UI_MenuOwner_type"),
-				 GMFMapPackage.eINSTANCE.getMenuOwner_ContextMenu(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Tool feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addToolPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ToolOwner_tool_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ToolOwner_tool_feature", "_UI_ToolOwner_type"),
-				 GMFMapPackage.eINSTANCE.getToolOwner_Tool(),
-				 true,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.filterBySuperClasses(super.getComboBoxObjects(object), new Class[] {CreationTool.class, GenericTool.class});
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Appearance Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAppearanceStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AppearanceSteward_appearanceStyle_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AppearanceSteward_appearanceStyle_feature", "_UI_AppearanceSteward_type"),
-				 GMFMapPackage.eINSTANCE.getAppearanceSteward_AppearanceStyle(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Diagram Link feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addDiagramLinkPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LinkMapping_diagramLink_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LinkMapping_diagramLink_feature", "_UI_LinkMapping_type"),
-				 GMFMapPackage.eINSTANCE.getLinkMapping_DiagramLink(),
-				 true,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.sort(super.getComboBoxObjects(object));
-						}
-				});
-	}
-
-	/**
-	 * This adds a property descriptor for the Containment Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addContainmentFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NeedsContainment_containmentFeature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NeedsContainment_containmentFeature_feature", "_UI_NeedsContainment_type"),
-				 GMFMapPackage.eINSTANCE.getNeedsContainment_ContainmentFeature(),
-				 true,
-				 null,
-				 getString("_UI_DomainmetainformationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EReference> original = (Collection<EReference>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByReferenceType(original, (LinkMapping) object);
-						}
-				});
-	}
-
-	/**
-	 * This adds a property descriptor for the Source Meta Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addSourceMetaFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LinkMapping_sourceMetaFeature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LinkMapping_sourceMetaFeature_feature", "_UI_LinkMapping_type"),
-				 GMFMapPackage.eINSTANCE.getLinkMapping_SourceMetaFeature(),
-				 true,
-				 null,
-				 getString("_UI_DomainmetainformationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EStructuralFeature> original = (Collection<EStructuralFeature>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByContainerMetaclass(original, (LinkMapping) object);
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Link Meta Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addLinkMetaFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_LinkMapping_linkMetaFeature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_LinkMapping_linkMetaFeature_feature", "_UI_LinkMapping_type"),
-				 GMFMapPackage.eINSTANCE.getLinkMapping_LinkMetaFeature(),
-				 true,
-				 null,
-				 getString("_UI_DomainmetainformationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EStructuralFeature> original = (Collection<EStructuralFeature>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByContainerMetaclass(original, (LinkMapping) object);
-						}
-			});
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getLinkMapping_CreationConstraints());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns LinkMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/LinkMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		StringBuffer sb = new StringBuffer();
-		LinkMapping mapping = (LinkMapping) object;
-		sb.append('<');
-		if (mapping.getDomainMetaElement() != null) {
-			sb.append(mapping.getDomainMetaElement().getName());
-		}
-		sb.append('{');
-		if (mapping.getSourceMetaFeature() != null) {
-			sb.append(GMFMapEditPlugin.getFeatureLabel(mapping.getSourceMetaFeature()));
-			sb.append('-');
-			sb.append('>');
-		}
-		if (mapping.getLinkMetaFeature() != null) {
-			sb.append(GMFMapEditPlugin.getFeatureLabel(mapping.getLinkMetaFeature()));
-		}
-		sb.append('}');
-		sb.append('/');
-		if (mapping.getDiagramLink() != null) {
-			sb.append(mapping.getDiagramLink().getName());
-		}
-		sb.append('>');
-		return getString("_UI_LinkMapping_type") + ' ' + sb;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(LinkMapping.class)) {
-			case GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getLinkMapping_CreationConstraints(),
-				 GMFMapFactory.eINSTANCE.createLinkConstraints()));
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MappingEntryItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MappingEntryItemProvider.java
deleted file mode 100644
index a60ed276a77..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MappingEntryItemProvider.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.MappingEntry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MappingEntryItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MappingEntryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDomainMetaElementPropertyDescriptor(object);
-			addRelatedDiagramsPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Domain Meta Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addDomainMetaElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), 
-				 getResourceLocator(),
-				 getString("_UI_MappingEntry_domainMetaElement_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MappingEntry_domainMetaElement_feature", "_UI_MappingEntry_type"),
-				 GMFMapPackage.eINSTANCE.getMappingEntry_DomainMetaElement(), 
-				 true, 
-				 null, 
-				 getString("_UI_DomainmetainformationPropertyCategory"), 
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EClass> original = (Collection<EClass>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByContainmentFeature(original, (MappingEntry) object);
-						}
-				 });
-	}
-
-	/**
-	 * This adds a property descriptor for the Related Diagrams feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addRelatedDiagramsPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MappingEntry_relatedDiagrams_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MappingEntry_relatedDiagrams_feature", "_UI_MappingEntry_type"),
-				 GMFMapPackage.eINSTANCE.getMappingEntry_RelatedDiagrams(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Containment Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addContainmentFeaturePropertyDescriptor(Object object) {
-		throw new UnsupportedOperationException("Subclasses should override");
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMappingEntry_DomainSpecialization());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMappingEntry_DomainInitializer());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMappingEntry_VisualEffects());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_MappingEntry_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MappingEntry.class)) {
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION:
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER:
-			case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
-			case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMappingEntry_DomainSpecialization(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMappingEntry_DomainInitializer(),
-				 GMFMapFactory.eINSTANCE.createFeatureSeqInitializer()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings(),
-				 GMFMapFactory.eINSTANCE.createLabelMapping()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings(),
-				 GMFMapFactory.eINSTANCE.createFeatureLabelMapping()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings(),
-				 GMFMapFactory.eINSTANCE.createOclChoiceLabelMapping()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings(),
-				 GMFMapFactory.eINSTANCE.createDesignLabelMapping()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings(),
-				 GMFMapFactory.eINSTANCE.createExpressionLabelMapping()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMappingEntry_VisualEffects(),
-				 GMFMapFactory.eINSTANCE.createVisualEffectMapping()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MappingItemProvider.java
deleted file mode 100644
index 6911495483a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MappingItemProvider.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.Mapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MappingItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMapping_Nodes());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMapping_Links());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMapping_Diagram());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMapping_AppearanceStyles());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMapping_Audits());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMapping_Metrics());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns Mapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Mapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Mapping_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Mapping.class)) {
-			case GMFMapPackage.MAPPING__NODES:
-			case GMFMapPackage.MAPPING__LINKS:
-			case GMFMapPackage.MAPPING__DIAGRAM:
-			case GMFMapPackage.MAPPING__APPEARANCE_STYLES:
-			case GMFMapPackage.MAPPING__AUDITS:
-			case GMFMapPackage.MAPPING__METRICS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMapping_Nodes(),
-				 GMFMapFactory.eINSTANCE.createTopNodeReference()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMapping_Links(),
-				 GMFMapFactory.eINSTANCE.createLinkMapping()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMapping_Diagram(),
-				 GMFMapFactory.eINSTANCE.createCanvasMapping()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMapping_AppearanceStyles(),
-				 GMFToolFactory.eINSTANCE.createGenericStyleSelector()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMapping_Audits(),
-				 GMFMapFactory.eINSTANCE.createAuditContainer()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMapping_Metrics(),
-				 GMFMapFactory.eINSTANCE.createMetricContainer()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MetricContainerItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MetricContainerItemProvider.java
deleted file mode 100644
index dfb515b0ed7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MetricContainerItemProvider.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.MetricContainer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MetricContainerItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MetricContainerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMetricContainer_Metrics());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns MetricContainer.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/MetricContainer"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_MetricContainer_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MetricContainer.class)) {
-			case GMFMapPackage.METRIC_CONTAINER__METRICS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMetricContainer_Metrics(),
-				 GMFMapFactory.eINSTANCE.createMetricRule()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MetricRuleItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MetricRuleItemProvider.java
deleted file mode 100644
index 674f7afe090..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/MetricRuleItemProvider.java
+++ /dev/null
@@ -1,335 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.MetricRule} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MetricRuleItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MetricRuleItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-			addKeyPropertyDescriptor(object);
-			addLowLimitPropertyDescriptor(object);
-			addHighLimitPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RuleBase_name_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RuleBase_name_feature", "_UI_RuleBase_type"),
-				 GMFMapPackage.eINSTANCE.getRuleBase_Name(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_RuleBase_description_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_RuleBase_description_feature", "_UI_RuleBase_type"),
-				 GMFMapPackage.eINSTANCE.getRuleBase_Description(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MetricRule_key_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MetricRule_key_feature", "_UI_MetricRule_type"),
-				 GMFMapPackage.eINSTANCE.getMetricRule_Key(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Low Limit feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLowLimitPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MetricRule_lowLimit_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MetricRule_lowLimit_feature", "_UI_MetricRule_type"),
-				 GMFMapPackage.eINSTANCE.getMetricRule_LowLimit(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the High Limit feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHighLimitPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MetricRule_highLimit_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MetricRule_highLimit_feature", "_UI_MetricRule_type"),
-				 GMFMapPackage.eINSTANCE.getMetricRule_HighLimit(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMetricRule_Rule());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getMetricRule_Target());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns MetricRule.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/MetricRule"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((MetricRule)object).getName();
-		return label == null || label.length() == 0 ?
-			getString("_UI_MetricRule_type") :
-			getString("_UI_MetricRule_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MetricRule.class)) {
-			case GMFMapPackage.METRIC_RULE__NAME:
-			case GMFMapPackage.METRIC_RULE__DESCRIPTION:
-			case GMFMapPackage.METRIC_RULE__KEY:
-			case GMFMapPackage.METRIC_RULE__LOW_LIMIT:
-			case GMFMapPackage.METRIC_RULE__HIGH_LIMIT:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-			case GMFMapPackage.METRIC_RULE__RULE:
-			case GMFMapPackage.METRIC_RULE__TARGET:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds to the collection of {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing all of the children that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMetricRule_Rule(),
-				 GMFMapFactory.eINSTANCE.createValueExpression()));
-/* avoid using other ValueExpression sub-types as children
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMetricRule_Rule(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMetricRule_Rule(),
-				 GMFMapFactory.eINSTANCE.createFeatureValueSpec()));
-*/
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMetricRule_Target(),
-				 GMFMapFactory.eINSTANCE.createDomainElementTarget()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMetricRule_Target(),
-				 GMFMapFactory.eINSTANCE.createDiagramElementTarget()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getMetricRule_Target(),
-				 GMFMapFactory.eINSTANCE.createNotationElementTarget()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NodeMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NodeMappingItemProvider.java
deleted file mode 100644
index f447b11dc86..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NodeMappingItemProvider.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.NodeMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class NodeMappingItemProvider
-	extends MappingEntryItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addContextMenuPropertyDescriptor(object);
-			addToolPropertyDescriptor(object);
-			addAppearanceStylePropertyDescriptor(object);
-			addDiagramNodePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Context Menu feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addContextMenuPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_MenuOwner_contextMenu_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_MenuOwner_contextMenu_feature", "_UI_MenuOwner_type"),
-				 GMFMapPackage.eINSTANCE.getMenuOwner_ContextMenu(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Tool feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addToolPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ToolOwner_tool_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ToolOwner_tool_feature", "_UI_ToolOwner_type"),
-				 GMFMapPackage.eINSTANCE.getToolOwner_Tool(),
-				 true,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.filterBySuperClasses(super.getComboBoxObjects(object), new Class[] {CreationTool.class, GenericTool.class});
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Appearance Style feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addAppearanceStylePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_AppearanceSteward_appearanceStyle_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_AppearanceSteward_appearanceStyle_feature", "_UI_AppearanceSteward_type"),
-				 GMFMapPackage.eINSTANCE.getAppearanceSteward_AppearanceStyle(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Diagram Node feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addDiagramNodePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NodeMapping_diagramNode_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NodeMapping_diagramNode_feature", "_UI_NodeMapping_type"),
-				 GMFMapPackage.eINSTANCE.getNodeMapping_DiagramNode(),
-				 true,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							return FilterUtil.sort(super.getComboBoxObjects(object));
-						}
-			});
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getNodeMapping_Children());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getNodeMapping_Compartments());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns NodeMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NodeMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		if (object instanceof NodeMapping) {
-			NodeMapping mapping = (NodeMapping) object;
-			String result = " <";
-			if (mapping.getDomainMetaElement() != null) {
-				result += mapping.getDomainMetaElement().getName();
-			}
-			result += "/";
-			if (mapping.getDiagramNode() != null) {
-				result += mapping.getDiagramNode().getName();
-			}
-			result += ">";
-			return getString("_UI_NodeMapping_type") + result;
-		}
-		return getString("_UI_NodeMapping_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChangedGen(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(NodeMapping.class)) {
-			case GMFMapPackage.NODE_MAPPING__CHILDREN:
-			case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(NodeMapping.class)) {
-		case GMFMapPackage.NODE_MAPPING__DIAGRAM_NODE:
-		case GMFMapPackage.NODE_MAPPING__DOMAIN_META_ELEMENT:
-			fireNotifyChanged(new ViewerNotification(notification, null));
-			break;
-		}
-		notifyChangedGen(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getNodeMapping_Children(),
-				 GMFMapFactory.eINSTANCE.createChildReference()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getNodeMapping_Compartments(),
-				 GMFMapFactory.eINSTANCE.createCompartmentMapping()));
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NodeReferenceItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NodeReferenceItemProvider.java
deleted file mode 100644
index 0d4065d7787..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NodeReferenceItemProvider.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.NodeReference} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
-// TODO: abstract is not generated
-public abstract class NodeReferenceItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeReferenceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addContainmentFeaturePropertyDescriptor(object);
-			addChildrenFeaturePropertyDescriptor(object);
-			addChildPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Containment Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addContainmentFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NeedsContainment_containmentFeature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NeedsContainment_containmentFeature_feature", "_UI_NeedsContainment_type"),
-				 GMFMapPackage.eINSTANCE.getNeedsContainment_ContainmentFeature(),
-				 true,
-				 null,
-				 null,
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EReference> original = (Collection<EReference>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByContainerMetaclass(original, (NodeReference) object, true);
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Children Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addChildrenFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NodeReference_childrenFeature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NodeReference_childrenFeature_feature", "_UI_NodeReference_type"),
-				 GMFMapPackage.eINSTANCE.getNodeReference_ChildrenFeature(),
-				 true,
-				 null,
-				 null,
-				 null) {
-						protected Collection<?> getComboBoxObjects(Object object) {
-							@SuppressWarnings("unchecked")
-							Collection<EReference> original = (Collection<EReference>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByContainerMetaclass(original, (NodeReference) object, false);
-						}
-			});
-	}
-
-	/**
-	 * This adds a property descriptor for the Child feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addChildPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NodeReference_child_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NodeReference_child_feature", "_UI_NodeReference_type"),
-				 GMFMapPackage.eINSTANCE.getNodeReference_Child(),
-				 false,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public abstract String getText(Object object);
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NotationElementTargetItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NotationElementTargetItemProvider.java
deleted file mode 100644
index d24b1e4efca..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/NotationElementTargetItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.NotationElementTarget} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class NotationElementTargetItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotationElementTargetItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addElementPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Element feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addElementPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_NotationElementTarget_element_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_NotationElementTarget_element_feature", "_UI_NotationElementTarget_type"),
-				 GMFMapPackage.eINSTANCE.getNotationElementTarget_Element(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns NotationElementTarget.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/NotationElementTarget"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_NotationElementTarget_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/OclChoiceLabelMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/OclChoiceLabelMappingItemProvider.java
deleted file mode 100644
index d2bdeb9abcd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/OclChoiceLabelMappingItemProvider.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a
- * {@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping} object. <!--
- * begin-user-doc --> <!-- end-user-doc -->
- * 
- * @generated
- */
-public class OclChoiceLabelMappingItemProvider extends LabelMappingItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	public OclChoiceLabelMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addFeaturePropertyDescriptor(object);
-			addItemsExpressionPropertyDescriptor(object);
-			addShowExpressionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Feature feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated NOT
-	 */
-	protected void addFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(new ItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_OclChoiceLabelMapping_feature_feature"), getString("_UI_PropertyDescriptor_description", "_UI_OclChoiceLabelMapping_feature_feature", "_UI_OclChoiceLabelMapping_type"),
-				GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_Feature(), true, false, true, null, null, null) {
-
-			protected Collection<?> getComboBoxObjects(Object object) {
-				@SuppressWarnings("unchecked")
-				Collection<EStructuralFeature> original = (Collection<EStructuralFeature>) super.getComboBoxObjects(object);
-				Collection<EStructuralFeature> filteredByContainer = FilterUtil.filterByContainerMetaclass(original, ((OclChoiceLabelMapping) object).getMapEntry());
-				Collection<EStructuralFeature> result = new ArrayList<EStructuralFeature>();
-				for (EStructuralFeature feature : filteredByContainer) {
-					if (feature instanceof EAttribute) {
-						result.add(feature);
-					} else if (feature instanceof EReference) {
-						EReference reference = (EReference) feature;
-						if (!reference.isContainment() && reference.getUpperBound() == 1) {
-							result.add(feature);
-						}
-					}
-				}
-				return result;
-			}
-		});
-	}
-
-	/**
-	 * This adds a property descriptor for the Items Expression feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addItemsExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_OclChoiceLabelMapping_itemsExpression_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_OclChoiceLabelMapping_itemsExpression_feature", "_UI_OclChoiceLabelMapping_type"),
-				 GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ItemsExpression(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Show Expression feature. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	protected void addShowExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_OclChoiceLabelMapping_showExpression_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_OclChoiceLabelMapping_showExpression_feature", "_UI_OclChoiceLabelMapping_type"),
-				 GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ShowExpression(),
-				 true,
-				 false,
-				 false,
-				 null,
-				 getString("_UI_VisualrepresentationPropertyCategory"),
-				 null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ItemsExpression());
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ShowExpression());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns OclChoiceLabelMapping.gif.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/OclChoiceLabelMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc
-	 * --> <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		OclChoiceLabelMapping oclChoiceLabelMapping = (OclChoiceLabelMapping)object;
-		return getString("_UI_OclChoiceLabelMapping_type") + " " + oclChoiceLabelMapping.isReadOnly();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc --> <!--
-	 * end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(OclChoiceLabelMapping.class)) {
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION:
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s
-	 * describing the children that can be created under this object. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ItemsExpression(),
-				 GMFMapFactory.eINSTANCE.createValueExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ItemsExpression(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ShowExpression(),
-				 GMFMapFactory.eINSTANCE.createValueExpression()));
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ShowExpression(),
-				 GMFMapFactory.eINSTANCE.createConstraint()));
-	}
-
-	/**
-	 * This returns the label text for
-	 * {@link org.eclipse.emf.edit.command.CreateChildCommand}. <!--
-	 * begin-user-doc --> <!-- end-user-doc -->
-	 * 
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify =
-			childFeature == GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ItemsExpression() ||
-			childFeature == GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping_ShowExpression();
-
-		if (qualify) {
-			return getString
-				("_UI_CreateChild_text2",
-				 new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ReferenceNewElementSpecItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ReferenceNewElementSpecItemProvider.java
deleted file mode 100644
index e1c6c64154d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ReferenceNewElementSpecItemProvider.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceNewElementSpecItemProvider.java,v 1.7 2008/04/17 11:58:45 atikhomirov Exp $
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec;
-import org.eclipse.papyrus.gmf.mappings.presentation.FilterUtil;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ReferenceNewElementSpecItemProvider
-	extends FeatureInitializerItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReferenceNewElementSpecItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Feature feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected void addFeaturePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(new ItemPropertyDescriptor(
-				((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_FeatureInitializer_feature_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_FeatureInitializer_feature_feature", "_UI_FeatureInitializer_type"),
-				 GMFMapPackage.eINSTANCE.getFeatureInitializer_Feature(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null) {
-					protected Collection<?> getComboBoxObjects(Object object) {
-						if(object instanceof FeatureInitializer) {
-							@SuppressWarnings("unchecked")
-							final Collection<EStructuralFeature> original = (Collection<EStructuralFeature>) super.getComboBoxObjects(object);
-							return FilterUtil.filterByFeatureInitializer(original, (FeatureInitializer)object);
-						}
-					
-						return super.getComboBoxObjects(object);
-					}
-			});		
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getReferenceNewElementSpec_NewElementInitializers());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ReferenceNewElementSpec.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ReferenceNewElementSpec"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-		StringBuffer buf = new StringBuffer();
-		buf.append(getString("_UI_ReferenceNewElementSpec_type"));
-		if(object instanceof ReferenceNewElementSpec) {			
-			ReferenceNewElementSpec newElementSpec = (ReferenceNewElementSpec)object;
-			buf.append('<');			
-			String feature = (newElementSpec.getFeature() != null) ? newElementSpec.getFeature().getName() : null;			
-			if(feature != null && feature.length() > 0) {
-				buf.append(feature);
-			}
-			buf.append(":= new ");			
-			if(newElementSpec.getFeature() != null && newElementSpec.getFeature().getEType() != null) {
-				buf.append(newElementSpec.getFeature().getEType().getName());
-			}
-			
-			buf.append('[').append(newElementSpec.getNewElementInitializers().size()).append(']');			
-			buf.append('>');			
-		}
-		return buf.toString();
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ReferenceNewElementSpec.class)) {
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getReferenceNewElementSpec_NewElementInitializers(),
-				 GMFMapFactory.eINSTANCE.createFeatureSeqInitializer()));
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/TopNodeReferenceItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/TopNodeReferenceItemProvider.java
deleted file mode 100644
index 5c697bb9471..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/TopNodeReferenceItemProvider.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.TopNodeReference} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class TopNodeReferenceItemProvider
-	extends NodeReferenceItemProvider
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TopNodeReferenceItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFMapPackage.eINSTANCE.getTopNodeReference_OwnedChild());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns TopNodeReference.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/TopNodeReference"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getText(Object object) {
-        if (object instanceof NodeReference) { 
-        	NodeReference reference = (NodeReference) object;
-            String result = " <"; 
-            if (reference.getContainmentFeature() != null) { 
-                 result += reference.getContainmentFeature().getName(); 
-            } 
-            if (reference.getChildrenFeature() != null) {
-            	result += "|";
-            	result += reference.getChildrenFeature().getName();
-            }
-            if (reference.isSetChild()) {
-            	NodeMapping mapping = reference.getChild();
-                if (mapping.getDomainMetaElement() != null) {
-                	result += ":";
-                	result += mapping.getDomainMetaElement().getName();
-                }
-                result += "/";
-                if (mapping.getDiagramNode() != null) { 
-                    result += reference.getChild().getDiagramNode().getName(); 
-                } 
-            }
-            result += ">"; 
-            return getString("_UI_TopNodeReference_type") + result; 
-
-        }
-		return getString("_UI_TopNodeReference_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void notifyChangedGen(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(TopNodeReference.class)) {
-			case GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	public void notifyChanged(Notification notification) {
-		switch (notification.getFeatureID(NodeMapping.class)) {
-		case GMFMapPackage.NODE_REFERENCE__CONTAINMENT_FEATURE:
-		case GMFMapPackage.NODE_REFERENCE__CHILDREN_FEATURE:
-			fireNotifyChanged(new ViewerNotification(notification, null));
-			break;
-		}
-		notifyChangedGen(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add
-			(createChildParameter
-				(GMFMapPackage.eINSTANCE.getTopNodeReference_OwnedChild(),
-				 GMFMapFactory.eINSTANCE.createNodeMapping()));
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ValueExpressionItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ValueExpressionItemProvider.java
deleted file mode 100644
index eda4c7ee7e8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/ValueExpressionItemProvider.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.ValueExpression} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ValueExpressionItemProvider
-	extends ItemProviderAdapter
-	implements	
-		IEditingDomainItemProvider,	
-		IStructuredItemContentProvider,	
-		ITreeItemContentProvider,	
-		IItemLabelProvider,	
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueExpressionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addBodyPropertyDescriptor(object);
-			addLanguagePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Body feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBodyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ValueExpression_body_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ValueExpression_body_feature", "_UI_ValueExpression_type"),
-				 GMFMapPackage.eINSTANCE.getValueExpression_Body(),
-				 true,
-				 true,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Language feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addLanguagePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_ValueExpression_language_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_ValueExpression_language_feature", "_UI_ValueExpression_type"),
-				 GMFMapPackage.eINSTANCE.getValueExpression_Language(),
-				 true,
-				 false,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns ValueExpression.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueExpression"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = crop(((ValueExpression)object).getBody());
-		return label == null || label.length() == 0 ?
-			getString("_UI_ValueExpression_type") :
-			getString("_UI_ValueExpression_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ValueExpression.class)) {
-			case GMFMapPackage.VALUE_EXPRESSION__BODY:
-			case GMFMapPackage.VALUE_EXPRESSION__LANGUAGE:
-			case GMFMapPackage.VALUE_EXPRESSION__LANG_NAME:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/VisualEffectMappingItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/VisualEffectMappingItemProvider.java
deleted file mode 100644
index 7ef12ae1fd3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map.edit/src/org/eclipse/papyrus/gmf/mappings/provider/VisualEffectMappingItemProvider.java
+++ /dev/null
@@ -1,195 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.provider;
-
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.VisualEffectMapping;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class VisualEffectMappingItemProvider
-	extends ItemProviderAdapter
-	implements
-		IEditingDomainItemProvider,
-		IStructuredItemContentProvider,
-		ITreeItemContentProvider,
-		IItemLabelProvider,
-		IItemPropertySource {
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VisualEffectMappingItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDiagramPinPropertyDescriptor(object);
-			addOclExpressionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Diagram Pin feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDiagramPinPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_VisualEffectMapping_diagramPin_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_VisualEffectMapping_diagramPin_feature", "_UI_VisualEffectMapping_type"),
-				 GMFMapPackage.eINSTANCE.getVisualEffectMapping_DiagramPin(),
-				 true,
-				 false,
-				 true,
-				 null,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Ocl Expression feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addOclExpressionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add
-			(createItemPropertyDescriptor
-				(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
-				 getResourceLocator(),
-				 getString("_UI_VisualEffectMapping_oclExpression_feature"),
-				 getString("_UI_PropertyDescriptor_description", "_UI_VisualEffectMapping_oclExpression_feature", "_UI_VisualEffectMapping_type"),
-				 GMFMapPackage.eINSTANCE.getVisualEffectMapping_OclExpression(),
-				 true,
-				 true,
-				 false,
-				 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
-				 null,
-				 null));
-	}
-
-	/**
-	 * This returns VisualEffectMapping.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/VisualEffectMapping"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = crop(((VisualEffectMapping)object).getOclExpression());
-		return label == null || label.length() == 0 ?
-			getString("_UI_VisualEffectMapping_type") :
-			getString("_UI_VisualEffectMapping_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(VisualEffectMapping.class)) {
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__OCL_EXPRESSION:
-				fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-				return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFMapEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.project
deleted file mode 100644
index 719957742b4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.map</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/META-INF/MANIFEST.MF
deleted file mode 100644
index 513b384d0fa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,19 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.map; singleton:=true
-Bundle-Version: 2.9.0.qualifier
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.papyrus.gmf.internal.map.util;x-internal:=true,
- org.eclipse.papyrus.gmf.mappings,
- org.eclipse.papyrus.gmf.mappings.impl,
- org.eclipse.papyrus.gmf.mappings.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.4.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.common;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.papyrus.gmf.graphdef;bundle-version="[2.9.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.tooldef;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.validate;bundle-version="[1.1.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/build.properties
deleted file mode 100644
index 8e0b9e2faa2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/build.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-bin.includes = plugin.xml,\
-               plugin.properties,\
-               META-INF/,\
-               .,\
-               models/,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.ecore b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.ecore
deleted file mode 100644
index a8ee632f670..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.ecore
+++ /dev/null
@@ -1,753 +0,0 @@
-<?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="mappings" nsURI="http://www.eclipse.org/papyrus/gmf/2020/mappings"
-    nsPrefix="gmfmap">
-  <eAnnotations source="http://www.eclipse.org/emf/2004/EmfaticAnnotationMap">
-    <details key="constraints" value="http://www.eclipse.org/gmf/2005/constraints"/>
-    <details key="constraintsMeta" value="http://www.eclipse.org/gmf/2005/constraints/meta"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-    <details key="import" value="http://www.eclipse.org/gmf/runtime/1.0.0/notation"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="Mapping">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="nodes->forAll(n|n.containmentFeature.oclIsUndefined() and not n.child.domainMetaElement.oclIsUndefined() implies links->exists(let r:ecore::EReference= linkMetaFeature.oclAsType(ecore::EReference) in r.containment and r.eReferenceType.isSuperTypeOf(n.child.domainMetaElement)))"/>
-      <details key="description" value="Phantom nodes that are not targeted by a link mapping representing containment reference present in the model"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
-        eType="#//TopNodeReference" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="links" upperBound="-1"
-        eType="#//LinkMapping" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
-        eType="#//CanvasMapping" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="appearanceStyles" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//StyleSelector"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="audits" eType="#//AuditContainer"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="metrics" eType="#//MetricContainer"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MappingEntry" abstract="true">
-    <eOperations name="getDomainContext" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This method simplifies OCL expressions (makes it easy to write for both Node and Link)."/>
-      </eAnnotations>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainMetaElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainSpecialization" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specializes further the domain meta element EClass associated with this mapping and should be evaluated in this EClass context"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ocl" value="self.getDomainContext()"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not domainSpecialization.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()"/>
-        <details key="description" value="Using 'Domain Specialization' requires 'Domain Meta Element' to be set"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainInitializer" eType="#//ElementInitializer"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Initializer for the domain model element associated with mapping"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not domainInitializer.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()"/>
-        <details key="description" value="'Domain Element' must be set in mapping with 'Element Initializers'"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="labelMappings" upperBound="-1"
-        eType="#//LabelMapping" containment="true" eOpposite="#//LabelMapping/mapEntry"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="relatedDiagrams" upperBound="-1"
-        eType="#//CanvasMapping">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Diagrams that may be associated with this diagram element. It's up to client application to define what this association means (e.g. open diagram)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="visualEffects" upperBound="-1"
-        eType="#//VisualEffectMapping" containment="true" eOpposite="#//VisualEffectMapping/parentMapEntry"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NeedsContainment" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containmentFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not containmentFeature.oclIsUndefined() implies containmentFeature.containment"/>
-        <details key="description" value="Containment EReference expected"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeReference" abstract="true" eSuperTypes="#//NeedsContainment">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not containmentFeature.oclIsUndefined() implies containmentFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)"/>
-      <details key="description" value="'Containment Feature' must reference the same class or super type of 'Domain Meta Element' of the referenced node"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childrenFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not childrenFeature.oclIsUndefined() implies childrenFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)"/>
-        <details key="description" value="'Children Feature' must reference the same class or super type of 'Domain Meta Element' of the referenced node"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="child" eType="#//NodeMapping"
-        changeable="false" volatile="true" transient="true" unsettable="true" derived="true"
-        resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ChildReference" eSuperTypes="#//NodeReference">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not (ownedChild.oclIsUndefined() and referencedChild.oclIsUndefined())"/>
-      <details key="description" value="Either 'ownedChild' or 'referencedChild' NodeMapping must be set"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not childrenFeature.oclIsUndefined() implies childrenFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)"/>
-      <details key="description" value="'Children Feature' must be owned by 'Domain Meta Element' or its super type of this reference parent Node Mapping"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not containmentFeature.oclIsUndefined() implies containmentFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)"/>
-      <details key="description" value="'Containment Feature' must be owned by 'Domain Meta Element' or its super type of this reference parent Node Mapping"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()"/>
-      <details key="description" value="ChildReference to NodeMapping with domainElement should define 'containmentFeature'"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in (((child.labelMappings->size() = 1) and child.labelMappings->forAll( soleLabel: LabelMapping | soleLabel.diagramLabel = child.diagramNode)) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))"/>
-      <details key="description" value="Side-affixed children can not be pure labels"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in ((not compartment.oclIsUndefined()) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))"/>
-      <details key="description" value="Side-affixed children can not be placed in compartments"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentNode" lowerBound="1"
-        eType="#//NodeMapping" eOpposite="#//NodeMapping/children"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartment" eType="#//CompartmentMapping"
-        eOpposite="#//CompartmentMapping/children"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedChild" eType="#//NodeMapping"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedChild" eType="#//NodeMapping"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TopNodeReference" eSuperTypes="#//NodeReference">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedChild" lowerBound="1"
-        eType="#//NodeMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeMapping" eSuperTypes="#//MappingEntry #//MenuOwner #//ToolOwner #//AppearanceSteward">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Both top-level diagram node and any inner node"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramNode" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Node"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//ChildReference" containment="true" eOpposite="#//ChildReference/parentNode"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
-        eType="#//CompartmentMapping" containment="true" eOpposite="#//CompartmentMapping/parentNode"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompartmentMapping">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartment" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Compartment"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentNode" lowerBound="1"
-        eType="#//NodeMapping" changeable="false" resolveProxies="false" eOpposite="#//NodeMapping/compartments"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//ChildReference" eOpposite="#//ChildReference/compartment"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LinkMapping" eSuperTypes="#//MappingEntry #//NeedsContainment #//MenuOwner #//ToolOwner #//AppearanceSteward">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Connection element"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="domainMetaElement.oclIsUndefined() implies containmentFeature.oclIsUndefined() and sourceMetaFeature.oclIsUndefined()"/>
-      <details key="description" value="Link mapping without 'Domain Element' class does not use 'Containment Feature' and 'Source Feature'"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not domainMetaElement.oclIsUndefined()  implies containmentFeature.eReferenceType.isSuperTypeOf(domainMetaElement)"/>
-      <details key="description" value="'Containment Feature' must reference the same class or super type of 'Domain Element' EClass"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramLink" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Connection"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceMetaFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not domainMetaElement.oclIsUndefined() implies sourceMetaFeature.oclIsUndefined() or sourceMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)"/>
-        <details key="description" value="'Source Feature' must be owned by the link 'Domain Element' or its super type"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkMetaFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not(domainMetaElement.oclIsUndefined() or linkMetaFeature.oclIsUndefined()) implies linkMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)"/>
-        <details key="description" value="'Target Feature' must be owned by the link 'Domain Element' or its super type"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="creationConstraints" eType="#//LinkConstraints"
-        containment="true" eOpposite="#//LinkConstraints/linkMapping">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies additional restrictions on link creation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CanvasMapping">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramCanvas" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Canvas"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModel" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainMetaElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not domainMetaElement.oclIsUndefined() implies not(domainMetaElement.abstract or domainMetaElement.interface)"/>
-        <details key="description" value="Top-level diagram container must be concrete"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="palette" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//Palette"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="menuContributions" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//MainMenu"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolbarContributions" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//Toolbar"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LabelMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Label definition; text is taken from the graph model; no editing support; user may contribute custom parser"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramLabel" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//DiagramLabel"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mapEntry" lowerBound="1"
-        eType="#//MappingEntry" changeable="false" resolveProxies="false" eOpposite="#//MappingEntry/labelMappings"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureLabelMapping" eSuperTypes="#//LabelMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Label based on feature(s) from domain model"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="features" lowerBound="1"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="features->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))"/>
-        <details key="description" value="Label attributes must be available in 'Domain Element' EClass of the labeled mapping entry"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="editableFeatures" upperBound="-1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="editableFeatures->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))"/>
-        <details key="description" value="Label attributes must be available in 'Domain Element' EClass of the labeled mapping entry"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Pattern to produce label on diagram, depends on view method"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editorPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Pattern to produce text for inplace editor, depends on view method; if not specified then viewPattern should be used"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Pattern to extract values from input text, depends on edit method; if not specified then viewPattern should be used"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewMethod" eType="#//LabelTextAccessMethod"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editMethod" eType="#//LabelTextAccessMethod"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="OclChoiceLabelMapping" eSuperTypes="#//LabelMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Label based on a feature (reference or attribute) from domain model and list of choices"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement)"/>
-        <details key="description" value="Label reference must be available in 'Domain Element' EClass of the labeled mapping entry"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature.oclIsKindOf(ecore::EReference) implies (not(feature.oclAsType(ecore::EReference).containment) and (feature.oclAsType(ecore::EReference).upperBound = 1))"/>
-        <details key="description" value="Reference feature should not be containment and don't be multiple"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature.oclIsKindOf(ecore::EAttribute) implies (itemsExpression &lt;> null)"/>
-        <details key="description" value="Items expression should be set if feature is an EAttribute"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="itemsExpression" eType="#//ValueExpression"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="showExpression" eType="#//ValueExpression"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="LabelTextAccessMethod">
-    <eLiterals name="MESSAGE_FORMAT"/>
-    <eLiterals name="NATIVE" value="1"/>
-    <eLiterals name="REGEXP" value="2"/>
-    <eLiterals name="PRINTF" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DesignLabelMapping" eSuperTypes="#//LabelMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Label based on DescriptionStyle from notation model"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ExpressionLabelMapping" eSuperTypes="#//LabelMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Label based on a calculated value"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="viewExpression" lowerBound="1"
-        eType="#//ValueExpression" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Expression to produce regular label value. Evaluated in the context of the owning mapEntry.domainMetaElement"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="editExpression" eType="#//ValueExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Optional expression to produce editable string representation of the label. If not set, viewExpression is used."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="validateExpression" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Boolean expression in a string context, which able to tell whether user-entered text is valid."/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Constraint" eSuperTypes="#//ValueExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Boolean type value expression which is to be evaluated in a context"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="Constraint"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LinkConstraints">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Groups constraints on the link source and target end"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not (sourceEnd.oclIsUndefined() and targetEnd.oclIsUndefined())"/>
-      <details key="description" value="Either 'sourceEnd' or 'targetEnd' constraint must be specified"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkMapping" lowerBound="1"
-        eType="#//LinkMapping" changeable="false" resolveProxies="false" eOpposite="#//LinkMapping/creationConstraints">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="References the link mapping restricted by these constraints"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceEnd" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Restriction enforced by the the source end, may reference variable 'oppositeEnd' pointing to targetEnd domainMetaElement instance if available."/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ocl" value="let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="variable"/>
-        <details key="name" value="oppositeEnd"/>
-        <details key="type.ocl" value="linkMapping.linkMetaFeature.eType"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="targetEnd" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Restriction enforced by the the target end, may reference variable 'oppositeEnd' pointing to sourceEnd domainMetaElement instance."/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ocl" value="linkMapping.linkMetaFeature.eType.oclAsType(ecore::EClass)"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="variable"/>
-        <details key="name" value="oppositeEnd"/>
-        <details key="type.ocl" value="let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ValueExpression">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="ValueSpec"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Expression as a textual statement which results in a value when evaluated in a context"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" 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="The text of the expression"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="body"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" lowerBound="1"
-        eType="#//Language" defaultValueLiteral="ocl">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the language in which the expression is stated"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="langName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        changeable="false" volatile="true" transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="lang"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ElementInitializer" abstract="true"
-      interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Base class for initializers of domain model elements"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mappingEntry" lowerBound="1"
-        eType="#//MappingEntry" changeable="false" volatile="true" transient="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The 'MappingEntry' whose domain model element is to be intialized by this initializer"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureSeqInitializer" eSuperTypes="#//ElementInitializer">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Feature sequence initializer to initialize a sequence of features"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initializers" lowerBound="1"
-        upperBound="-1" eType="#//FeatureInitializer" containment="true" eOpposite="#//FeatureInitializer/featureSeqInitializer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Value specifications as initializers for individual features which should be initialized in the order given by this list"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not creatingInitializer.feature.oclIsUndefined() implies creatingInitializer.feature.oclAsType(ecore::EReference).eReferenceType.isSuperTypeOf(elementClass)"/>
-        <details key="description" value="'elementClass' must be the same as or sub-type of the containing 'GenReferenceNewElementSpec' reference type"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not creatingInitializer.feature.oclIsUndefined() implies not (elementClass.interface or elementClass.abstract)"/>
-        <details key="description" value="'elementClass' must be a concrete EClass which is the same or sub-type of the containing 'GenReferenceNewElementSpec' reference type"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="creatingInitializer" eType="#//ReferenceNewElementSpec"
-        changeable="false" resolveProxies="false" eOpposite="#//ReferenceNewElementSpec/newElementInitializers"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureInitializer" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The feature for which is to be initialized by this initializer"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature &lt;> null implies not featureSeqInitializer.initializers->exists(i| i &lt;> self and i.feature = self.feature)"/>
-        <details key="description" value="The feature is already initialized by another 'FeatureInitializer' in the sequence"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature &lt;> null implies feature.eContainingClass.isSuperTypeOf(featureSeqInitializer.elementClass)"/>
-        <details key="description" value="The 'feature' of 'FeatureInitializer' must be available in 'Meta Class' of the initialized element"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature &lt;> null implies feature.changeable"/>
-        <details key="description" value="The 'feature' of 'FeatureInitializer' must be changeable"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="featureSeqInitializer"
-        lowerBound="1" eType="#//FeatureSeqInitializer" changeable="false" resolveProxies="false"
-        eOpposite="#//FeatureSeqInitializer/initializers"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValueSpec" eSuperTypes="#//FeatureInitializer">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Value specification associated with a specific feature"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="value" lowerBound="1" eType="#//ValueExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ocl" value="featureSeqInitializer.elementClass"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="type"/>
-        <details key="ocl" value="feature"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceNewElementSpec" eSuperTypes="#//FeatureInitializer">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="feature.many = false implies not (newElementInitializers->size() > 1)"/>
-      <details key="description" value="FeatureInitializer for single element EReference can't contain multiple element initializers"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="let r: ecore::EReference = feature.oclAsType(ecore::EReference) in feature &lt;> null implies r.containment"/>
-      <details key="description" value="'feature' of 'ReferenceNewElementSpec' must refer to containment ecore::EReference"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="newElementInitializers"
-        lowerBound="1" upperBound="-1" eType="#//FeatureSeqInitializer" containment="true"
-        eOpposite="#//FeatureSeqInitializer/creatingInitializer"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MenuOwner" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contextMenu" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//ContextMenu"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolOwner" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tool" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//AbstractTool">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Way to create this element"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AppearanceSteward" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="appearanceStyle" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//StyleSelector"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AuditContainer">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Container for audit rules representing a hierarchical organization of audits in the constraint category hierarchy of emft.validation framework"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" 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="Identifier which is unique within the scope of its parent container."/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not parentContainer.oclIsUndefined() implies parentContainer.childContainers->one(i | i.id = self.id)"/>
-        <details key="description" value="Audit container with the same ID already exists"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A human readable name for the category of audits organized in this container"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The detailed description of this audit container"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentContainer" eType="#//AuditContainer"
-        eOpposite="#//AuditContainer/childContainers"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="audits" upperBound="-1"
-        eType="#//AuditRule" containment="true" eOpposite="#//AuditRule/container">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The audit rules organized in this container"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childContainers" upperBound="-1"
-        eType="#//AuditContainer" containment="true" eOpposite="#//AuditContainer/parentContainer"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RuleBase" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Base class for rule like audit, metric rules..."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A human readable name of this rule"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The detailed description of this rule semantics"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AuditRule" eSuperTypes="#//RuleBase">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" 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="Unique identifier of this audit rule"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not id.oclIsUndefined() implies container.audits->one(i | i.id = self.id)"/>
-        <details key="description" value="Audit rule with the same ID already exists"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A boolean type condition which if not satisfied indicates this audit rule violation. It is evaluated in the context of the target"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ref" value="target"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//Auditable" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The target representing the context this audit is evaluated in"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//Severity"
-        defaultValueLiteral="ERROR">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the severity of this audit rule violation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useInLiveMode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Indicates if this audit should be evaluated also in Live mode. If 'false', only Batch mode is applicable"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The text message to be reported in case of this audit violation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
-        eType="#//AuditContainer" eOpposite="#//AuditContainer/audits">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The containing audit container of this audit rule"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DomainElementTarget" eSuperTypes="#//Auditable #//Measurable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target for rules applied on domain model elements"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="element"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Targeted domain model element"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DomainAttributeTarget" eSuperTypes="#//Auditable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents value based target, useful for audit rules expression not capable of ecore meta-model access"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="attribute.eType"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The attribute the value of which is used as context in audit rule defining this target"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nullAsError" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Indicates whether null value of the attribute is reported as audit failure or success"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramElementTarget" eSuperTypes="#//Auditable #//Measurable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target for rules applied on diagram notation model selectively, for specific visualized element"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="if element.oclIsKindOf(NodeMapping) then 'notation::Node' else 'notation::Edge' endif"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="#//MappingEntry">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Targeted visualized element"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NotationElementTarget" eSuperTypes="#//Auditable #//Measurable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target for rules applied on diagram notation model elements"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="element"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Targeted diagram notation model element"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="element.eAllSuperTypes->including(element)->one(ePackage.name = 'notation' and name = 'View')"/>
-        <details key="description" value="'notation::View' or its sub-class must be set to NotationElement target"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MetricContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="metrics" lowerBound="1"
-        upperBound="-1" eType="#//MetricRule" containment="true" eOpposite="#//MetricRule/container"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MetricRule" eSuperTypes="#//RuleBase">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not lowLimit.oclIsUndefined() and not highLimit.oclIsUndefined()  implies lowLimit &lt; highLimit"/>
-      <details key="description" value="Metric value 'lowLimit' must be smaller then 'highLimit'"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" 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="Unique key identifying this metric an abbreviation for this metric"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not key.oclIsUndefined() implies container.metrics->one(i | i.key = self.key)"/>
-        <details key="description" value="Metric rule with the same 'key' already exists"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//ValueExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Expression that calculates the value of this metric which is of EDataType that encapsulates java.lang.Number subclasses or their primitives"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ref" value="target"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="type"/>
-        <details key="ocl" value="'ecore::EDoubleObject'"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//Measurable" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The target representing the context this metric is evaluated in"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lowLimit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The lowest acceptable value of the rule expression result"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="highLimit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The highest acceptable value of the rule expression result"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
-        eType="#//MetricContainer" eOpposite="#//MetricContainer/metrics">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The containing metric container of this metric rule"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AuditedMetricTarget" eSuperTypes="#//Auditable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target metric which can be evaluated by audit rule. The target context here is the metric rule resulting type classifier"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="'ecore::EDoubleObject'"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="metric" lowerBound="1"
-        eType="#//MetricRule">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Metric which can be checked by audit"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Auditable" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target suitable for auditing"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Measurable" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Marker interface for anything that can be subject to metrics"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Severity">
-    <eLiterals name="INFO"/>
-    <eLiterals name="WARNING" value="1"/>
-    <eLiterals name="ERROR" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Language">
-    <eLiterals name="ocl"/>
-    <eLiterals name="java" value="1"/>
-    <eLiterals name="regexp" value="2"/>
-    <eLiterals name="nregexp" value="3"/>
-    <eLiterals name="literal" value="4"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="VisualEffectMapping">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramPin" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Pin"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="oclExpression" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentMapEntry" lowerBound="1"
-        eType="#//MappingEntry" changeable="false" eOpposite="#//MappingEntry/visualEffects"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.emf b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.emf
deleted file mode 100644
index a14c89e524e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.emf
+++ /dev/null
@@ -1,466 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- */
-
-@EmfaticAnnotationMap(
-	constraints="http://www.eclipse.org/gmf/2005/constraints",
-	constraintsMeta="http://www.eclipse.org/gmf/2005/constraints/meta")
-
-@constraints("import"="http://www.eclipse.org/gmf/runtime/1.0.0/notation")
-
-@namespace(uri="http://www.eclipse.org/papyrus/gmf/2020/mappings", prefix="gmfmap")
-package mappings;
-
-import "platform:/resource/org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore";
-import "platform:/resource/org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore";
-
-@constraints(
-	ocl="nodes->forAll(n|n.containmentFeature.oclIsUndefined() and not n.child.domainMetaElement.oclIsUndefined() implies links->exists(let r:ecore::EReference= linkMetaFeature.oclAsType(ecore::EReference) in r.containment and r.eReferenceType.isSuperTypeOf(n.child.domainMetaElement)))", 
-	description="Phantom nodes that are not targeted by a link mapping representing containment reference present in the model"
-)
-class Mapping {
-	!resolve val TopNodeReference[*] nodes;
-	!resolve val LinkMapping[*] links;
-	!resolve val CanvasMapping[1] diagram; // [1] ? 0..1?
-	val tooldef.StyleSelector[*] appearanceStyles;
-
-	val AuditContainer audits;
-	val MetricContainer metrics;
-}
-
-abstract class MappingEntry {
-	ref ecore.EClass[?] domainMetaElement;
-	// TODO inheriting getDomainContext from containmentFeature(as it was done) makes no sense for nodes provided containmentFeature is not part of MappingEntry. When node could be referenced from different parentNodes (with each having different containmentFeature) , it's just impossible to find out which containmentFeature is in use
-	@genmodel(documentation="This method simplifies OCL expressions (makes it easy to write for both Node and Link).")
-	op ecore.EClass getDomainContext();
-	
-	@genmodel(documentation="Specializes further the domain meta element EClass associated with this mapping and should be evaluated in this EClass context")
-	@constraintsMeta(def="context", ocl="self.getDomainContext()")
-	@constraints(ocl="not domainSpecialization.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()", description="Using 'Domain Specialization' requires 'Domain Meta Element' to be set")	
-	val Constraint domainSpecialization;
-
-	@genmodel(documentation="Initializer for the domain model element associated with mapping")
-	@constraints(ocl="not domainInitializer.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()", description="'Domain Element' must be set in mapping with 'Element Initializers'")
-	val ElementInitializer domainInitializer;
-
-	val LabelMapping[*]#mapEntry labelMappings;
-
-	@genmodel(documentation="Diagrams that may be associated with this diagram element. It's up to client application to define what this association means (e.g. open diagram)")
-//	@constaints(ocl="relatedDiagrams.domainMetaElement == self.domainMetaElement", description="If elements do not match, we can't generate code working properly right away", severity="warning")
-	ref CanvasMapping[*] relatedDiagrams;
-
-	// ref ecore.EClass drtClass; -> extract to interface NotationInstanceAspect, and use it in CanvasMapping
-	
-	val VisualEffectMapping[*]#parentMapEntry visualEffects;	
-}
-
-abstract interface NeedsContainment {
- 	@constraints(
- 		ocl="not containmentFeature.oclIsUndefined() implies containmentFeature.containment", description="Containment EReference expected"
- 	)
-	ref ecore.EReference[?] containmentFeature;
-}
-
-// Not feasible for pure design nodes: @constraints(ocl="not (child.domainMetaElement.oclIsUndefined() and containmentFeature.oclIsUndefined())", description="Either 'domainMetaElement' or 'containmentFeature' must be specified")
-@constraints(ocl="not containmentFeature.oclIsUndefined() implies containmentFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)", description="'Containment Feature' must reference the same class or super type of 'Domain Meta Element' of the referenced node")
-abstract class NodeReference extends NeedsContainment {
-	// extends NeedsContainment OR ref ecore.EReference[?] containmentFeature;
-	@constraints(ocl="not childrenFeature.oclIsUndefined() implies childrenFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)", description="'Children Feature' must reference the same class or super type of 'Domain Meta Element' of the referenced node")	
-	ref ecore.EReference[?] childrenFeature;
-
-	readonly unsettable derived volatile transient !resolve ref NodeMapping child;
-}
-
-@constraints(ocl="not (ownedChild.oclIsUndefined() and referencedChild.oclIsUndefined())", description="Either 'ownedChild' or 'referencedChild' NodeMapping must be set")
-@constraints(ocl="not childrenFeature.oclIsUndefined() implies childrenFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)", description="'Children Feature' must be owned by 'Domain Meta Element' or its super type of this reference parent Node Mapping")
-@constraints(ocl="not containmentFeature.oclIsUndefined() implies containmentFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)", description="'Containment Feature' must be owned by 'Domain Meta Element' or its super type of this reference parent Node Mapping")
-@constraints(ocl="not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()", description="ChildReference to NodeMapping with domainElement should define 'containmentFeature'")
-@constraints(ocl="let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in (((child.labelMappings->size() = 1) and child.labelMappings->forAll( soleLabel: LabelMapping | soleLabel.diagramLabel = child.diagramNode)) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))", description="Side-affixed children can not be pure labels")
-@constraints(ocl="let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in ((not compartment.oclIsUndefined()) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))", description="Side-affixed children can not be placed in compartments")
-class ChildReference extends NodeReference {
-	ref NodeMapping[1]#children parentNode; // TODO readonly, no much sense to setParentNode
-
-	ref CompartmentMapping[?]#children compartment;
-	//ref gmfgraph.Node[?] overrideNode;
-
-	// either one of these two must me set
-	val NodeMapping[?] ownedChild;
-	ref NodeMapping[?] referencedChild;
-
-}
-
-class TopNodeReference extends NodeReference {
-	val NodeMapping[1] ownedChild;
-}
-
-@genmodel(documentation="Both top-level diagram node and any inner node")
-class NodeMapping extends MappingEntry, MenuOwner, ToolOwner, AppearanceSteward {
-	ref gmfgraph.Node[1] diagramNode;
-	
-	ordered val ChildReference[*]#parentNode children;
-	
-	val CompartmentMapping[*]#parentNode compartments;
-//FIXME no containment feature - persist in resource then. Was: @constraints(ocl="not containmentFeature.oclIsUndefined() ", description="The child node mapping containmentFeature must be set")
-}
-
-class CompartmentMapping {
-	ref gmfgraph.Compartment[1] compartment;
-
-	readonly !resolve ref NodeMapping[1]#compartments parentNode;
-	ref ChildReference[*]#compartment children;
-}
-
-@genmodel(documentation="Connection element")
-@constraints(ocl="domainMetaElement.oclIsUndefined() implies containmentFeature.oclIsUndefined() and sourceMetaFeature.oclIsUndefined()", description="Link mapping without 'Domain Element' class does not use 'Containment Feature' and 'Source Feature'")
-@constraints(ocl="not domainMetaElement.oclIsUndefined()  implies containmentFeature.eReferenceType.isSuperTypeOf(domainMetaElement)", description="'Containment Feature' must reference the same class or super type of 'Domain Element' EClass")
-class LinkMapping extends MappingEntry, NeedsContainment, MenuOwner, ToolOwner, AppearanceSteward {
-	ref gmfgraph.Connection[1] diagramLink;
-
-	@constraints(
-		ocl="not domainMetaElement.oclIsUndefined() implies sourceMetaFeature.oclIsUndefined() or sourceMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)", description="'Source Feature' must be owned by the link 'Domain Element' or its super type"
-	)
-	ref ecore.EStructuralFeature[?] sourceMetaFeature;
-	// rename linkMetaFeature to linkTargetMetaReference;
-	@constraints(
-		ocl="not(domainMetaElement.oclIsUndefined() or linkMetaFeature.oclIsUndefined()) implies linkMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)", description="'Target Feature' must be owned by the link 'Domain Element' or its super type"
-	)
-	ref ecore.EStructuralFeature[?] linkMetaFeature; // XXX EReference? Links only to classes, not to datatypes/enums (i.e. attributes)
-	// super.drtClass isSubtypeOf(diagramrt.DiagramLink)
-	@genmodel(documentation="Specifies additional restrictions on link creation")
-	val LinkConstraints#linkMapping creationConstraints;
-}
-
-class CanvasMapping {
-	ref gmfgraph.Canvas[1] diagramCanvas;
-	ref ecore.EPackage domainModel;
-	@constraints(
-		ocl="not domainMetaElement.oclIsUndefined() implies not(domainMetaElement.abstract or domainMetaElement.interface)",
-		description="Top-level diagram container must be concrete"
-	)
-	ref ecore.EClass domainMetaElement;
-	ref tooldef.Palette[?] palette;
-	ordered ref tooldef.MainMenu[*] menuContributions;
-	ordered ref tooldef.Toolbar[*] toolbarContributions;
-	// ref ecore.EPackage drtPackage;
-	// super.drtClass isSubtypeOf(diagramrt.DiagramCanvas)
-}
-
-@genmodel(documentation="Label definition; text is taken from the graph model; no editing support; user may contribute custom parser")
-class LabelMapping {
-	ref gmfgraph.DiagramLabel[1] diagramLabel;
-	attr boolean readOnly;
-	readonly !resolve ref MappingEntry[1]#labelMappings mapEntry;
-}
-
-@genmodel(documentation="Label based on feature(s) from domain model")
-class FeatureLabelMapping extends LabelMapping {
-	@constraints(ocl="features->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))", description="Label attributes must be available in 'Domain Element' EClass of the labeled mapping entry")	
-	ref ecore.EAttribute[1..*] features;
-	@constraints(ocl="editableFeatures->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))", description="Label attributes must be available in 'Domain Element' EClass of the labeled mapping entry")	
-	ref ecore.EAttribute[*] editableFeatures;
-	@genmodel(documentation="Pattern to produce label on diagram, depends on view method")
-	attr String viewPattern;
-	@genmodel(documentation="Pattern to produce text for inplace editor, depends on view method; if not specified then viewPattern should be used")
-	attr String editorPattern;
-	@genmodel(documentation="Pattern to extract values from input text, depends on edit method; if not specified then viewPattern should be used")
-	attr String editPattern;
-	attr LabelTextAccessMethod viewMethod;
-	attr LabelTextAccessMethod editMethod;
-}
-
-@genmodel(documentation="Label based on a feature (reference or attribute) from domain model and list of choices")
-class OclChoiceLabelMapping extends LabelMapping {
-   @constraints(ocl="feature.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement)", description="Label reference must be available in 'Domain Element' EClass of the labeled mapping entry")
-   @constraints(ocl="feature.oclIsKindOf(ecore::EReference) implies (not(feature.oclAsType(ecore::EReference).containment) and (feature.oclAsType(ecore::EReference).upperBound = 1))", description="Reference feature should not be containment and don't be multiple")
-   @constraints(ocl="feature.oclIsKindOf(ecore::EAttribute) implies (itemsExpression <> null)", description="Items expression should be set if feature is an EAttribute")
-   ref ecore.EStructuralFeature[1] feature;   
-   val ValueExpression[?] itemsExpression;
-   val ValueExpression[?] showExpression;   
-}
-
-enum LabelTextAccessMethod {
-	MESSAGE_FORMAT; // java.text.MessageFormat
-	NATIVE; // EcoreUtil.convertToString(...) / EcoreUtil.createFromString(...)
-	REGEXP; // String.split(...)
-	PRINTF; // String.format(...)
-}
-
-@genmodel(documentation="Label based on DescriptionStyle from notation model")
-class DesignLabelMapping extends LabelMapping {
-}
-
-@genmodel(documentation="Label based on a calculated value")
-class ExpressionLabelMapping extends LabelMapping {
-	// In futute, we may want to add optional list of features, that are deemed as triggering label change 
-	//ref ecore.EAttribute[*] features;
-
-	@genmodel(documentation="Expression to produce regular label value. Evaluated in the context of the owning mapEntry.domainMetaElement")
-	val ValueExpression[1] viewExpression;
-	@genmodel(documentation="Optional expression to produce editable string representation of the label. If not set, viewExpression is used.")
-	val ValueExpression[?] editExpression;
-	@genmodel(documentation="Boolean expression in a string context, which able to tell whether user-entered text is valid.")
-	val Constraint[?] validateExpression;
-}
-
-//////////////
-// Constraints
-//
-
-@genmodel(documentation="Boolean type value expression which is to be evaluated in a context")
-@constraintsMeta(def="Constraint")
-class Constraint extends ValueExpression {
-}
-
-@genmodel(documentation="Groups constraints on the link source and target end")
-@constraints(ocl="not (sourceEnd.oclIsUndefined() and targetEnd.oclIsUndefined())", description="Either 'sourceEnd' or 'targetEnd' constraint must be specified")
-class LinkConstraints {
-
-	@genmodel(documentation="References the link mapping restricted by these constraints")
-	readonly !resolve ref LinkMapping[1]#creationConstraints linkMapping;
-
-  @genmodel(documentation="Restriction enforced by the the source end, may reference variable 'oppositeEnd' pointing to targetEnd domainMetaElement instance if available.")
-  @constraintsMeta(def="context", ocl="let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif")
-  @constraintsMeta(def="variable", name="oppositeEnd", type.ocl="linkMapping.linkMetaFeature.eType")
-  val Constraint sourceEnd;
-
-  @genmodel(documentation="Restriction enforced by the the target end, may reference variable 'oppositeEnd' pointing to sourceEnd domainMetaElement instance.")
-  @constraintsMeta(def="context", ocl="linkMapping.linkMetaFeature.eType.oclAsType(ecore::EClass)")
-  @constraintsMeta(def="variable", name="oppositeEnd", type.ocl="let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif")
-  val Constraint targetEnd;
-}
-
-@constraintsMeta(def="ValueSpec")
-@genmodel(documentation="Expression as a textual statement which results in a value when evaluated in a context")
-class ValueExpression {
-	@genmodel(documentation="The text of the expression")
-	@constraintsMeta(def="body")
-	attr String[1] body;
-	@genmodel(documentation="Specifies the language in which the expression is stated")
-	attr Language[1] language = "ocl";
-	@constraintsMeta(def="lang")
-	readonly volatile transient derived attr String langName;	
-}
-@genmodel(documentation="Base class for initializers of domain model elements")
-abstract interface ElementInitializer {
-	@genmodel(documentation="The 'MappingEntry' whose domain model element is to be intialized by this initializer")
-	readonly volatile transient ref MappingEntry[1] mappingEntry;  
-}
-
-@genmodel(documentation="Feature sequence initializer to initialize a sequence of features")
-class FeatureSeqInitializer extends ElementInitializer {
-	@genmodel(documentation="Value specifications as initializers for individual features which should be initialized in the order given by this list")
-	val FeatureInitializer[+]#featureSeqInitializer initializers;
-	@constraints(ocl="not creatingInitializer.feature.oclIsUndefined() implies creatingInitializer.feature.oclAsType(ecore::EReference).eReferenceType.isSuperTypeOf(elementClass)", description="'elementClass' must be the same as or sub-type of the containing 'GenReferenceNewElementSpec' reference type")
-	@constraints(ocl="not creatingInitializer.feature.oclIsUndefined() implies not (elementClass.interface or elementClass.abstract)", description="'elementClass' must be a concrete EClass which is the same or sub-type of the containing 'GenReferenceNewElementSpec' reference type")
-	ref ecore.EClass elementClass;
-	readonly !resolve ref ReferenceNewElementSpec#newElementInitializers creatingInitializer;
-}
-
-abstract class FeatureInitializer {
-	@GenModel(documentation="The feature for which is to be initialized by this initializer")
-	@constraints(ocl="feature <> null implies not featureSeqInitializer.initializers->exists(i| i <> self and i.feature = self.feature)", description="The feature is already initialized by another 'FeatureInitializer' in the sequence")
-	@constraints(ocl="feature <> null implies feature.eContainingClass.isSuperTypeOf(featureSeqInitializer.elementClass)", description="The 'feature' of 'FeatureInitializer' must be available in 'Meta Class' of the initialized element")
-	@constraints(ocl="feature <> null implies feature.changeable", description="The 'feature' of 'FeatureInitializer' must be changeable")	
-	ref ecore.EStructuralFeature[1] feature;
-	readonly !resolve ref FeatureSeqInitializer[1]#initializers featureSeqInitializer;
-}
-
-@genmodel(documentation="Value specification associated with a specific feature")
-
-class FeatureValueSpec extends FeatureInitializer {
-	@constraintsMeta(def="context", ocl="featureSeqInitializer.elementClass")
-	@constraintsMeta(def="type", ocl="feature")
-	val ValueExpression[1] value;
-}
-
-@constraints(ocl="feature.many = false implies not (newElementInitializers->size() > 1)", description="FeatureInitializer for single element EReference can't contain multiple element initializers")
-@constraints(ocl="let r: ecore::EReference = feature.oclAsType(ecore::EReference) in feature <> null implies r.containment", description="'feature' of 'ReferenceNewElementSpec' must refer to containment ecore::EReference")
-class ReferenceNewElementSpec extends FeatureInitializer {
-	val FeatureSeqInitializer[+]#creatingInitializer newElementInitializers;
-}
-
-
-/////////////////////////
-// Tooling Aspects/Facets
-//
-
-abstract interface MenuOwner {
-	ref tooldef.ContextMenu contextMenu;
-}
-
-abstract interface ToolOwner {
-	// constraint: canvasMapping.palette contains this tool
-	@genmodel(documentation="Way to create this element")
-	ref tooldef.AbstractTool tool;
-}
-
-abstract interface AppearanceSteward {
-	ref tooldef.StyleSelector appearanceStyle;
-}
-
-/////////
-// Audits
-//
-
-@genmodel(documentation="Container for audit rules representing a hierarchical organization of audits in the constraint category hierarchy of emft.validation framework")
-class AuditContainer {
-	@genmodel(documentation="Identifier which is unique within the scope of its parent container.")
-	@constraints(ocl="not parentContainer.oclIsUndefined() implies parentContainer.childContainers->one(i | i.id = self.id)", description="Audit container with the same ID already exists")	
-	attr String[1] ~id;
-
-	@genmodel(documentation="A human readable name for the category of audits organized in this container")
-	attr String name;
-	@genmodel(documentation="The detailed description of this audit container")
-	attr String description;
-
-	ref AuditContainer#childContainers parentContainer;
-
-	@genmodel(documentation="The audit rules organized in this container")
-	val AuditRule[*]#container audits;
-	val AuditContainer[*]#parentContainer childContainers;
-}
-
-@GenModel(documentation="Base class for rule like audit, metric rules...")
-abstract interface RuleBase {
-	@GenModel(documentation="A human readable name of this rule")
-	attr String name;
-
-	@GenModel(documentation="The detailed description of this rule semantics")
-	attr String description;
-}
-
-class AuditRule extends RuleBase {
-	@genmodel(documentation="Unique identifier of this audit rule")
-	@constraints(ocl="not id.oclIsUndefined() implies container.audits->one(i | i.id = self.id)", description="Audit rule with the same ID already exists")	
-	attr String[1] ~id;
-
-	@genmodel(documentation="A boolean type condition which if not satisfied indicates this audit rule violation. It is evaluated in the context of the target")
-	@constraintsMeta(def="context", "ref"="target")
-	val Constraint[1] rule;
-
-	@GenModel(documentation="The target representing the context this audit is evaluated in")
-	val Auditable[1]#rule target;
-
-	@genmodel(documentation="Describes the severity of this audit rule violation")
-	attr Severity severity = "ERROR";
-
-	@genmodel(documentation="Indicates if this audit should be evaluated also in Live mode. If 'false', only Batch mode is applicable")
-	attr boolean useInLiveMode = false;
-
-	@genmodel(documentation="The text message to be reported in case of this audit violation")
-	attr String message;
-
-	@genmodel(documentation="The containing audit container of this audit rule")
-	ref AuditContainer[1]#audits container;
-}
-
-@GenModel(documentation="Target for rules applied on domain model elements")
-@constraintsMeta(def="context", ocl="element")
-class DomainElementTarget extends Auditable, Measurable {
-
-	@GenModel(documentation="Targeted domain model element")
-	ref ecore.EClass[1] element;
-}
-
-@GenModel(documentation="Represents value based target, useful for audit rules expression not capable of ecore meta-model access")
-@constraintsMeta(def="context", ocl="attribute.eType")
-class DomainAttributeTarget extends Auditable {
-
-  @GenModel(documentation="The attribute the value of which is used as context in audit rule defining this target")
-  ref ecore.EAttribute[1] attribute;
-
-  @GenModel(documentation="Indicates whether null value of the attribute is reported as audit failure or success")
-  attr boolean nullAsError;
-}
-
-@GenModel(documentation="Target for rules applied on diagram notation model selectively, for specific visualized element")
-@constraintsMeta(def="context", ocl="if element.oclIsKindOf(NodeMapping) then 'notation::Node' else 'notation::Edge' endif")
-class DiagramElementTarget extends Auditable, Measurable {
-
-	@GenModel(documentation="Targeted visualized element")
-	ref MappingEntry[1] element;
-}
-
-@GenModel(documentation="Target for rules applied on diagram notation model elements")
-@constraintsMeta(def="context", ocl="element")
-class NotationElementTarget extends Auditable, Measurable {
-
-	@GenModel(documentation="Targeted diagram notation model element")
-	@constraints(ocl="element.eAllSuperTypes->including(element)->one(ePackage.name = 'notation' and name = 'View')", description="'notation::View' or its sub-class must be set to NotationElement target")
-	ref ecore.EClass[1] element;
-}
-
-class MetricContainer {
-	val MetricRule[+]#container metrics;
-}
-
-@constraints(ocl="not lowLimit.oclIsUndefined() and not highLimit.oclIsUndefined()  implies lowLimit < highLimit", description="Metric value 'lowLimit' must be smaller then 'highLimit'")
-class MetricRule extends RuleBase {
-
-	@GenModel(documentation="Unique key identifying this metric an abbreviation for this metric")
-	@constraints(ocl="not key.oclIsUndefined() implies container.metrics->one(i | i.key = self.key)", description="Metric rule with the same 'key' already exists")	
-	attr String[1] key;
-
-	@GenModel(documentation="Expression that calculates the value of this metric which is of EDataType that encapsulates java.lang.Number subclasses or their primitives")
-	@constraintsMeta(def="context", "ref"="target")
-	@constraintsMeta(def="type", ocl="'ecore::EDoubleObject'")
-	val ValueExpression[1] rule;
-
-	@GenModel(documentation="The target representing the context this metric is evaluated in")
-	val Measurable[1] target;
-
-	@GenModel(documentation="The lowest acceptable value of the rule expression result")
-	attr Double lowLimit;
-	@GenModel(documentation="The highest acceptable value of the rule expression result")
-	attr Double highLimit;
-
-	@GenModel(documentation="The containing metric container of this metric rule")
-	ref MetricContainer[1]#metrics container;
-}
-
-@GenModel(documentation="Target metric which can be evaluated by audit rule. The target context here is the metric rule resulting type classifier")
-@constraintsMeta(def="context", ocl="'ecore::EDoubleObject'")
-class AuditedMetricTarget extends Auditable {
-
-	@GenModel(documentation="Metric which can be checked by audit")
-	ref MetricRule[1] metric;
-}
-
-@GenModel(documentation="Target suitable for auditing")
-abstract interface Auditable {
-}
-
-@GenModel(documentation="Marker interface for anything that can be subject to metrics")
-abstract interface Measurable {
-}
-
-enum Severity {
-	INFO = 0;
-	WARNING = 1;
-	ERROR = 2;
-}
-
-enum Language {
-	ocl = 0;
-	java = 1;
-	regexp = 2;
-	nregexp = 3;
-	literal = 4;
-}
-
-class VisualEffectMapping {
-   	ref gmfgraph.Pin[1] diagramPin;
- 	attr String oclExpression;
- 	
- 	readonly ref MappingEntry[1]#visualEffects parentMapEntry;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.genmodel b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.genmodel
deleted file mode 100644
index 963fcc45329..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap.genmodel
+++ /dev/null
@@ -1,234 +0,0 @@
-<?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" modelDirectory="/org.eclipse.papyrus.gmf.map/src"
-    editorDirectory="/org.eclipse.papyrus.gmf.map.edit/src" modelPluginID="org.eclipse.papyrus.gmf.map"
-    modelName="GMFMap" editorPluginClass="org.eclipse.papyrus.gmf.mappings.provider.GMFMapEditPlugin"
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" usedGenPackages="../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.genmodel#//gmfgraph ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.genmodel#//tooldef platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">
-  <foreignModel>gmfmap.ecore</foreignModel>
-  <foreignModel>../../../plugin/org.eclipse.emf.ecore/model/Ecore.ecore</foreignModel>
-  <genPackages prefix="GMFMap" basePackage="org.eclipse.gmf" disposableProviderFactory="true"
-      literalsInterface="false" ecorePackage="gmfmap.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="gmfmap.ecore#//LabelTextAccessMethod">
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//LabelTextAccessMethod/MESSAGE_FORMAT"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//LabelTextAccessMethod/NATIVE"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//LabelTextAccessMethod/REGEXP"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//LabelTextAccessMethod/PRINTF"/>
-    </genEnums>
-    <genEnums ecoreEnum="gmfmap.ecore#//Severity">
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Severity/INFO"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Severity/WARNING"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Severity/ERROR"/>
-    </genEnums>
-    <genEnums ecoreEnum="gmfmap.ecore#//Language">
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/ocl"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/java"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/regexp"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/nregexp"/>
-      <genEnumLiterals ecoreEnumLiteral="gmfmap.ecore#//Language/literal"/>
-    </genEnums>
-    <genClasses ecoreClass="gmfmap.ecore#//Mapping">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//Mapping/nodes"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//Mapping/links"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//Mapping/diagram"/>
-      <genFeatures property="None" children="true" createChild="true" propertyCategory=""
-          ecoreFeature="ecore:EReference gmfmap.ecore#//Mapping/appearanceStyles"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//Mapping/audits"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//Mapping/metrics"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="gmfmap.ecore#//MappingEntry">
-      <genFeatures notify="false" createChild="false" propertyCategory="Domain meta information"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/domainMetaElement"/>
-      <genFeatures property="None" children="true" createChild="true" propertyCategory="Domain meta information"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/domainSpecialization"/>
-      <genFeatures property="None" children="true" createChild="true" propertyCategory="Domain meta information"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/domainInitializer"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/labelMappings"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/relatedDiagrams"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MappingEntry/visualEffects"/>
-      <genOperations ecoreOperation="gmfmap.ecore#//MappingEntry/getDomainContext"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//NeedsContainment">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//NeedsContainment/containmentFeature"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="gmfmap.ecore#//NodeReference">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//NodeReference/childrenFeature"/>
-      <genFeatures property="Readonly" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//NodeReference/child"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//ChildReference">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/parentNode"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/compartment"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/ownedChild"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//ChildReference/referencedChild"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//TopNodeReference">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//TopNodeReference/ownedChild"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//NodeMapping">
-      <genFeatures notify="false" createChild="false" propertyCategory="Visual representation"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//NodeMapping/diagramNode"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//NodeMapping/children"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//NodeMapping/compartments"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//CompartmentMapping">
-      <genFeatures notify="false" createChild="false" propertyCategory="Visual representation"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//CompartmentMapping/compartment"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//CompartmentMapping/parentNode"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//CompartmentMapping/children"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//LinkMapping">
-      <genFeatures notify="false" createChild="false" propertyCategory="Visual representation"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//LinkMapping/diagramLink"/>
-      <genFeatures notify="false" createChild="false" propertyCategory="Domain meta information"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//LinkMapping/sourceMetaFeature"/>
-      <genFeatures notify="false" createChild="false" propertyCategory="Domain meta information"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//LinkMapping/linkMetaFeature"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//LinkMapping/creationConstraints"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//CanvasMapping">
-      <genFeatures notify="false" createChild="false" propertyCategory="Visual representation"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//CanvasMapping/diagramCanvas"/>
-      <genFeatures notify="false" createChild="false" propertyCategory="Domain meta information"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//CanvasMapping/domainModel"/>
-      <genFeatures notify="false" createChild="false" propertyCategory="Domain meta information"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//CanvasMapping/domainMetaElement"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//CanvasMapping/palette"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//CanvasMapping/menuContributions"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//CanvasMapping/toolbarContributions"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//LabelMapping">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//LabelMapping/diagramLabel"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//LabelMapping/readOnly"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//LabelMapping/mapEntry"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//FeatureLabelMapping">
-      <genFeatures notify="false" createChild="false" propertyCategory="Domain meta information"
-          propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//FeatureLabelMapping/features"/>
-      <genFeatures notify="false" createChild="false" propertyCategory="Domain meta information"
-          propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//FeatureLabelMapping/editableFeatures"/>
-      <genFeatures createChild="false" propertyCategory="Visual representation" propertyDescription="Pattern to produce label on diagram, depends on view method"
-          ecoreFeature="ecore:EAttribute gmfmap.ecore#//FeatureLabelMapping/viewPattern"/>
-      <genFeatures createChild="false" propertyCategory="Visual representation" propertyDescription="Pattern to produce text for in-place editor, depends on view method; if not specified then viewPattern should be used"
-          ecoreFeature="ecore:EAttribute gmfmap.ecore#//FeatureLabelMapping/editorPattern"/>
-      <genFeatures createChild="false" propertyCategory="Visual representation" propertyDescription="Pattern to extract values from input text, depends on edit method; if not specified then viewPattern should be used"
-          ecoreFeature="ecore:EAttribute gmfmap.ecore#//FeatureLabelMapping/editPattern"/>
-      <genFeatures createChild="false" propertyCategory="Visual representation" ecoreFeature="ecore:EAttribute gmfmap.ecore#//FeatureLabelMapping/viewMethod"/>
-      <genFeatures createChild="false" propertyCategory="Visual representation" ecoreFeature="ecore:EAttribute gmfmap.ecore#//FeatureLabelMapping/editMethod"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//OclChoiceLabelMapping">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//OclChoiceLabelMapping/feature"/>
-      <genFeatures children="true" createChild="true" propertyCategory="Visual representation"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//OclChoiceLabelMapping/itemsExpression"/>
-      <genFeatures children="true" createChild="true" propertyCategory="Visual representation"
-          propertyDescription="" ecoreFeature="ecore:EReference gmfmap.ecore#//OclChoiceLabelMapping/showExpression"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//DesignLabelMapping"/>
-    <genClasses ecoreClass="gmfmap.ecore#//ExpressionLabelMapping">
-      <genFeatures children="true" createChild="true" propertyCategory="Visual representation"
-          propertyDescription="Expression to produce regular label value. Evaluated in the context of the owning mapEntry.domainMetaElement"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//ExpressionLabelMapping/viewExpression"/>
-      <genFeatures property="None" children="true" createChild="true" propertyCategory="Visual representation"
-          propertyDescription="Optional expression to produce editable string representation of the label. If not set, viewExpression is used"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//ExpressionLabelMapping/editExpression"/>
-      <genFeatures property="None" children="true" createChild="true" propertyCategory="Visual representation"
-          propertyDescription="Boolean expression in a string context, which able to tell whether user-entered text is valid"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//ExpressionLabelMapping/validateExpression"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//Constraint" labelFeature="#//mappings/ValueExpression/body"/>
-    <genClasses ecoreClass="gmfmap.ecore#//LinkConstraints">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//LinkConstraints/linkMapping"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//LinkConstraints/sourceEnd"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//LinkConstraints/targetEnd"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//ValueExpression" labelFeature="#//mappings/ValueExpression/body">
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute gmfmap.ecore#//ValueExpression/body"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//ValueExpression/language"/>
-      <genFeatures property="None" createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//ValueExpression/langName"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//ElementInitializer">
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//ElementInitializer/mappingEntry"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//FeatureSeqInitializer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//FeatureSeqInitializer/initializers"/>
-      <genFeatures createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//FeatureSeqInitializer/elementClass"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//FeatureSeqInitializer/creatingInitializer"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//FeatureInitializer">
-      <genFeatures createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//FeatureInitializer/feature"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//FeatureInitializer/featureSeqInitializer"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//FeatureValueSpec">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//FeatureValueSpec/value"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//ReferenceNewElementSpec">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//ReferenceNewElementSpec/newElementInitializers"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//MenuOwner">
-      <genFeatures notify="false" createChild="false" propertyCategory="Visual representation"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//MenuOwner/contextMenu"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//ToolOwner">
-      <genFeatures notify="false" createChild="false" propertyCategory="Visual representation"
-          propertyDescription="" ecoreFeature="ecore:EReference gmfmap.ecore#//ToolOwner/tool"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//AppearanceSteward">
-      <genFeatures notify="false" createChild="false" propertyCategory="Visual representation"
-          ecoreFeature="ecore:EReference gmfmap.ecore#//AppearanceSteward/appearanceStyle"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//AuditContainer">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//AuditContainer/id"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//AuditContainer/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//AuditContainer/description"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//AuditContainer/parentContainer"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//AuditContainer/audits"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//AuditContainer/childContainers"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//RuleBase">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//RuleBase/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//RuleBase/description"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//AuditRule">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//AuditRule/id"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//AuditRule/rule"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//AuditRule/target"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//AuditRule/severity"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//AuditRule/useInLiveMode"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//AuditRule/message"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//AuditRule/container"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//DomainElementTarget">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//DomainElementTarget/element"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//DomainAttributeTarget">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//DomainAttributeTarget/attribute"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//DomainAttributeTarget/nullAsError"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//DiagramElementTarget">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//DiagramElementTarget/element"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//NotationElementTarget">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//NotationElementTarget/element"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//MetricContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MetricContainer/metrics"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//MetricRule">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//MetricRule/key"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MetricRule/rule"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference gmfmap.ecore#//MetricRule/target"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//MetricRule/lowLimit"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfmap.ecore#//MetricRule/highLimit"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//MetricRule/container"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//AuditedMetricTarget">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//AuditedMetricTarget/metric"/>
-    </genClasses>
-    <genClasses ecoreClass="gmfmap.ecore#//Auditable"/>
-    <genClasses ecoreClass="gmfmap.ecore#//Measurable"/>
-    <genClasses ecoreClass="gmfmap.ecore#//VisualEffectMapping">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfmap.ecore#//VisualEffectMapping/diagramPin"/>
-      <genFeatures createChild="false" propertyMultiLine="true" ecoreFeature="ecore:EAttribute gmfmap.ecore#//VisualEffectMapping/oclExpression"/>
-      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference gmfmap.ecore#//VisualEffectMapping/parentMapEntry"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap_2007.ecore b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap_2007.ecore
deleted file mode 100644
index 01e76ff1654..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/models/gmfmap_2007.ecore
+++ /dev/null
@@ -1,690 +0,0 @@
-<?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="mappings"
-    nsURI="http://www.eclipse.org/gmf/2006/mappings" nsPrefix="gmfmap">
-  <eAnnotations source="http://www.eclipse.org/emf/2004/EmfaticAnnotationMap">
-    <details key="constraints" value="http://www.eclipse.org/gmf/2005/constraints"/>
-    <details key="constraintsMeta" value="http://www.eclipse.org/gmf/2005/constraints/meta"/>
-  </eAnnotations>
-  <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-    <details key="import" value="http://www.eclipse.org/gmf/runtime/1.0.0/notation"/>
-  </eAnnotations>
-  <eClassifiers xsi:type="ecore:EClass" name="Mapping">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="nodes->forAll(n|n.containmentFeature.oclIsUndefined() and not n.child.domainMetaElement.oclIsUndefined() implies links->exists(let r:ecore::EReference= linkMetaFeature.oclAsType(ecore::EReference) in r.containment and r.eReferenceType.isSuperTypeOf(n.child.domainMetaElement)))"/>
-      <details key="description" value="Phantom nodes that are not targeted by a link mapping exist"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="nodes" upperBound="-1"
-        eType="#//TopNodeReference" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="links" upperBound="-1"
-        eType="#//LinkMapping" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagram" lowerBound="1"
-        eType="#//CanvasMapping" containment="true" resolveProxies="false"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="appearanceStyles" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//StyleSelector"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="audits" eType="#//AuditContainer"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="metrics" eType="#//MetricContainer"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MappingEntry" abstract="true">
-    <eOperations name="getDomainContext" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="This method simplifies OCL expressions (makes it easy to write for both Node and Link)."/>
-      </eAnnotations>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainMetaElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainSpecialization" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specializes further the domain meta element EClass associated with this mapping and should be evaluated in this EClass context"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ocl" value="self.getDomainContext()"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not domainSpecialization.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()"/>
-        <details key="description" value="Using 'Domain Specialization' requires 'Domain Meta Element' to be set"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainInitializer" eType="#//ElementInitializer"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Initializer for the domain model element associated with mapping"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not domainInitializer.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()"/>
-        <details key="description" value="'Domain Element' must be set in mapping with 'Element Initializers'"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="labelMappings" upperBound="-1"
-        eType="#//LabelMapping" containment="true" eOpposite="#//LabelMapping/mapEntry"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="relatedDiagrams" upperBound="-1"
-        eType="#//CanvasMapping">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Diagrams that may be associated with this diagram element. It's up to client application to define what this association means (e.g. open diagram)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NeedsContainment" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="containmentFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not containmentFeature.oclIsUndefined() implies containmentFeature.containment"/>
-        <details key="description" value="Containment EReference expected"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeReference" abstract="true" eSuperTypes="#//NeedsContainment">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not containmentFeature.oclIsUndefined() implies containmentFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)"/>
-      <details key="description" value="'Containment Feature' must reference the same class or super type of 'Domain Meta Element' of the referenced node"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childrenFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EReference">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not childrenFeature.oclIsUndefined() implies childrenFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)"/>
-        <details key="description" value="'Children Feature' must reference the same class or super type of 'Domain Meta Element' of the referenced node"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="child" eType="#//NodeMapping"
-        changeable="false" volatile="true" transient="true" unsettable="true" derived="true"
-        resolveProxies="false"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ChildReference" eSuperTypes="#//NodeReference">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not (ownedChild.oclIsUndefined() and referencedChild.oclIsUndefined())"/>
-      <details key="description" value="Either 'ownedChild' or 'referencedChild' NodeMapping must be set"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not childrenFeature.oclIsUndefined() implies childrenFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)"/>
-      <details key="description" value="'Children Feature' must be owned by 'Domain Meta Element' or its super type of this reference parent Node Mapping"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not containmentFeature.oclIsUndefined() implies containmentFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)"/>
-      <details key="description" value="'Containment Feature' must be owned by 'Domain Meta Element' or its super type of this reference parent Node Mapping"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()"/>
-      <details key="description" value="ChildReference to NodeMapping with domainElement should define 'containmentFeature'"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in (((child.labelMappings->size() = 1) and child.labelMappings->forAll( soleLabel: LabelMapping | soleLabel.diagramLabel = child.diagramNode)) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))"/>
-      <details key="description" value="Side-affixed children can not be pure labels"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in ((not compartment.oclIsUndefined()) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))"/>
-      <details key="description" value="Side-affixed children can not be placed in compartments"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentNode" lowerBound="1"
-        eType="#//NodeMapping" eOpposite="#//NodeMapping/children"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartment" eType="#//CompartmentMapping"
-        eOpposite="#//CompartmentMapping/children"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedChild" eType="#//NodeMapping"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="referencedChild" eType="#//NodeMapping"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TopNodeReference" eSuperTypes="#//NodeReference">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="ownedChild" lowerBound="1"
-        eType="#//NodeMapping" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NodeMapping" eSuperTypes="#//MappingEntry #//MenuOwner #//ToolOwner #//AppearanceSteward">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Both top-level diagram node and any inner node"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramNode" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Node"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//ChildReference" containment="true" eOpposite="#//ChildReference/parentNode"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartments" upperBound="-1"
-        eType="#//CompartmentMapping" containment="true" eOpposite="#//CompartmentMapping/parentNode"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CompartmentMapping">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="compartment" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Compartment"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentNode" lowerBound="1"
-        eType="#//NodeMapping" changeable="false" eOpposite="#//NodeMapping/compartments"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="children" upperBound="-1"
-        eType="#//ChildReference" eOpposite="#//ChildReference/compartment"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LinkMapping" eSuperTypes="#//MappingEntry #//NeedsContainment #//MenuOwner #//ToolOwner #//AppearanceSteward">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Connection element"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="domainMetaElement.oclIsUndefined() implies containmentFeature.oclIsUndefined() and sourceMetaFeature.oclIsUndefined()"/>
-      <details key="description" value="Link mapping without 'Domain Element' class does not use 'Containment Feature' and 'Source Feature'"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not domainMetaElement.oclIsUndefined()  implies containmentFeature.eReferenceType.isSuperTypeOf(domainMetaElement)"/>
-      <details key="description" value="'Containment Feature' must reference the same class or super type of 'Domain Element' EClass"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramLink" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Connection"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceMetaFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not domainMetaElement.oclIsUndefined() implies sourceMetaFeature.oclIsUndefined() or sourceMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)"/>
-        <details key="description" value="'Source Feature' must be owned by the link 'Domain Element' or its super type"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkMetaFeature" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not(domainMetaElement.oclIsUndefined() or linkMetaFeature.oclIsUndefined()) implies linkMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)"/>
-        <details key="description" value="'Target Feature' must be owned by the link 'Domain Element' or its super type"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="creationConstraints" eType="#//LinkConstraints"
-        containment="true" eOpposite="#//LinkConstraints/linkMapping">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies additional restrictions on link creation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CanvasMapping">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramCanvas" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//Canvas"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainModel" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EPackage"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="domainMetaElement" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not domainMetaElement.oclIsUndefined() implies not(domainMetaElement.abstract or domainMetaElement.interface)"/>
-        <details key="description" value="Top-level diagram container must be concrete"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="palette" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//Palette"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="menuContributions" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//MainMenu"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="toolbarContributions" upperBound="-1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//Toolbar"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LabelMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Label definition; text is taken from the graph model; no editing support; user may contribute custom parser"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="diagramLabel" lowerBound="1"
-        eType="ecore:EClass ../../org.eclipse.papyrus.gmf.graphdef/models/gmfgraph.ecore#//DiagramLabel"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mapEntry" lowerBound="1"
-        eType="#//MappingEntry" changeable="false" eOpposite="#//MappingEntry/labelMappings"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureLabelMapping" eSuperTypes="#//LabelMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Label based on feature(s) from domain model"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="features" lowerBound="1"
-        upperBound="-1" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="features->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))"/>
-        <details key="description" value="Label attributes must be available in 'Domain Element' EClass of the labeled mapping entry"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Pattern to produce label on diagram, depends on view method"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editorPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Pattern to produce text for inplace editor, depends on view method; if not specified then viewPattern should be used"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editPattern" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Pattern to extract values from input text, depends on edit method; if not specified then viewPattern should be used"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="viewMethod" eType="#//LabelTextAccessMethod"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="editMethod" eType="#//LabelTextAccessMethod"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="LabelTextAccessMethod">
-    <eLiterals name="MESSAGE_FORMAT"/>
-    <eLiterals name="NATIVE" value="1"/>
-    <eLiterals name="REGEXP" value="2"/>
-    <eLiterals name="PRINTF" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DesignLabelMapping" eSuperTypes="#//LabelMapping">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Label based on DescriptionStyle from notation model"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Constraint" eSuperTypes="#//ValueExpression">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Boolean type value expression which is to be evaluated in a context"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="Constraint"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="LinkConstraints">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Groups constraints on the link source and target end"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not (sourceEnd.oclIsUndefined() and targetEnd.oclIsUndefined())"/>
-      <details key="description" value="Either 'sourceEnd' or 'targetEnd' constraint must be specified"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="linkMapping" lowerBound="1"
-        eType="#//LinkMapping" changeable="false" eOpposite="#//LinkMapping/creationConstraints">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="References the link mapping restricted by these constraints"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sourceEnd" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Restriction enforced by the the source end, may reference variable 'oppositeEnd' pointing to targetEnd domainMetaElement instance if available."/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ocl" value="let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="variable"/>
-        <details key="name" value="oppositeEnd"/>
-        <details key="type.ocl" value="linkMapping.linkMetaFeature.eType"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="targetEnd" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Restriction enforced by the the target end, may reference variable 'oppositeEnd' pointing to sourceEnd domainMetaElement instance."/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ocl" value="linkMapping.linkMetaFeature.eType.oclAsType(ecore::EClass)"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="variable"/>
-        <details key="name" value="oppositeEnd"/>
-        <details key="type.ocl" value="let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ValueExpression">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="ValueSpec"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Expression as a textual statement which results in a value when evaluated in a context"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="body" 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="The text of the expression"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="body"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="language" lowerBound="1"
-        eType="#//Language" defaultValueLiteral="ocl">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Specifies the language in which the expression is stated"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="langName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        changeable="false" volatile="true" transient="true" derived="true">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="lang"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ElementInitializer" abstract="true"
-      interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Base class for initializers of domain model elements"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="mappingEntry" lowerBound="1"
-        eType="#//MappingEntry" changeable="false" volatile="true" transient="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The 'MappingEntry' whose domain model element is to be intialized by this initializer"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureSeqInitializer" eSuperTypes="#//ElementInitializer">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Feature sequence initializer to initialize a sequence of features"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="initializers" lowerBound="1"
-        upperBound="-1" eType="#//FeatureInitializer" containment="true" eOpposite="#//FeatureInitializer/featureSeqInitializer">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Value specifications as initializers for individual features which should be initialized in the order given by this list"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ocl" value="self.elementClass"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="elementClass" eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not creatingInitializer.feature.oclIsUndefined() implies creatingInitializer.feature.oclAsType(ecore::EReference).eReferenceType.isSuperTypeOf(elementClass)"/>
-        <details key="description" value="'elementClass' must be the same as or sub-type of the containing 'GenReferenceNewElementSpec' reference type"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not creatingInitializer.feature.oclIsUndefined() implies not (elementClass.interface or elementClass.abstract)"/>
-        <details key="description" value="'elementClass' must be a concrete EClass which is the same or sub-type of the containing 'GenReferenceNewElementSpec' reference type"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="creatingInitializer" eType="#//ReferenceNewElementSpec"
-        changeable="false" eOpposite="#//ReferenceNewElementSpec/newElementInitializers"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureInitializer" abstract="true"
-      interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="feature" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The feature for which is to be initialized by this initializer"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature &lt;> null implies not featureSeqInitializer.initializers->exists(i| i &lt;> self and i.feature = self.feature)"/>
-        <details key="description" value="The feature is already initialized by another 'FeatureInitializer' in the sequence"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature &lt;> null implies feature.eContainingClass.isSuperTypeOf(featureSeqInitializer.elementClass)"/>
-        <details key="description" value="The 'feature' of 'FeatureInitializer' must be available in 'Meta Class' of the initialized element"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="feature &lt;> null implies feature.changeable"/>
-        <details key="description" value="The 'feature' of 'FeatureInitializer' must be changeable"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="featureSeqInitializer"
-        lowerBound="1" eType="#//FeatureSeqInitializer" changeable="false" eOpposite="#//FeatureSeqInitializer/initializers"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="FeatureValueSpec" eSuperTypes="#//ValueExpression #//FeatureInitializer">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Value specification associated with a specific feature"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="ValueSpec"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="type"/>
-      <details key="ocl" value="feature"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ReferenceNewElementSpec" eSuperTypes="#//FeatureInitializer">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="feature.many = false implies not (newElementInitializers->size() > 1)"/>
-      <details key="description" value="FeatureInitializer for single element EReference can't contain multiple element initializers"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="let r: ecore::EReference = feature.oclAsType(ecore::EReference) in feature &lt;> null implies r.containment"/>
-      <details key="description" value="'feature' of 'ReferenceNewElementSpec' must refer to containment ecore::EReference"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="newElementInitializers"
-        lowerBound="1" upperBound="-1" eType="#//FeatureSeqInitializer" containment="true"
-        eOpposite="#//FeatureSeqInitializer/creatingInitializer"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MenuOwner" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="contextMenu" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//ContextMenu"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolOwner" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tool" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//AbstractTool">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Way to create this element"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AppearanceSteward" abstract="true" interface="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="appearanceStyle" eType="ecore:EClass ../../org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore#//StyleSelector"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AuditContainer">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Container for audit rules representing a hierarchical organization of audits in the constraint category hierarchy of emft.validation framework"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" 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="Identifier which is unique within the scope of its parent container."/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not parentContainer.oclIsUndefined() implies parentContainer.childContainers->one(i | i.id = self.id)"/>
-        <details key="description" value="Audit container with the same ID already exists"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A human readable name for the category of audits organized in this container"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The detailed description of this audit container"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="parentContainer" eType="#//AuditContainer"
-        eOpposite="#//AuditContainer/childContainers"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="audits" upperBound="-1"
-        eType="#//AuditRule" containment="true" eOpposite="#//AuditRule/container">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The audit rules organized in this container"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="childContainers" upperBound="-1"
-        eType="#//AuditContainer" containment="true" eOpposite="#//AuditContainer/parentContainer"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="RuleBase" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Base class for rule like audit, metric rules..."/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A human readable name of this rule"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The detailed description of this rule semantics"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AuditRule" eSuperTypes="#//RuleBase">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="id" 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="Unique identifier of this audit rule"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not id.oclIsUndefined() implies container.audits->one(i | i.id = self.id)"/>
-        <details key="description" value="Audit rule with the same ID already exists"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//Constraint"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="A boolean type condition which if not satisfied indicates this audit rule violation. It is evaluated in the context of the target"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ref" value="target"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//Auditable" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The target representing the context this audit is evaluated in"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="severity" eType="#//Severity"
-        defaultValueLiteral="ERROR">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Describes the severity of this audit rule violation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="useInLiveMode" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"
-        defaultValueLiteral="false">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Indicates if this audit should be evaluated also in Live mode. If 'false', only Batch mode is applicable"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="message" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The text message to be reported in case of this audit violation"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
-        eType="#//AuditContainer" eOpposite="#//AuditContainer/audits">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The containing audit container of this audit rule"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DomainElementTarget" eSuperTypes="#//Auditable #//Measurable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target for rules applied on domain model elements"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="element"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Targeted domain model element"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DomainAttributeTarget" eSuperTypes="#//Auditable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Represents value based target, useful for audit rules expression not capable of ecore meta-model access"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="attribute.eType"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attribute" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EAttribute">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The attribute the value of which is used as context in audit rule defining this target"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="nullAsError" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Indicates whether null value of the attribute is reported as audit failure or success"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="DiagramElementTarget" eSuperTypes="#//Auditable #//Measurable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target for rules applied on diagram notation model selectively, for specific visualized element"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="if element.oclIsKindOf(NodeMapping) then 'notation::Node' else 'notation::Edge' endif"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="#//MappingEntry">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Targeted visualized element"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="NotationElementTarget" eSuperTypes="#//Auditable #//Measurable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target for rules applied on diagram notation model elements"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="element"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="element" lowerBound="1"
-        eType="ecore:EClass http://www.eclipse.org/emf/2002/Ecore#//EClass">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Targeted diagram notation model element"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="element.eAllSuperTypes->including(element)->one(ePackage.name = 'notation' and name = 'View')"/>
-        <details key="description" value="'notation::View' or its sub-class must be set to NotationElement target"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MetricContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="metrics" lowerBound="1"
-        upperBound="-1" eType="#//MetricRule" containment="true" eOpposite="#//MetricRule/container"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MetricRule" eSuperTypes="#//RuleBase">
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-      <details key="ocl" value="not lowLimit.oclIsUndefined() and not highLimit.oclIsUndefined()  implies lowLimit &lt; highLimit"/>
-      <details key="description" value="Metric value 'lowLimit' must be smaller then 'highLimit'"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" 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="Unique key identifying this metric an abbreviation for this metric"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints">
-        <details key="ocl" value="not key.oclIsUndefined() implies container.metrics->one(i | i.key = self.key)"/>
-        <details key="description" value="Metric rule with the same 'key' already exists"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="rule" lowerBound="1" eType="#//ValueExpression"
-        containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Expression that calculates the value of this metric which is of EDataType that encapsulates java.lang.Number subclasses or their primitives"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="context"/>
-        <details key="ref" value="target"/>
-      </eAnnotations>
-      <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-        <details key="def" value="type"/>
-        <details key="ocl" value="'ecore::EDoubleObject'"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//Measurable" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The target representing the context this metric is evaluated in"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lowLimit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The lowest acceptable value of the rule expression result"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="highLimit" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EDoubleObject">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The highest acceptable value of the rule expression result"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="container" lowerBound="1"
-        eType="#//MetricContainer" eOpposite="#//MetricContainer/metrics">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="The containing metric container of this metric rule"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AuditedMetricTarget" eSuperTypes="#//Auditable">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target metric which can be evaluated by audit rule. The target context here is the metric rule resulting type classifier"/>
-    </eAnnotations>
-    <eAnnotations source="http://www.eclipse.org/gmf/2005/constraints/meta">
-      <details key="def" value="context"/>
-      <details key="ocl" value="'ecore::EDoubleObject'"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="metric" lowerBound="1"
-        eType="#//MetricRule">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Metric which can be checked by audit"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Auditable" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Target suitable for auditing"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Measurable" abstract="true" interface="true">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Marker interface for anything that can be subject to metrics"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Severity">
-    <eLiterals name="INFO"/>
-    <eLiterals name="WARNING" value="1"/>
-    <eLiterals name="ERROR" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="Language">
-    <eLiterals name="ocl"/>
-    <eLiterals name="java" value="1"/>
-    <eLiterals name="regexp" value="2"/>
-    <eLiterals name="nregexp" value="3"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/plugin.properties
deleted file mode 100644
index 9dc29c83887..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/plugin.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-#
-# $Id$
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Papyrus GMF Mapping Model
-providerName = Eclipse Modeling Project
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/plugin.xml
deleted file mode 100644
index a8625d35969..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/plugin.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/gmf/2005/mappings" 
-       class = "org.eclipse.papyrus.gmf.mappings.GMFMapPackage"/> 
-    <package 
-       uri = "http://www.eclipse.org/gmf/2005/mappings/2.0" 
-       class = "org.eclipse.papyrus.gmf.mappings.GMFMapPackage"/> 
-    <package 
-       uri = "http://www.eclipse.org/papyrus/gmf/2020/mappings"
-       class = "org.eclipse.papyrus.gmf.mappings.GMFMapPackage"
-       genModel = "models/gmfmap.genmodel" />
-  </extension>
-
-  <!--extension
-        point="org.eclipse.emf.ecore.dynamic_package">
-     <resource
-           location="models/gmfmap_2007.ecore"
-           uri="http://www.eclipse.org/papyrus/gmf/2020/mappings">
-     </resource>
-  </extension-->
-
-  <extension point="org.eclipse.emf.ecore.extension_parser">
-    <parser type="gmfmap" class="org.eclipse.papyrus.gmf.internal.map.util.GMFMapResource$Factory" />
-  </extension>
-
-  <extension point="org.eclipse.team.core.fileTypes">
-    <fileTypes extension="gmfmap" type="text" />
-  </extension>
-
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/pom.xml
deleted file mode 100644
index 900fe116a69..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.map</artifactId>
-	<version>2.9.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/internal/map/util/GMFMapResource.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/internal/map/util/GMFMapResource.java
deleted file mode 100644
index d115392fbb1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/internal/map/util/GMFMapResource.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:
- *    Borland - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.map.util;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.papyrus.gmf.internal.common.ToolingResourceFactory;
-import org.eclipse.papyrus.gmf.internal.common.migrate.MigrationResource;
-
-public class GMFMapResource extends MigrationResource {
-	public static class Factory extends ToolingResourceFactory {
-		@Override
-		public Resource createResource(URI uri) {
-			return new GMFMapResource(uri);
-		}
-	}
-
-	private GMFMapResource(URI uri) {
-		super(uri);
-	}
-
-	@Override
-	protected org.eclipse.papyrus.gmf.internal.common.migrate.MigrationDelegate createDelegate() {
-		MigrationDelegate migrationHelper = new MigrationDelegate();
-		migrationHelper.init();
-		return migrationHelper;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/internal/map/util/MigrationDelegate.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/internal/map/util/MigrationDelegate.java
deleted file mode 100644
index c5be8e3cb66..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/internal/map/util/MigrationDelegate.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0 which
- * accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors:  Borland - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.map.util;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.internal.common.migrate.MigrationDelegateImpl;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureValueSpec;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.Language;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-
-class MigrationDelegate extends MigrationDelegateImpl {
-	private final Map<LabelMapping, FeatureLabelMapping> myLabelMappingMigrations;
-	private EAttribute myLabelMapping_ViewPattern;
-	private EAttribute myLabelMapping_EditPattern;
-	private EReference myLabelMapping_Features;
-	private EAttribute myFeatureValueSpec_Body;
-	private EAttribute myFeatureValueSpec_Language;
-	
-	MigrationDelegate() {
-		myLabelMappingMigrations = new HashMap<LabelMapping, FeatureLabelMapping>();
-	}
-
-	void init() {
-		//registerNarrowReferenceType(GMFMapPackage.eINSTANCE.getFeatureSeqInitializer_Initializers(), GMFMapPackage.eINSTANCE.getFeatureValueSpec());
-		// -->
-		registerNarrowedAbstractType("FeatureInitializer", GMFMapPackage.eINSTANCE.getFeatureValueSpec());
-		
-		//registerNarrowReferenceType(GMFMapPackage.eINSTANCE.getMappingEntry_LabelMappings(), GMFMapPackage.eINSTANCE.getFeatureLabelMapping());
-		// -->
-		myLabelMapping_Features = EcoreUtil.copy(GMFMapPackage.eINSTANCE.getFeatureLabelMapping_Features());
-		myLabelMapping_ViewPattern = EcoreUtil.copy(GMFMapPackage.eINSTANCE.getFeatureLabelMapping_ViewPattern());
-		myLabelMapping_EditPattern = EcoreUtil.copy(GMFMapPackage.eINSTANCE.getFeatureLabelMapping_EditPattern());
-		{
-			Map<String, EStructuralFeature> renamings = new HashMap<String, EStructuralFeature>();
-			renamings.put(myLabelMapping_ViewPattern.getName(), myLabelMapping_ViewPattern);
-			renamings.put(myLabelMapping_EditPattern.getName(), myLabelMapping_EditPattern);
-			renamings.put(myLabelMapping_Features.getName(), myLabelMapping_Features);
-			registerRenamedAttributes(GMFMapPackage.eINSTANCE.getLabelMapping(), renamings);
-		}
-		
-		myFeatureValueSpec_Body = EcoreUtil.copy(GMFMapPackage.eINSTANCE.getValueExpression_Body());
-		myFeatureValueSpec_Language = EcoreUtil.copy(GMFMapPackage.eINSTANCE.getValueExpression_Language());
-		{
-			Map<String, EStructuralFeature> renamings = new HashMap<String, EStructuralFeature>();
-			renamings.put(myFeatureValueSpec_Body.getName(), myFeatureValueSpec_Body);
-			renamings.put(myFeatureValueSpec_Language.getName(), myFeatureValueSpec_Language);
-			registerRenamedAttributes(GMFMapPackage.eINSTANCE.getFeatureValueSpec(), renamings);
-		}
-	}
-
-	@Override
-	public boolean setValue(EObject object, EStructuralFeature feature, Object value, int position) {
-		if (myLabelMapping_ViewPattern.equals(feature)) {
-			LabelMapping mapping = (LabelMapping) object;
-			String viewPattern = (String) value;
-			FeatureLabelMapping migratedMapping = saveFeatureLabelMappingFor(mapping);
-			migratedMapping.setViewPattern(viewPattern);
-			fireMigrationApplied(true);
-		} else if (myLabelMapping_EditPattern.equals(feature)) {
-			LabelMapping mapping = (LabelMapping) object;
-			String editPattern = (String) value;
-			FeatureLabelMapping migratedMapping = saveFeatureLabelMappingFor(mapping);
-			migratedMapping.setViewPattern(editPattern);
-			fireMigrationApplied(true);
-		} else if (myLabelMapping_Features.equals(feature)) {
-			LabelMapping mapping = (LabelMapping) object;
-			EAttribute attribute = (EAttribute) value;
-			FeatureLabelMapping migratedMapping = saveFeatureLabelMappingFor(mapping);
-			migratedMapping.getFeatures().add(attribute);
-			fireMigrationApplied(true);
-		} else if (myFeatureValueSpec_Body.equals(feature)) {
-			FeatureValueSpec featureRef = (FeatureValueSpec) object;
-			String body = (String) value;
-			ValueExpression constraint = getOrCreateValueExpression(featureRef);
-			constraint.setBody(body);
-			fireMigrationApplied(true);
-		} else if (myFeatureValueSpec_Language.equals(feature)) {
-			FeatureValueSpec featureRef = (FeatureValueSpec) object;
-			ValueExpression constraint = getOrCreateValueExpression(featureRef);
-			Language lang = Language.get((String) value);
-			constraint.setLanguage(lang);
-			fireMigrationApplied(true);
-		} else {
-			// other cases are would be processed as defaults
-			return super.setValue(object, feature, value, position);
-		}
-		return true;
-	}
-
-	private ValueExpression getOrCreateValueExpression(FeatureValueSpec featureRef) {
-		ValueExpression constraint = featureRef.getValue();
-		if (constraint == null) {
-			constraint = GMFMapFactory.eINSTANCE.createValueExpression();
-			featureRef.setValue(constraint);
-		}
-		return constraint;
-	}
-
-	private FeatureLabelMapping saveFeatureLabelMappingFor(LabelMapping labelMapping) {
-		FeatureLabelMapping migrated = myLabelMappingMigrations.get(labelMapping);
-		if (migrated == null) {
-			migrated = GMFMapFactory.eINSTANCE.createFeatureLabelMapping();
-			myLabelMappingMigrations.put(labelMapping, migrated);
-		}
-		return migrated;
-	}
-	
-	@Override
-	public void preResolve() {
-		for (LabelMapping mapping : myLabelMappingMigrations.keySet()) {
-			FeatureLabelMapping migrated = myLabelMappingMigrations.get(mapping);
-			if (!migrated.getFeatures().isEmpty()) {
-				MappingEntry entry = mapping.getMapEntry();
-				EList<LabelMapping> labelMappings = entry.getLabelMappings();
-				int originalIndex = labelMappings.indexOf(mapping);
-				if (originalIndex != -1) {
-					migrated.setDiagramLabel(mapping.getDiagramLabel());
-					if (mapping.isReadOnly()) {
-						migrated.setReadOnly(true);
-					}
-					labelMappings.set(originalIndex, migrated);
-				}
-			}
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AppearanceSteward.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AppearanceSteward.java
deleted file mode 100644
index 71d9620fc77..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AppearanceSteward.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.tooldef.StyleSelector;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Appearance Steward</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AppearanceSteward#getAppearanceStyle <em>Appearance Style</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAppearanceSteward()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface AppearanceSteward extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Appearance Style</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Appearance Style</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Appearance Style</em>' reference.
-	 * @see #setAppearanceStyle(StyleSelector)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAppearanceSteward_AppearanceStyle()
-	 * @model
-	 * @generated
-	 */
-	StyleSelector getAppearanceStyle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AppearanceSteward#getAppearanceStyle <em>Appearance Style</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Appearance Style</em>' reference.
-	 * @see #getAppearanceStyle()
-	 * @generated
-	 */
-	void setAppearanceStyle(StyleSelector value);
-
-} // AppearanceSteward
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditContainer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditContainer.java
deleted file mode 100644
index 32c5d758cc8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditContainer.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Audit Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Container for audit rules representing a hierarchical organization of audits in the constraint category hierarchy of emft.validation framework
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getParentContainer <em>Parent Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getAudits <em>Audits</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getChildContainers <em>Child Containers</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditContainer()
- * @model
- * @generated
- */
-public interface AuditContainer extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Identifier which is unique within the scope of its parent container.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditContainer_Id()
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not parentContainer.oclIsUndefined() implies parentContainer.childContainers->one(i | i.id = self.id)' description='Audit container with the same ID already exists'"
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A human readable name for the category of audits organized in this container
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditContainer_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The detailed description of this audit container
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditContainer_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Parent Container</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getChildContainers <em>Child Containers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent Container</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent Container</em>' container reference.
-	 * @see #setParentContainer(AuditContainer)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditContainer_ParentContainer()
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getChildContainers
-	 * @model opposite="childContainers" transient="false"
-	 * @generated
-	 */
-	AuditContainer getParentContainer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getParentContainer <em>Parent Container</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Container</em>' container reference.
-	 * @see #getParentContainer()
-	 * @generated
-	 */
-	void setParentContainer(AuditContainer value);
-
-	/**
-	 * Returns the value of the '<em><b>Audits</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.AuditRule}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getContainer <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The audit rules organized in this container
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Audits</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditContainer_Audits()
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule#getContainer
-	 * @model opposite="container" containment="true"
-	 * @generated
-	 */
-	EList<AuditRule> getAudits();
-
-	/**
-	 * Returns the value of the '<em><b>Child Containers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.AuditContainer}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getParentContainer <em>Parent Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Child Containers</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Child Containers</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditContainer_ChildContainers()
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getParentContainer
-	 * @model opposite="parentContainer" containment="true"
-	 * @generated
-	 */
-	EList<AuditContainer> getChildContainers();
-
-} // AuditContainer
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditRule.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditRule.java
deleted file mode 100644
index 62f77b94675..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditRule.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Audit Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getRule <em>Rule</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getSeverity <em>Severity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditRule#isUseInLiveMode <em>Use In Live Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getContainer <em>Container</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditRule()
- * @model
- * @generated
- */
-public interface AuditRule extends RuleBase {
-	/**
-	 * Returns the value of the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Unique identifier of this audit rule
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Id</em>' attribute.
-	 * @see #setId(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditRule_Id()
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not id.oclIsUndefined() implies container.audits->one(i | i.id = self.id)' description='Audit rule with the same ID already exists'"
-	 * @generated
-	 */
-	String getId();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getId <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Id</em>' attribute.
-	 * @see #getId()
-	 * @generated
-	 */
-	void setId(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Rule</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A boolean type condition which if not satisfied indicates this audit rule violation. It is evaluated in the context of the target
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rule</em>' containment reference.
-	 * @see #setRule(Constraint)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditRule_Rule()
-	 * @model containment="true" required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ref='target'"
-	 * @generated
-	 */
-	Constraint getRule();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getRule <em>Rule</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rule</em>' containment reference.
-	 * @see #getRule()
-	 * @generated
-	 */
-	void setRule(Constraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Target</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The target representing the context this audit is evaluated in
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Target</em>' containment reference.
-	 * @see #setTarget(Auditable)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditRule_Target()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Auditable getTarget();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getTarget <em>Target</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' containment reference.
-	 * @see #getTarget()
-	 * @generated
-	 */
-	void setTarget(Auditable value);
-
-	/**
-	 * Returns the value of the '<em><b>Severity</b></em>' attribute.
-	 * The default value is <code>"ERROR"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.mappings.Severity}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Describes the severity of this audit rule violation
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Severity</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.Severity
-	 * @see #setSeverity(Severity)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditRule_Severity()
-	 * @model default="ERROR"
-	 * @generated
-	 */
-	Severity getSeverity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getSeverity <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Severity</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.Severity
-	 * @see #getSeverity()
-	 * @generated
-	 */
-	void setSeverity(Severity value);
-
-	/**
-	 * Returns the value of the '<em><b>Use In Live Mode</b></em>' attribute.
-	 * The default value is <code>"false"</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Indicates if this audit should be evaluated also in Live mode. If 'false', only Batch mode is applicable
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Use In Live Mode</em>' attribute.
-	 * @see #setUseInLiveMode(boolean)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditRule_UseInLiveMode()
-	 * @model default="false"
-	 * @generated
-	 */
-	boolean isUseInLiveMode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#isUseInLiveMode <em>Use In Live Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Use In Live Mode</em>' attribute.
-	 * @see #isUseInLiveMode()
-	 * @generated
-	 */
-	void setUseInLiveMode(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The text message to be reported in case of this audit violation
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Message</em>' attribute.
-	 * @see #setMessage(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditRule_Message()
-	 * @model
-	 * @generated
-	 */
-	String getMessage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getMessage <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Message</em>' attribute.
-	 * @see #getMessage()
-	 * @generated
-	 */
-	void setMessage(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Container</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getAudits <em>Audits</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The containing audit container of this audit rule
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Container</em>' container reference.
-	 * @see #setContainer(AuditContainer)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditRule_Container()
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getAudits
-	 * @model opposite="audits" required="true" transient="false"
-	 * @generated
-	 */
-	AuditContainer getContainer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getContainer <em>Container</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container</em>' container reference.
-	 * @see #getContainer()
-	 * @generated
-	 */
-	void setContainer(AuditContainer value);
-
-} // AuditRule
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Auditable.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Auditable.java
deleted file mode 100644
index 8a9a06d690c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Auditable.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Auditable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Target suitable for auditing
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditable()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Auditable extends EObject {
-} // Auditable
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditedMetricTarget.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditedMetricTarget.java
deleted file mode 100644
index ae674b0810b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/AuditedMetricTarget.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Audited Metric Target</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Target metric which can be evaluated by audit rule. The target context here is the metric rule resulting type classifier
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget#getMetric <em>Metric</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditedMetricTarget()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='\'ecore::EDoubleObject\''"
- * @generated
- */
-public interface AuditedMetricTarget extends Auditable {
-	/**
-	 * Returns the value of the '<em><b>Metric</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Metric which can be checked by audit
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Metric</em>' reference.
-	 * @see #setMetric(MetricRule)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getAuditedMetricTarget_Metric()
-	 * @model required="true"
-	 * @generated
-	 */
-	MetricRule getMetric();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget#getMetric <em>Metric</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Metric</em>' reference.
-	 * @see #getMetric()
-	 * @generated
-	 */
-	void setMetric(MetricRule value);
-
-} // AuditedMetricTarget
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/CanvasMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/CanvasMapping.java
deleted file mode 100644
index f56edd4ab52..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/CanvasMapping.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.tooldef.MainMenu;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.Toolbar;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Canvas Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDiagramCanvas <em>Diagram Canvas</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDomainModel <em>Domain Model</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDomainMetaElement <em>Domain Meta Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getPalette <em>Palette</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getMenuContributions <em>Menu Contributions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getToolbarContributions <em>Toolbar Contributions</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCanvasMapping()
- * @model
- * @generated
- */
-public interface CanvasMapping extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Diagram Canvas</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram Canvas</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram Canvas</em>' reference.
-	 * @see #setDiagramCanvas(Canvas)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCanvasMapping_DiagramCanvas()
-	 * @model required="true"
-	 * @generated
-	 */
-	Canvas getDiagramCanvas();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDiagramCanvas <em>Diagram Canvas</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Diagram Canvas</em>' reference.
-	 * @see #getDiagramCanvas()
-	 * @generated
-	 */
-	void setDiagramCanvas(Canvas value);
-
-	/**
-	 * Returns the value of the '<em><b>Domain Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Domain Model</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Domain Model</em>' reference.
-	 * @see #setDomainModel(EPackage)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCanvasMapping_DomainModel()
-	 * @model
-	 * @generated
-	 */
-	EPackage getDomainModel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDomainModel <em>Domain Model</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Domain Model</em>' reference.
-	 * @see #getDomainModel()
-	 * @generated
-	 */
-	void setDomainModel(EPackage value);
-
-	/**
-	 * Returns the value of the '<em><b>Domain Meta Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Domain Meta Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Domain Meta Element</em>' reference.
-	 * @see #setDomainMetaElement(EClass)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCanvasMapping_DomainMetaElement()
-	 * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not domainMetaElement.oclIsUndefined() implies not(domainMetaElement.abstract or domainMetaElement.interface)' description='Top-level diagram container must be concrete'"
-	 * @generated
-	 */
-	EClass getDomainMetaElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDomainMetaElement <em>Domain Meta Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Domain Meta Element</em>' reference.
-	 * @see #getDomainMetaElement()
-	 * @generated
-	 */
-	void setDomainMetaElement(EClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Palette</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Palette</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Palette</em>' reference.
-	 * @see #setPalette(Palette)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCanvasMapping_Palette()
-	 * @model
-	 * @generated
-	 */
-	Palette getPalette();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getPalette <em>Palette</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Palette</em>' reference.
-	 * @see #getPalette()
-	 * @generated
-	 */
-	void setPalette(Palette value);
-
-	/**
-	 * Returns the value of the '<em><b>Menu Contributions</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.tooldef.MainMenu}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Menu Contributions</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Menu Contributions</em>' reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCanvasMapping_MenuContributions()
-	 * @model
-	 * @generated
-	 */
-	EList<MainMenu> getMenuContributions();
-
-	/**
-	 * Returns the value of the '<em><b>Toolbar Contributions</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.tooldef.Toolbar}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Toolbar Contributions</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Toolbar Contributions</em>' reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCanvasMapping_ToolbarContributions()
-	 * @model
-	 * @generated
-	 */
-	EList<Toolbar> getToolbarContributions();
-
-} // CanvasMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ChildReference.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ChildReference.java
deleted file mode 100644
index e2eddc6a1e0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ChildReference.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Child Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getParentNode <em>Parent Node</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getCompartment <em>Compartment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getOwnedChild <em>Owned Child</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getReferencedChild <em>Referenced Child</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getChildReference()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not (ownedChild.oclIsUndefined() and referencedChild.oclIsUndefined())' description='Either \'ownedChild\' or \'referencedChild\' NodeMapping must be set'"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not childrenFeature.oclIsUndefined() implies childrenFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)' description='\'Children Feature\' must be owned by \'Domain Meta Element\' or its super type of this reference parent Node Mapping'"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not containmentFeature.oclIsUndefined() implies containmentFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)' description='\'Containment Feature\' must be owned by \'Domain Meta Element\' or its super type of this reference parent Node Mapping'"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()' description='ChildReference to NodeMapping with domainElement should define \'containmentFeature\''"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in (((child.labelMappings->size() = 1) and child.labelMappings->forAll( soleLabel: LabelMapping | soleLabel.diagramLabel = child.diagramNode)) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))' description='Side-affixed children can not be pure labels'"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in ((not compartment.oclIsUndefined()) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))' description='Side-affixed children can not be placed in compartments'"
- * @generated
- */
-public interface ChildReference extends NodeReference {
-	/**
-	 * Returns the value of the '<em><b>Parent Node</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent Node</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent Node</em>' container reference.
-	 * @see #setParentNode(NodeMapping)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getChildReference_ParentNode()
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeMapping#getChildren
-	 * @model opposite="children" required="true" transient="false"
-	 * @generated
-	 */
-	NodeMapping getParentNode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getParentNode <em>Parent Node</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Parent Node</em>' container reference.
-	 * @see #getParentNode()
-	 * @generated
-	 */
-	void setParentNode(NodeMapping value);
-
-	/**
-	 * Returns the value of the '<em><b>Compartment</b></em>' reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Compartment</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Compartment</em>' reference.
-	 * @see #setCompartment(CompartmentMapping)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getChildReference_Compartment()
-	 * @see org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getChildren
-	 * @model opposite="children"
-	 * @generated
-	 */
-	CompartmentMapping getCompartment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getCompartment <em>Compartment</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Compartment</em>' reference.
-	 * @see #getCompartment()
-	 * @generated
-	 */
-	void setCompartment(CompartmentMapping value);
-
-	/**
-	 * Returns the value of the '<em><b>Owned Child</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Owned Child</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owned Child</em>' containment reference.
-	 * @see #setOwnedChild(NodeMapping)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getChildReference_OwnedChild()
-	 * @model containment="true"
-	 * @generated
-	 */
-	NodeMapping getOwnedChild();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getOwnedChild <em>Owned Child</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owned Child</em>' containment reference.
-	 * @see #getOwnedChild()
-	 * @generated
-	 */
-	void setOwnedChild(NodeMapping value);
-
-	/**
-	 * Returns the value of the '<em><b>Referenced Child</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Referenced Child</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Referenced Child</em>' reference.
-	 * @see #setReferencedChild(NodeMapping)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getChildReference_ReferencedChild()
-	 * @model
-	 * @generated
-	 */
-	NodeMapping getReferencedChild();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getReferencedChild <em>Referenced Child</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Referenced Child</em>' reference.
-	 * @see #getReferencedChild()
-	 * @generated
-	 */
-	void setReferencedChild(NodeMapping value);
-
-} // ChildReference
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/CompartmentMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/CompartmentMapping.java
deleted file mode 100644
index a39519f91db..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/CompartmentMapping.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Compartment Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getCompartment <em>Compartment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getParentNode <em>Parent Node</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCompartmentMapping()
- * @model
- * @generated
- */
-public interface CompartmentMapping extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Compartment</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Compartment</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Compartment</em>' reference.
-	 * @see #setCompartment(Compartment)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCompartmentMapping_Compartment()
-	 * @model required="true"
-	 * @generated
-	 */
-	Compartment getCompartment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getCompartment <em>Compartment</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Compartment</em>' reference.
-	 * @see #getCompartment()
-	 * @generated
-	 */
-	void setCompartment(Compartment value);
-
-	/**
-	 * Returns the value of the '<em><b>Parent Node</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getCompartments <em>Compartments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent Node</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent Node</em>' container reference.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCompartmentMapping_ParentNode()
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeMapping#getCompartments
-	 * @model opposite="compartments" resolveProxies="false" required="true" transient="false" changeable="false"
-	 * @generated
-	 */
-	NodeMapping getParentNode();
-
-	/**
-	 * Returns the value of the '<em><b>Children</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.ChildReference}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getCompartment <em>Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Children</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Children</em>' reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getCompartmentMapping_Children()
-	 * @see org.eclipse.papyrus.gmf.mappings.ChildReference#getCompartment
-	 * @model opposite="compartment"
-	 * @generated
-	 */
-	EList<ChildReference> getChildren();
-
-} // CompartmentMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Constraint.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Constraint.java
deleted file mode 100644
index ba60a1a64cd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Constraint.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Boolean type value expression which is to be evaluated in a context
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getConstraint()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='Constraint'"
- * @generated
- */
-public interface Constraint extends ValueExpression{
-} // Constraint
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DesignLabelMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DesignLabelMapping.java
deleted file mode 100644
index 50942662cd4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DesignLabelMapping.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Design Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Label based on DescriptionStyle from notation model
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getDesignLabelMapping()
- * @model
- * @generated
- */
-public interface DesignLabelMapping extends LabelMapping {
-} // DesignLabelMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DiagramElementTarget.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DiagramElementTarget.java
deleted file mode 100644
index ca622c959f8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DiagramElementTarget.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Diagram Element Target</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Target for rules applied on diagram notation model selectively, for specific visualized element
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.DiagramElementTarget#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getDiagramElementTarget()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='if element.oclIsKindOf(NodeMapping) then \'notation::Node\' else \'notation::Edge\' endif'"
- * @generated
- */
-public interface DiagramElementTarget extends Auditable, Measurable {
-	/**
-	 * Returns the value of the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Targeted visualized element
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Element</em>' reference.
-	 * @see #setElement(MappingEntry)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getDiagramElementTarget_Element()
-	 * @model required="true"
-	 * @generated
-	 */
-	MappingEntry getElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.DiagramElementTarget#getElement <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element</em>' reference.
-	 * @see #getElement()
-	 * @generated
-	 */
-	void setElement(MappingEntry value);
-
-} // DiagramElementTarget
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DomainAttributeTarget.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DomainAttributeTarget.java
deleted file mode 100644
index 9cb94de0be2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DomainAttributeTarget.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DomainAttributeTarget.java,v 1.2 2006/05/05 17:11:49 ashatalin Exp $
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EAttribute;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Domain Attribute Target</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Represents value based target, useful for audit rules expression not capable of ecore meta-model access
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget#getAttribute <em>Attribute</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget#isNullAsError <em>Null As Error</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getDomainAttributeTarget()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='attribute.eType'"
- * @generated
- */
-public interface DomainAttributeTarget extends Auditable {
-	/**
-	 * Returns the value of the '<em><b>Attribute</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The attribute the value of which is used as context in audit rule defining this target
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Attribute</em>' reference.
-	 * @see #setAttribute(EAttribute)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getDomainAttributeTarget_Attribute()
-	 * @model required="true"
-	 * @generated
-	 */
-	EAttribute getAttribute();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget#getAttribute <em>Attribute</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Attribute</em>' reference.
-	 * @see #getAttribute()
-	 * @generated
-	 */
-	void setAttribute(EAttribute value);
-
-	/**
-	 * Returns the value of the '<em><b>Null As Error</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Indicates whether null value of the attribute is reported as audit failure or success
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Null As Error</em>' attribute.
-	 * @see #setNullAsError(boolean)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getDomainAttributeTarget_NullAsError()
-	 * @model
-	 * @generated
-	 */
-	boolean isNullAsError();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget#isNullAsError <em>Null As Error</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Null As Error</em>' attribute.
-	 * @see #isNullAsError()
-	 * @generated
-	 */
-	void setNullAsError(boolean value);
-
-} // DomainAttributeTarget
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DomainElementTarget.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DomainElementTarget.java
deleted file mode 100644
index de7aee7e1d7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/DomainElementTarget.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Domain Element Target</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Target for rules applied on domain model elements
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.DomainElementTarget#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getDomainElementTarget()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='element'"
- * @generated
- */
-public interface DomainElementTarget extends Auditable, Measurable {
-	/**
-	 * Returns the value of the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Targeted domain model element
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Element</em>' reference.
-	 * @see #setElement(EClass)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getDomainElementTarget_Element()
-	 * @model required="true"
-	 * @generated
-	 */
-	EClass getElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.DomainElementTarget#getElement <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element</em>' reference.
-	 * @see #getElement()
-	 * @generated
-	 */
-	void setElement(EClass value);
-
-} // DomainElementTarget
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ElementInitializer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ElementInitializer.java
deleted file mode 100644
index 63dc7a40e19..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ElementInitializer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Element Initializer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Base class for initializers of domain model elements
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ElementInitializer#getMappingEntry <em>Mapping Entry</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getElementInitializer()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface ElementInitializer extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Mapping Entry</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Mapping Entry</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The 'MappingEntry' whose domain model element is to be intialized by this initializer
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Mapping Entry</em>' reference.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getElementInitializer_MappingEntry()
-	 * @model required="true" transient="true" changeable="false" volatile="true"
-	 * @generated
-	 */
-	MappingEntry getMappingEntry();
-
-} // ElementInitializer
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ExpressionLabelMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ExpressionLabelMapping.java
deleted file mode 100644
index 2cef1847895..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ExpressionLabelMapping.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Expression Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Label based on a calculated value
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getViewExpression <em>View Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getEditExpression <em>Edit Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getValidateExpression <em>Validate Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getExpressionLabelMapping()
- * @model
- * @generated
- */
-public interface ExpressionLabelMapping extends LabelMapping {
-	/**
-	 * Returns the value of the '<em><b>View Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Expression to produce regular label value. Evaluated in the context of the owning mapEntry.domainMetaElement
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>View Expression</em>' containment reference.
-	 * @see #setViewExpression(ValueExpression)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getExpressionLabelMapping_ViewExpression()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	ValueExpression getViewExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getViewExpression <em>View Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>View Expression</em>' containment reference.
-	 * @see #getViewExpression()
-	 * @generated
-	 */
-	void setViewExpression(ValueExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Edit Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Optional expression to produce editable string representation of the label. If not set, viewExpression is used.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Edit Expression</em>' containment reference.
-	 * @see #setEditExpression(ValueExpression)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getExpressionLabelMapping_EditExpression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ValueExpression getEditExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getEditExpression <em>Edit Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Edit Expression</em>' containment reference.
-	 * @see #getEditExpression()
-	 * @generated
-	 */
-	void setEditExpression(ValueExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Validate Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Boolean expression in a string context, which able to tell whether user-entered text is valid.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Validate Expression</em>' containment reference.
-	 * @see #setValidateExpression(Constraint)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getExpressionLabelMapping_ValidateExpression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Constraint getValidateExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getValidateExpression <em>Validate Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Validate Expression</em>' containment reference.
-	 * @see #getValidateExpression()
-	 * @generated
-	 */
-	void setValidateExpression(Constraint value);
-
-} // ExpressionLabelMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureInitializer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureInitializer.java
deleted file mode 100644
index 77f533ae5d8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureInitializer.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: FeatureInitializer.java,v 1.6 2008/04/18 14:43:25 atikhomirov Exp $
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Initializer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeatureSeqInitializer <em>Feature Seq Initializer</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureInitializer()
- * @model abstract="true"
- * @generated
- */
-public interface FeatureInitializer extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The feature for which is to be initialized by this initializer
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Feature</em>' reference.
-	 * @see #setFeature(EStructuralFeature)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureInitializer_Feature()
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='feature <> null implies not featureSeqInitializer.initializers->exists(i| i <> self and i.feature = self.feature)' description='The feature is already initialized by another \'FeatureInitializer\' in the sequence'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='feature <> null implies feature.eContainingClass.isSuperTypeOf(featureSeqInitializer.elementClass)' description='The \'feature\' of \'FeatureInitializer\' must be available in \'Meta Class\' of the initialized element'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='feature <> null implies feature.changeable' description='The \'feature\' of \'FeatureInitializer\' must be changeable'"
-	 * @generated
-	 */
-	EStructuralFeature getFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeature <em>Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Feature</em>' reference.
-	 * @see #getFeature()
-	 * @generated
-	 */
-	void setFeature(EStructuralFeature value);
-
-	/**
-	 * Returns the value of the '<em><b>Feature Seq Initializer</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getInitializers <em>Initializers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Feature Seq Initializer</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Feature Seq Initializer</em>' container reference.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureInitializer_FeatureSeqInitializer()
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getInitializers
-	 * @model opposite="initializers" resolveProxies="false" required="true" transient="false" changeable="false"
-	 * @generated
-	 */
-	FeatureSeqInitializer getFeatureSeqInitializer();
-
-} // FeatureInitializer
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureLabelMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureLabelMapping.java
deleted file mode 100644
index 7b860b2ea5f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureLabelMapping.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Label based on feature(s) from domain model
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getFeatures <em>Features</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditableFeatures <em>Editable Features</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getViewPattern <em>View Pattern</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditorPattern <em>Editor Pattern</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditPattern <em>Edit Pattern</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getViewMethod <em>View Method</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditMethod <em>Edit Method</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureLabelMapping()
- * @model
- * @generated
- */
-public interface FeatureLabelMapping extends LabelMapping {
-	/**
-	 * Returns the value of the '<em><b>Features</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Features</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Features</em>' reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureLabelMapping_Features()
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='features->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))' description='Label attributes must be available in \'Domain Element\' EClass of the labeled mapping entry'"
-	 * @generated
-	 */
-	EList<EAttribute> getFeatures();
-
-	/**
-	 * Returns the value of the '<em><b>Editable Features</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.emf.ecore.EAttribute}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Editable Features</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Editable Features</em>' reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureLabelMapping_EditableFeatures()
-	 * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='editableFeatures->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))' description='Label attributes must be available in \'Domain Element\' EClass of the labeled mapping entry'"
-	 * @generated
-	 */
-	EList<EAttribute> getEditableFeatures();
-
-	/**
-	 * Returns the value of the '<em><b>View Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Pattern to produce label on diagram, depends on view method
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>View Pattern</em>' attribute.
-	 * @see #setViewPattern(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureLabelMapping_ViewPattern()
-	 * @model
-	 * @generated
-	 */
-	String getViewPattern();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getViewPattern <em>View Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>View Pattern</em>' attribute.
-	 * @see #getViewPattern()
-	 * @generated
-	 */
-	void setViewPattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Editor Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Pattern to produce text for inplace editor, depends on view method; if not specified then viewPattern should be used
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Editor Pattern</em>' attribute.
-	 * @see #setEditorPattern(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureLabelMapping_EditorPattern()
-	 * @model
-	 * @generated
-	 */
-	String getEditorPattern();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditorPattern <em>Editor Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Editor Pattern</em>' attribute.
-	 * @see #getEditorPattern()
-	 * @generated
-	 */
-	void setEditorPattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>View Method</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>View Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>View Method</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod
-	 * @see #setViewMethod(LabelTextAccessMethod)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureLabelMapping_ViewMethod()
-	 * @model
-	 * @generated
-	 */
-	LabelTextAccessMethod getViewMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getViewMethod <em>View Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>View Method</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod
-	 * @see #getViewMethod()
-	 * @generated
-	 */
-	void setViewMethod(LabelTextAccessMethod value);
-
-	/**
-	 * Returns the value of the '<em><b>Edit Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Pattern to extract values from input text, depends on edit method; if not specified then viewPattern should be used
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Edit Pattern</em>' attribute.
-	 * @see #setEditPattern(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureLabelMapping_EditPattern()
-	 * @model
-	 * @generated
-	 */
-	String getEditPattern();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditPattern <em>Edit Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Edit Pattern</em>' attribute.
-	 * @see #getEditPattern()
-	 * @generated
-	 */
-	void setEditPattern(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Edit Method</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Edit Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Edit Method</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod
-	 * @see #setEditMethod(LabelTextAccessMethod)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureLabelMapping_EditMethod()
-	 * @model
-	 * @generated
-	 */
-	LabelTextAccessMethod getEditMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditMethod <em>Edit Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Edit Method</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod
-	 * @see #getEditMethod()
-	 * @generated
-	 */
-	void setEditMethod(LabelTextAccessMethod value);
-
-} // FeatureLabelMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureSeqInitializer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureSeqInitializer.java
deleted file mode 100644
index 8efd7042854..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureSeqInitializer.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Seq Initializer</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Feature sequence initializer to initialize a sequence of features
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getInitializers <em>Initializers</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getElementClass <em>Element Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getCreatingInitializer <em>Creating Initializer</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureSeqInitializer()
- * @model
- * @generated
- */
-public interface FeatureSeqInitializer extends ElementInitializer {
-	/**
-	 * Returns the value of the '<em><b>Initializers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeatureSeqInitializer <em>Feature Seq Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Initializers</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Value specifications as initializers for individual features which should be initialized in the order given by this list
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Initializers</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureSeqInitializer_Initializers()
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeatureSeqInitializer
-	 * @model opposite="featureSeqInitializer" containment="true" required="true"
-	 * @generated
-	 */
-	EList<FeatureInitializer> getInitializers();
-
-	/**
-	 * Returns the value of the '<em><b>Element Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Element Class</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Element Class</em>' reference.
-	 * @see #setElementClass(EClass)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureSeqInitializer_ElementClass()
-	 * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not creatingInitializer.feature.oclIsUndefined() implies creatingInitializer.feature.oclAsType(ecore::EReference).eReferenceType.isSuperTypeOf(elementClass)' description='\'elementClass\' must be the same as or sub-type of the containing \'GenReferenceNewElementSpec\' reference type'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not creatingInitializer.feature.oclIsUndefined() implies not (elementClass.interface or elementClass.abstract)' description='\'elementClass\' must be a concrete EClass which is the same or sub-type of the containing \'GenReferenceNewElementSpec\' reference type'"
-	 * @generated
-	 */
-	EClass getElementClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getElementClass <em>Element Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element Class</em>' reference.
-	 * @see #getElementClass()
-	 * @generated
-	 */
-	void setElementClass(EClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Creating Initializer</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec#getNewElementInitializers <em>New Element Initializers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Creating Initializer</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Creating Initializer</em>' container reference.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureSeqInitializer_CreatingInitializer()
-	 * @see org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec#getNewElementInitializers
-	 * @model opposite="newElementInitializers" resolveProxies="false" transient="false" changeable="false"
-	 * @generated
-	 */
-	ReferenceNewElementSpec getCreatingInitializer();
-
-} // FeatureSeqInitializer
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureValueSpec.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureValueSpec.java
deleted file mode 100644
index 57128ab490c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/FeatureValueSpec.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Feature Value Spec</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Value specification associated with a specific feature
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.FeatureValueSpec#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureValueSpec()
- * @model
- * @generated
- */
-public interface FeatureValueSpec extends FeatureInitializer {
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' containment reference.
-	 * @see #setValue(ValueExpression)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getFeatureValueSpec_Value()
-	 * @model containment="true" required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='featureSeqInitializer.elementClass'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='type' ocl='feature'"
-	 * @generated
-	 */
-	ValueExpression getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.FeatureValueSpec#getValue <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' containment reference.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(ValueExpression value);
-} // FeatureValueSpec
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/GMFMapFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/GMFMapFactory.java
deleted file mode 100644
index 7dcdbfd8d3e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/GMFMapFactory.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage
- * @generated
- */
-public interface GMFMapFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	GMFMapFactory eINSTANCE = org.eclipse.papyrus.gmf.mappings.impl.GMFMapFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Node Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Node Mapping</em>'.
-	 * @generated
-	 */
-	NodeMapping createNodeMapping();
-
-	/**
-	 * Returns a new object of class '<em>Compartment Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Compartment Mapping</em>'.
-	 * @generated
-	 */
-	CompartmentMapping createCompartmentMapping();
-
-	/**
-	 * Returns a new object of class '<em>Link Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Link Mapping</em>'.
-	 * @generated
-	 */
-	LinkMapping createLinkMapping();
-
-	/**
-	 * Returns a new object of class '<em>Canvas Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Canvas Mapping</em>'.
-	 * @generated
-	 */
-	CanvasMapping createCanvasMapping();
-
-	/**
-	 * Returns a new object of class '<em>Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Label Mapping</em>'.
-	 * @generated
-	 */
-	LabelMapping createLabelMapping();
-
-	/**
-	 * Returns a new object of class '<em>Feature Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Feature Label Mapping</em>'.
-	 * @generated
-	 */
-	FeatureLabelMapping createFeatureLabelMapping();
-
-	/**
-	 * Returns a new object of class '<em>Ocl Choice Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Ocl Choice Label Mapping</em>'.
-	 * @generated
-	 */
-	OclChoiceLabelMapping createOclChoiceLabelMapping();
-
-	/**
-	 * Returns a new object of class '<em>Design Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Design Label Mapping</em>'.
-	 * @generated
-	 */
-	DesignLabelMapping createDesignLabelMapping();
-
-	/**
-	 * Returns a new object of class '<em>Expression Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Expression Label Mapping</em>'.
-	 * @generated
-	 */
-	ExpressionLabelMapping createExpressionLabelMapping();
-
-	/**
-	 * Returns a new object of class '<em>Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Mapping</em>'.
-	 * @generated
-	 */
-	Mapping createMapping();
-
-	/**
-	 * Returns a new object of class '<em>Child Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Child Reference</em>'.
-	 * @generated
-	 */
-	ChildReference createChildReference();
-
-	/**
-	 * Returns a new object of class '<em>Top Node Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Top Node Reference</em>'.
-	 * @generated
-	 */
-	TopNodeReference createTopNodeReference();
-
-	/**
-	 * Returns a new object of class '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Constraint</em>'.
-	 * @generated
-	 */
-	Constraint createConstraint();
-
-	/**
-	 * Returns a new object of class '<em>Link Constraints</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Link Constraints</em>'.
-	 * @generated
-	 */
-	LinkConstraints createLinkConstraints();
-
-	/**
-	 * Returns a new object of class '<em>Value Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Value Expression</em>'.
-	 * @generated
-	 */
-	ValueExpression createValueExpression();
-
-	/**
-	 * Returns a new object of class '<em>Feature Seq Initializer</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Feature Seq Initializer</em>'.
-	 * @generated
-	 */
-	FeatureSeqInitializer createFeatureSeqInitializer();
-
-	/**
-	 * Returns a new object of class '<em>Feature Value Spec</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Feature Value Spec</em>'.
-	 * @generated
-	 */
-	FeatureValueSpec createFeatureValueSpec();
-
-	/**
-	 * Returns a new object of class '<em>Reference New Element Spec</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Reference New Element Spec</em>'.
-	 * @generated
-	 */
-	ReferenceNewElementSpec createReferenceNewElementSpec();
-
-	/**
-	 * Returns a new object of class '<em>Audit Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Audit Container</em>'.
-	 * @generated
-	 */
-	AuditContainer createAuditContainer();
-
-	/**
-	 * Returns a new object of class '<em>Audit Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Audit Rule</em>'.
-	 * @generated
-	 */
-	AuditRule createAuditRule();
-
-	/**
-	 * Returns a new object of class '<em>Domain Element Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Domain Element Target</em>'.
-	 * @generated
-	 */
-	DomainElementTarget createDomainElementTarget();
-
-	/**
-	 * Returns a new object of class '<em>Domain Attribute Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Domain Attribute Target</em>'.
-	 * @generated
-	 */
-	DomainAttributeTarget createDomainAttributeTarget();
-
-	/**
-	 * Returns a new object of class '<em>Diagram Element Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Diagram Element Target</em>'.
-	 * @generated
-	 */
-	DiagramElementTarget createDiagramElementTarget();
-
-	/**
-	 * Returns a new object of class '<em>Notation Element Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Notation Element Target</em>'.
-	 * @generated
-	 */
-	NotationElementTarget createNotationElementTarget();
-
-	/**
-	 * Returns a new object of class '<em>Metric Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Metric Container</em>'.
-	 * @generated
-	 */
-	MetricContainer createMetricContainer();
-
-	/**
-	 * Returns a new object of class '<em>Metric Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Metric Rule</em>'.
-	 * @generated
-	 */
-	MetricRule createMetricRule();
-
-	/**
-	 * Returns a new object of class '<em>Audited Metric Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Audited Metric Target</em>'.
-	 * @generated
-	 */
-	AuditedMetricTarget createAuditedMetricTarget();
-
-	/**
-	 * Returns a new object of class '<em>Visual Effect Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Visual Effect Mapping</em>'.
-	 * @generated
-	 */
-	VisualEffectMapping createVisualEffectMapping();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	GMFMapPackage getGMFMapPackage();
-
-} //GMFMapFactory
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/GMFMapPackage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/GMFMapPackage.java
deleted file mode 100644
index 65c0015817c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/GMFMapPackage.java
+++ /dev/null
@@ -1,3734 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapFactory
- * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2004/EmfaticAnnotationMap constraints='http://www.eclipse.org/gmf/2005/constraints' constraintsMeta='http://www.eclipse.org/gmf/2005/constraints/meta'"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints import='http://www.eclipse.org/gmf/runtime/1.0.0/notation'"
- * @generated
- */
-public interface GMFMapPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "mappings";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/gmf/2020/mappings";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "gmfmap";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	GMFMapPackage eINSTANCE = org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.MappingEntryImpl <em>Mapping Entry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.MappingEntryImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getMappingEntry()
-	 * @generated
-	 */
-	int MAPPING_ENTRY = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.NodeMappingImpl <em>Node Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.NodeMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getNodeMapping()
-	 * @generated
-	 */
-	int NODE_MAPPING = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.CompartmentMappingImpl <em>Compartment Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.CompartmentMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getCompartmentMapping()
-	 * @generated
-	 */
-	int COMPARTMENT_MAPPING = 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl <em>Link Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getLinkMapping()
-	 * @generated
-	 */
-	int LINK_MAPPING = 8;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.CanvasMappingImpl <em>Canvas Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.CanvasMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getCanvasMapping()
-	 * @generated
-	 */
-	int CANVAS_MAPPING = 9;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.MappingImpl <em>Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.MappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getMapping()
-	 * @generated
-	 */
-	int MAPPING = 0;
-
-	/**
-	 * The feature id for the '<em><b>Nodes</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING__NODES = 0;
-
-	/**
-	 * The feature id for the '<em><b>Links</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING__LINKS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Diagram</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING__DIAGRAM = 2;
-
-	/**
-	 * The feature id for the '<em><b>Appearance Styles</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING__APPEARANCE_STYLES = 3;
-
-	/**
-	 * The feature id for the '<em><b>Audits</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING__AUDITS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Metrics</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING__METRICS = 5;
-
-	/**
-	 * The number of structural features of the '<em>Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_FEATURE_COUNT = 6;
-
-
-	/**
-	 * The feature id for the '<em><b>Domain Meta Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_ENTRY__DOMAIN_META_ELEMENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Domain Specialization</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_ENTRY__DOMAIN_SPECIALIZATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Domain Initializer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_ENTRY__DOMAIN_INITIALIZER = 2;
-
-	/**
-	 * The feature id for the '<em><b>Label Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_ENTRY__LABEL_MAPPINGS = 3;
-
-	/**
-	 * The feature id for the '<em><b>Related Diagrams</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_ENTRY__RELATED_DIAGRAMS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Visual Effects</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_ENTRY__VISUAL_EFFECTS = 5;
-
-	/**
-	 * The number of structural features of the '<em>Mapping Entry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAPPING_ENTRY_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.NeedsContainment <em>Needs Containment</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.NeedsContainment
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getNeedsContainment()
-	 * @generated
-	 */
-	int NEEDS_CONTAINMENT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NEEDS_CONTAINMENT__CONTAINMENT_FEATURE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Needs Containment</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NEEDS_CONTAINMENT_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.NodeReferenceImpl <em>Node Reference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.NodeReferenceImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getNodeReference()
-	 * @generated
-	 */
-	int NODE_REFERENCE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_REFERENCE__CONTAINMENT_FEATURE = NEEDS_CONTAINMENT__CONTAINMENT_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Children Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_REFERENCE__CHILDREN_FEATURE = NEEDS_CONTAINMENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Child</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_REFERENCE__CHILD = NEEDS_CONTAINMENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Node Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_REFERENCE_FEATURE_COUNT = NEEDS_CONTAINMENT_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.ChildReferenceImpl <em>Child Reference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.ChildReferenceImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getChildReference()
-	 * @generated
-	 */
-	int CHILD_REFERENCE = 4;
-
-	/**
-	 * The feature id for the '<em><b>Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_REFERENCE__CONTAINMENT_FEATURE = NODE_REFERENCE__CONTAINMENT_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Children Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_REFERENCE__CHILDREN_FEATURE = NODE_REFERENCE__CHILDREN_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Child</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_REFERENCE__CHILD = NODE_REFERENCE__CHILD;
-
-	/**
-	 * The feature id for the '<em><b>Parent Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_REFERENCE__PARENT_NODE = NODE_REFERENCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Compartment</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_REFERENCE__COMPARTMENT = NODE_REFERENCE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Owned Child</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_REFERENCE__OWNED_CHILD = NODE_REFERENCE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Referenced Child</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_REFERENCE__REFERENCED_CHILD = NODE_REFERENCE_FEATURE_COUNT + 3;
-
-	/**
-	 * The number of structural features of the '<em>Child Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CHILD_REFERENCE_FEATURE_COUNT = NODE_REFERENCE_FEATURE_COUNT + 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.TopNodeReferenceImpl <em>Top Node Reference</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.TopNodeReferenceImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getTopNodeReference()
-	 * @generated
-	 */
-	int TOP_NODE_REFERENCE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOP_NODE_REFERENCE__CONTAINMENT_FEATURE = NODE_REFERENCE__CONTAINMENT_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Children Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOP_NODE_REFERENCE__CHILDREN_FEATURE = NODE_REFERENCE__CHILDREN_FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Child</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOP_NODE_REFERENCE__CHILD = NODE_REFERENCE__CHILD;
-
-	/**
-	 * The feature id for the '<em><b>Owned Child</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOP_NODE_REFERENCE__OWNED_CHILD = NODE_REFERENCE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Top Node Reference</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOP_NODE_REFERENCE_FEATURE_COUNT = NODE_REFERENCE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Domain Meta Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__DOMAIN_META_ELEMENT = MAPPING_ENTRY__DOMAIN_META_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Domain Specialization</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__DOMAIN_SPECIALIZATION = MAPPING_ENTRY__DOMAIN_SPECIALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Domain Initializer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__DOMAIN_INITIALIZER = MAPPING_ENTRY__DOMAIN_INITIALIZER;
-
-	/**
-	 * The feature id for the '<em><b>Label Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__LABEL_MAPPINGS = MAPPING_ENTRY__LABEL_MAPPINGS;
-
-	/**
-	 * The feature id for the '<em><b>Related Diagrams</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__RELATED_DIAGRAMS = MAPPING_ENTRY__RELATED_DIAGRAMS;
-
-	/**
-	 * The feature id for the '<em><b>Visual Effects</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__VISUAL_EFFECTS = MAPPING_ENTRY__VISUAL_EFFECTS;
-
-	/**
-	 * The feature id for the '<em><b>Context Menu</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__CONTEXT_MENU = MAPPING_ENTRY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Tool</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__TOOL = MAPPING_ENTRY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Appearance Style</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__APPEARANCE_STYLE = MAPPING_ENTRY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Node</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__DIAGRAM_NODE = MAPPING_ENTRY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__CHILDREN = MAPPING_ENTRY_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Compartments</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING__COMPARTMENTS = MAPPING_ENTRY_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Node Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NODE_MAPPING_FEATURE_COUNT = MAPPING_ENTRY_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Compartment</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT_MAPPING__COMPARTMENT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Parent Node</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT_MAPPING__PARENT_NODE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Children</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT_MAPPING__CHILDREN = 2;
-
-	/**
-	 * The number of structural features of the '<em>Compartment Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COMPARTMENT_MAPPING_FEATURE_COUNT = 3;
-
-	/**
-	 * The feature id for the '<em><b>Domain Meta Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__DOMAIN_META_ELEMENT = MAPPING_ENTRY__DOMAIN_META_ELEMENT;
-
-	/**
-	 * The feature id for the '<em><b>Domain Specialization</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__DOMAIN_SPECIALIZATION = MAPPING_ENTRY__DOMAIN_SPECIALIZATION;
-
-	/**
-	 * The feature id for the '<em><b>Domain Initializer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__DOMAIN_INITIALIZER = MAPPING_ENTRY__DOMAIN_INITIALIZER;
-
-	/**
-	 * The feature id for the '<em><b>Label Mappings</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__LABEL_MAPPINGS = MAPPING_ENTRY__LABEL_MAPPINGS;
-
-	/**
-	 * The feature id for the '<em><b>Related Diagrams</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__RELATED_DIAGRAMS = MAPPING_ENTRY__RELATED_DIAGRAMS;
-
-	/**
-	 * The feature id for the '<em><b>Visual Effects</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__VISUAL_EFFECTS = MAPPING_ENTRY__VISUAL_EFFECTS;
-
-	/**
-	 * The feature id for the '<em><b>Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__CONTAINMENT_FEATURE = MAPPING_ENTRY_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Context Menu</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__CONTEXT_MENU = MAPPING_ENTRY_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Tool</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__TOOL = MAPPING_ENTRY_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Appearance Style</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__APPEARANCE_STYLE = MAPPING_ENTRY_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Link</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__DIAGRAM_LINK = MAPPING_ENTRY_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Source Meta Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__SOURCE_META_FEATURE = MAPPING_ENTRY_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Link Meta Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__LINK_META_FEATURE = MAPPING_ENTRY_FEATURE_COUNT + 6;
-
-	/**
-	 * The feature id for the '<em><b>Creation Constraints</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING__CREATION_CONSTRAINTS = MAPPING_ENTRY_FEATURE_COUNT + 7;
-
-	/**
-	 * The number of structural features of the '<em>Link Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_MAPPING_FEATURE_COUNT = MAPPING_ENTRY_FEATURE_COUNT + 8;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Canvas</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS_MAPPING__DIAGRAM_CANVAS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Domain Model</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS_MAPPING__DOMAIN_MODEL = 1;
-
-	/**
-	 * The feature id for the '<em><b>Domain Meta Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS_MAPPING__DOMAIN_META_ELEMENT = 2;
-
-	/**
-	 * The feature id for the '<em><b>Palette</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS_MAPPING__PALETTE = 3;
-
-	/**
-	 * The feature id for the '<em><b>Menu Contributions</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS_MAPPING__MENU_CONTRIBUTIONS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Toolbar Contributions</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS_MAPPING__TOOLBAR_CONTRIBUTIONS = 5;
-
-	/**
-	 * The number of structural features of the '<em>Canvas Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CANVAS_MAPPING_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.LabelMappingImpl <em>Label Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.LabelMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getLabelMapping()
-	 * @generated
-	 */
-	int LABEL_MAPPING = 10;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Label</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_MAPPING__DIAGRAM_LABEL = 0;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_MAPPING__READ_ONLY = 1;
-
-	/**
-	 * The feature id for the '<em><b>Map Entry</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_MAPPING__MAP_ENTRY = 2;
-
-	/**
-	 * The number of structural features of the '<em>Label Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LABEL_MAPPING_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl <em>Feature Label Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getFeatureLabelMapping()
-	 * @generated
-	 */
-	int FEATURE_LABEL_MAPPING = 11;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Label</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__DIAGRAM_LABEL = LABEL_MAPPING__DIAGRAM_LABEL;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__READ_ONLY = LABEL_MAPPING__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Map Entry</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__MAP_ENTRY = LABEL_MAPPING__MAP_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Features</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__FEATURES = LABEL_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Editable Features</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__EDITABLE_FEATURES = LABEL_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>View Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__VIEW_PATTERN = LABEL_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Editor Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__EDITOR_PATTERN = LABEL_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Edit Pattern</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__EDIT_PATTERN = LABEL_MAPPING_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>View Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__VIEW_METHOD = LABEL_MAPPING_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Edit Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING__EDIT_METHOD = LABEL_MAPPING_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Feature Label Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_LABEL_MAPPING_FEATURE_COUNT = LABEL_MAPPING_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.OclChoiceLabelMappingImpl <em>Ocl Choice Label Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.OclChoiceLabelMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getOclChoiceLabelMapping()
-	 * @generated
-	 */
-	int OCL_CHOICE_LABEL_MAPPING = 12;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Label</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OCL_CHOICE_LABEL_MAPPING__DIAGRAM_LABEL = LABEL_MAPPING__DIAGRAM_LABEL;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OCL_CHOICE_LABEL_MAPPING__READ_ONLY = LABEL_MAPPING__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Map Entry</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OCL_CHOICE_LABEL_MAPPING__MAP_ENTRY = LABEL_MAPPING__MAP_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OCL_CHOICE_LABEL_MAPPING__FEATURE = LABEL_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Items Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION = LABEL_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Show Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION = LABEL_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Ocl Choice Label Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int OCL_CHOICE_LABEL_MAPPING_FEATURE_COUNT = LABEL_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.DesignLabelMappingImpl <em>Design Label Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.DesignLabelMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getDesignLabelMapping()
-	 * @generated
-	 */
-	int DESIGN_LABEL_MAPPING = 13;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Label</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESIGN_LABEL_MAPPING__DIAGRAM_LABEL = LABEL_MAPPING__DIAGRAM_LABEL;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESIGN_LABEL_MAPPING__READ_ONLY = LABEL_MAPPING__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Map Entry</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESIGN_LABEL_MAPPING__MAP_ENTRY = LABEL_MAPPING__MAP_ENTRY;
-
-	/**
-	 * The number of structural features of the '<em>Design Label Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DESIGN_LABEL_MAPPING_FEATURE_COUNT = LABEL_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.ExpressionLabelMappingImpl <em>Expression Label Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.ExpressionLabelMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getExpressionLabelMapping()
-	 * @generated
-	 */
-	int EXPRESSION_LABEL_MAPPING = 14;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Label</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPRESSION_LABEL_MAPPING__DIAGRAM_LABEL = LABEL_MAPPING__DIAGRAM_LABEL;
-
-	/**
-	 * The feature id for the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPRESSION_LABEL_MAPPING__READ_ONLY = LABEL_MAPPING__READ_ONLY;
-
-	/**
-	 * The feature id for the '<em><b>Map Entry</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPRESSION_LABEL_MAPPING__MAP_ENTRY = LABEL_MAPPING__MAP_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>View Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION = LABEL_MAPPING_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Edit Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION = LABEL_MAPPING_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Validate Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION = LABEL_MAPPING_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Expression Label Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int EXPRESSION_LABEL_MAPPING_FEATURE_COUNT = LABEL_MAPPING_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.ValueExpressionImpl <em>Value Expression</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.ValueExpressionImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getValueExpression()
-	 * @generated
-	 */
-	int VALUE_EXPRESSION = 17;
-
-	/**
-	 * The feature id for the '<em><b>Body</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_EXPRESSION__BODY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Language</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_EXPRESSION__LANGUAGE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Lang Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_EXPRESSION__LANG_NAME = 2;
-
-	/**
-	 * The number of structural features of the '<em>Value Expression</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VALUE_EXPRESSION_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.ConstraintImpl <em>Constraint</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.ConstraintImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getConstraint()
-	 * @generated
-	 */
-	int CONSTRAINT = 15;
-
-	/**
-	 * The feature id for the '<em><b>Body</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__BODY = VALUE_EXPRESSION__BODY;
-
-	/**
-	 * The feature id for the '<em><b>Language</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__LANGUAGE = VALUE_EXPRESSION__LANGUAGE;
-
-	/**
-	 * The feature id for the '<em><b>Lang Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT__LANG_NAME = VALUE_EXPRESSION__LANG_NAME;
-
-	/**
-	 * The number of structural features of the '<em>Constraint</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONSTRAINT_FEATURE_COUNT = VALUE_EXPRESSION_FEATURE_COUNT + 0;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.LinkConstraintsImpl <em>Link Constraints</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.LinkConstraintsImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getLinkConstraints()
-	 * @generated
-	 */
-	int LINK_CONSTRAINTS = 16;
-
-	/**
-	 * The feature id for the '<em><b>Link Mapping</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_CONSTRAINTS__LINK_MAPPING = 0;
-
-	/**
-	 * The feature id for the '<em><b>Source End</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_CONSTRAINTS__SOURCE_END = 1;
-
-	/**
-	 * The feature id for the '<em><b>Target End</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_CONSTRAINTS__TARGET_END = 2;
-
-	/**
-	 * The number of structural features of the '<em>Link Constraints</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int LINK_CONSTRAINTS_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.ElementInitializer <em>Element Initializer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.ElementInitializer
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getElementInitializer()
-	 * @generated
-	 */
-	int ELEMENT_INITIALIZER = 18;
-
-	/**
-	 * The feature id for the '<em><b>Mapping Entry</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_INITIALIZER__MAPPING_ENTRY = 0;
-
-	/**
-	 * The number of structural features of the '<em>Element Initializer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ELEMENT_INITIALIZER_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureSeqInitializerImpl <em>Feature Seq Initializer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.FeatureSeqInitializerImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getFeatureSeqInitializer()
-	 * @generated
-	 */
-	int FEATURE_SEQ_INITIALIZER = 19;
-
-	/**
-	 * The feature id for the '<em><b>Mapping Entry</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_SEQ_INITIALIZER__MAPPING_ENTRY = ELEMENT_INITIALIZER__MAPPING_ENTRY;
-
-	/**
-	 * The feature id for the '<em><b>Initializers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_SEQ_INITIALIZER__INITIALIZERS = ELEMENT_INITIALIZER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Element Class</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS = ELEMENT_INITIALIZER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Creating Initializer</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER = ELEMENT_INITIALIZER_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Feature Seq Initializer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_SEQ_INITIALIZER_FEATURE_COUNT = ELEMENT_INITIALIZER_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureInitializerImpl <em>Feature Initializer</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.FeatureInitializerImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getFeatureInitializer()
-	 * @generated
-	 */
-	int FEATURE_INITIALIZER = 20;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_INITIALIZER__FEATURE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Feature Seq Initializer</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER = 1;
-
-	/**
-	 * The number of structural features of the '<em>Feature Initializer</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_INITIALIZER_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureValueSpecImpl <em>Feature Value Spec</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.FeatureValueSpecImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getFeatureValueSpec()
-	 * @generated
-	 */
-	int FEATURE_VALUE_SPEC = 21;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_VALUE_SPEC__FEATURE = FEATURE_INITIALIZER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Feature Seq Initializer</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_VALUE_SPEC__FEATURE_SEQ_INITIALIZER = FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_VALUE_SPEC__VALUE = FEATURE_INITIALIZER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Feature Value Spec</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FEATURE_VALUE_SPEC_FEATURE_COUNT = FEATURE_INITIALIZER_FEATURE_COUNT + 1;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.ReferenceNewElementSpecImpl <em>Reference New Element Spec</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.ReferenceNewElementSpecImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getReferenceNewElementSpec()
-	 * @generated
-	 */
-	int REFERENCE_NEW_ELEMENT_SPEC = 22;
-
-	/**
-	 * The feature id for the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE_NEW_ELEMENT_SPEC__FEATURE = FEATURE_INITIALIZER__FEATURE;
-
-	/**
-	 * The feature id for the '<em><b>Feature Seq Initializer</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE_NEW_ELEMENT_SPEC__FEATURE_SEQ_INITIALIZER = FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER;
-
-	/**
-	 * The feature id for the '<em><b>New Element Initializers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS = FEATURE_INITIALIZER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Reference New Element Spec</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int REFERENCE_NEW_ELEMENT_SPEC_FEATURE_COUNT = FEATURE_INITIALIZER_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.MenuOwner <em>Menu Owner</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.MenuOwner
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getMenuOwner()
-	 * @generated
-	 */
-	int MENU_OWNER = 23;
-
-	/**
-	 * The feature id for the '<em><b>Context Menu</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU_OWNER__CONTEXT_MENU = 0;
-
-	/**
-	 * The number of structural features of the '<em>Menu Owner</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU_OWNER_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.ToolOwner <em>Tool Owner</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.ToolOwner
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getToolOwner()
-	 * @generated
-	 */
-	int TOOL_OWNER = 24;
-
-	/**
-	 * The feature id for the '<em><b>Tool</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_OWNER__TOOL = 0;
-
-	/**
-	 * The number of structural features of the '<em>Tool Owner</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_OWNER_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.AppearanceSteward <em>Appearance Steward</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.AppearanceSteward
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getAppearanceSteward()
-	 * @generated
-	 */
-	int APPEARANCE_STEWARD = 25;
-
-	/**
-	 * The feature id for the '<em><b>Appearance Style</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPEARANCE_STEWARD__APPEARANCE_STYLE = 0;
-
-	/**
-	 * The number of structural features of the '<em>Appearance Steward</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int APPEARANCE_STEWARD_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.AuditContainerImpl <em>Audit Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.AuditContainerImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getAuditContainer()
-	 * @generated
-	 */
-	int AUDIT_CONTAINER = 26;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_CONTAINER__ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_CONTAINER__NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_CONTAINER__DESCRIPTION = 2;
-
-	/**
-	 * The feature id for the '<em><b>Parent Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_CONTAINER__PARENT_CONTAINER = 3;
-
-	/**
-	 * The feature id for the '<em><b>Audits</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_CONTAINER__AUDITS = 4;
-
-	/**
-	 * The feature id for the '<em><b>Child Containers</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_CONTAINER__CHILD_CONTAINERS = 5;
-
-	/**
-	 * The number of structural features of the '<em>Audit Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_CONTAINER_FEATURE_COUNT = 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.RuleBase <em>Rule Base</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.RuleBase
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getRuleBase()
-	 * @generated
-	 */
-	int RULE_BASE = 27;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RULE_BASE__NAME = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RULE_BASE__DESCRIPTION = 1;
-
-	/**
-	 * The number of structural features of the '<em>Rule Base</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int RULE_BASE_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl <em>Audit Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getAuditRule()
-	 * @generated
-	 */
-	int AUDIT_RULE = 28;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__NAME = RULE_BASE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__DESCRIPTION = RULE_BASE__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Id</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__ID = RULE_BASE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Rule</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__RULE = RULE_BASE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__TARGET = RULE_BASE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Severity</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__SEVERITY = RULE_BASE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>Use In Live Mode</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__USE_IN_LIVE_MODE = RULE_BASE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Message</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__MESSAGE = RULE_BASE_FEATURE_COUNT + 5;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE__CONTAINER = RULE_BASE_FEATURE_COUNT + 6;
-
-	/**
-	 * The number of structural features of the '<em>Audit Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDIT_RULE_FEATURE_COUNT = RULE_BASE_FEATURE_COUNT + 7;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.Auditable <em>Auditable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.Auditable
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getAuditable()
-	 * @generated
-	 */
-	int AUDITABLE = 36;
-
-	/**
-	 * The number of structural features of the '<em>Auditable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDITABLE_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.DomainElementTargetImpl <em>Domain Element Target</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.DomainElementTargetImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getDomainElementTarget()
-	 * @generated
-	 */
-	int DOMAIN_ELEMENT_TARGET = 29;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN_ELEMENT_TARGET__ELEMENT = AUDITABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Domain Element Target</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN_ELEMENT_TARGET_FEATURE_COUNT = AUDITABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.DomainAttributeTargetImpl <em>Domain Attribute Target</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.DomainAttributeTargetImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getDomainAttributeTarget()
-	 * @generated
-	 */
-	int DOMAIN_ATTRIBUTE_TARGET = 30;
-
-	/**
-	 * The feature id for the '<em><b>Attribute</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN_ATTRIBUTE_TARGET__ATTRIBUTE = AUDITABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Null As Error</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN_ATTRIBUTE_TARGET__NULL_AS_ERROR = AUDITABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Domain Attribute Target</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOMAIN_ATTRIBUTE_TARGET_FEATURE_COUNT = AUDITABLE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.DiagramElementTargetImpl <em>Diagram Element Target</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.DiagramElementTargetImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getDiagramElementTarget()
-	 * @generated
-	 */
-	int DIAGRAM_ELEMENT_TARGET = 31;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT_TARGET__ELEMENT = AUDITABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Diagram Element Target</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DIAGRAM_ELEMENT_TARGET_FEATURE_COUNT = AUDITABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.NotationElementTargetImpl <em>Notation Element Target</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.NotationElementTargetImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getNotationElementTarget()
-	 * @generated
-	 */
-	int NOTATION_ELEMENT_TARGET = 32;
-
-	/**
-	 * The feature id for the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NOTATION_ELEMENT_TARGET__ELEMENT = AUDITABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Notation Element Target</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NOTATION_ELEMENT_TARGET_FEATURE_COUNT = AUDITABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.MetricContainerImpl <em>Metric Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.MetricContainerImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getMetricContainer()
-	 * @generated
-	 */
-	int METRIC_CONTAINER = 33;
-
-	/**
-	 * The feature id for the '<em><b>Metrics</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_CONTAINER__METRICS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Metric Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_CONTAINER_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl <em>Metric Rule</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getMetricRule()
-	 * @generated
-	 */
-	int METRIC_RULE = 34;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE__NAME = RULE_BASE__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE__DESCRIPTION = RULE_BASE__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE__KEY = RULE_BASE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Rule</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE__RULE = RULE_BASE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Target</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE__TARGET = RULE_BASE_FEATURE_COUNT + 2;
-
-	/**
-	 * The feature id for the '<em><b>Low Limit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE__LOW_LIMIT = RULE_BASE_FEATURE_COUNT + 3;
-
-	/**
-	 * The feature id for the '<em><b>High Limit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE__HIGH_LIMIT = RULE_BASE_FEATURE_COUNT + 4;
-
-	/**
-	 * The feature id for the '<em><b>Container</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE__CONTAINER = RULE_BASE_FEATURE_COUNT + 5;
-
-	/**
-	 * The number of structural features of the '<em>Metric Rule</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int METRIC_RULE_FEATURE_COUNT = RULE_BASE_FEATURE_COUNT + 6;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.AuditedMetricTargetImpl <em>Audited Metric Target</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.AuditedMetricTargetImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getAuditedMetricTarget()
-	 * @generated
-	 */
-	int AUDITED_METRIC_TARGET = 35;
-
-	/**
-	 * The feature id for the '<em><b>Metric</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDITED_METRIC_TARGET__METRIC = AUDITABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Audited Metric Target</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int AUDITED_METRIC_TARGET_FEATURE_COUNT = AUDITABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.Measurable <em>Measurable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.Measurable
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getMeasurable()
-	 * @generated
-	 */
-	int MEASURABLE = 37;
-
-	/**
-	 * The number of structural features of the '<em>Measurable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MEASURABLE_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.impl.VisualEffectMappingImpl <em>Visual Effect Mapping</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.VisualEffectMappingImpl
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getVisualEffectMapping()
-	 * @generated
-	 */
-	int VISUAL_EFFECT_MAPPING = 38;
-
-	/**
-	 * The feature id for the '<em><b>Diagram Pin</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VISUAL_EFFECT_MAPPING__DIAGRAM_PIN = 0;
-
-	/**
-	 * The feature id for the '<em><b>Ocl Expression</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VISUAL_EFFECT_MAPPING__OCL_EXPRESSION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Parent Map Entry</b></em>' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY = 2;
-
-	/**
-	 * The number of structural features of the '<em>Visual Effect Mapping</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int VISUAL_EFFECT_MAPPING_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod <em>Label Text Access Method</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getLabelTextAccessMethod()
-	 * @generated
-	 */
-	int LABEL_TEXT_ACCESS_METHOD = 39;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.Severity <em>Severity</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.Severity
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getSeverity()
-	 * @generated
-	 */
-	int SEVERITY = 40;
-
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.mappings.Language <em>Language</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.mappings.Language
-	 * @see org.eclipse.papyrus.gmf.mappings.impl.GMFMapPackageImpl#getLanguage()
-	 * @generated
-	 */
-	int LANGUAGE = 41;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry <em>Mapping Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Mapping Entry</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry
-	 * @generated
-	 */
-	EClass getMappingEntry();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainMetaElement <em>Domain Meta Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Domain Meta Element</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainMetaElement()
-	 * @see #getMappingEntry()
-	 * @generated
-	 */
-	EReference getMappingEntry_DomainMetaElement();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainSpecialization <em>Domain Specialization</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Domain Specialization</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainSpecialization()
-	 * @see #getMappingEntry()
-	 * @generated
-	 */
-	EReference getMappingEntry_DomainSpecialization();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainInitializer <em>Domain Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Domain Initializer</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainInitializer()
-	 * @see #getMappingEntry()
-	 * @generated
-	 */
-	EReference getMappingEntry_DomainInitializer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getLabelMappings <em>Label Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Label Mappings</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry#getLabelMappings()
-	 * @see #getMappingEntry()
-	 * @generated
-	 */
-	EReference getMappingEntry_LabelMappings();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getRelatedDiagrams <em>Related Diagrams</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Related Diagrams</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry#getRelatedDiagrams()
-	 * @see #getMappingEntry()
-	 * @generated
-	 */
-	EReference getMappingEntry_RelatedDiagrams();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getVisualEffects <em>Visual Effects</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Visual Effects</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry#getVisualEffects()
-	 * @see #getMappingEntry()
-	 * @generated
-	 */
-	EReference getMappingEntry_VisualEffects();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.NeedsContainment <em>Needs Containment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Needs Containment</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NeedsContainment
-	 * @generated
-	 */
-	EClass getNeedsContainment();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.NeedsContainment#getContainmentFeature <em>Containment Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Containment Feature</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NeedsContainment#getContainmentFeature()
-	 * @see #getNeedsContainment()
-	 * @generated
-	 */
-	EReference getNeedsContainment_ContainmentFeature();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.NodeReference <em>Node Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Node Reference</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeReference
-	 * @generated
-	 */
-	EClass getNodeReference();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.NodeReference#getChildrenFeature <em>Children Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Children Feature</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeReference#getChildrenFeature()
-	 * @see #getNodeReference()
-	 * @generated
-	 */
-	EReference getNodeReference_ChildrenFeature();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.NodeReference#getChild <em>Child</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Child</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeReference#getChild()
-	 * @see #getNodeReference()
-	 * @generated
-	 */
-	EReference getNodeReference_Child();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.ChildReference <em>Child Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Child Reference</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ChildReference
-	 * @generated
-	 */
-	EClass getChildReference();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getParentNode <em>Parent Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Parent Node</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ChildReference#getParentNode()
-	 * @see #getChildReference()
-	 * @generated
-	 */
-	EReference getChildReference_ParentNode();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getCompartment <em>Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Compartment</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ChildReference#getCompartment()
-	 * @see #getChildReference()
-	 * @generated
-	 */
-	EReference getChildReference_Compartment();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getOwnedChild <em>Owned Child</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Owned Child</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ChildReference#getOwnedChild()
-	 * @see #getChildReference()
-	 * @generated
-	 */
-	EReference getChildReference_OwnedChild();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getReferencedChild <em>Referenced Child</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Referenced Child</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ChildReference#getReferencedChild()
-	 * @see #getChildReference()
-	 * @generated
-	 */
-	EReference getChildReference_ReferencedChild();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.TopNodeReference <em>Top Node Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Top Node Reference</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.TopNodeReference
-	 * @generated
-	 */
-	EClass getTopNodeReference();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.TopNodeReference#getOwnedChild <em>Owned Child</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Owned Child</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.TopNodeReference#getOwnedChild()
-	 * @see #getTopNodeReference()
-	 * @generated
-	 */
-	EReference getTopNodeReference_OwnedChild();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.NodeMapping <em>Node Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Node Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeMapping
-	 * @generated
-	 */
-	EClass getNodeMapping();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getDiagramNode <em>Diagram Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Diagram Node</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeMapping#getDiagramNode()
-	 * @see #getNodeMapping()
-	 * @generated
-	 */
-	EReference getNodeMapping_DiagramNode();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Children</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeMapping#getChildren()
-	 * @see #getNodeMapping()
-	 * @generated
-	 */
-	EReference getNodeMapping_Children();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getCompartments <em>Compartments</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Compartments</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeMapping#getCompartments()
-	 * @see #getNodeMapping()
-	 * @generated
-	 */
-	EReference getNodeMapping_Compartments();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping <em>Compartment Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Compartment Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CompartmentMapping
-	 * @generated
-	 */
-	EClass getCompartmentMapping();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getCompartment <em>Compartment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Compartment</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getCompartment()
-	 * @see #getCompartmentMapping()
-	 * @generated
-	 */
-	EReference getCompartmentMapping_Compartment();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getParentNode <em>Parent Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Parent Node</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getParentNode()
-	 * @see #getCompartmentMapping()
-	 * @generated
-	 */
-	EReference getCompartmentMapping_ParentNode();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getChildren <em>Children</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Children</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getChildren()
-	 * @see #getCompartmentMapping()
-	 * @generated
-	 */
-	EReference getCompartmentMapping_Children();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping <em>Link Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Link Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkMapping
-	 * @generated
-	 */
-	EClass getLinkMapping();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getDiagramLink <em>Diagram Link</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Diagram Link</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkMapping#getDiagramLink()
-	 * @see #getLinkMapping()
-	 * @generated
-	 */
-	EReference getLinkMapping_DiagramLink();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getSourceMetaFeature <em>Source Meta Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Source Meta Feature</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkMapping#getSourceMetaFeature()
-	 * @see #getLinkMapping()
-	 * @generated
-	 */
-	EReference getLinkMapping_SourceMetaFeature();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getLinkMetaFeature <em>Link Meta Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Link Meta Feature</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkMapping#getLinkMetaFeature()
-	 * @see #getLinkMapping()
-	 * @generated
-	 */
-	EReference getLinkMapping_LinkMetaFeature();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getCreationConstraints <em>Creation Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Creation Constraints</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkMapping#getCreationConstraints()
-	 * @see #getLinkMapping()
-	 * @generated
-	 */
-	EReference getLinkMapping_CreationConstraints();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping <em>Canvas Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Canvas Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CanvasMapping
-	 * @generated
-	 */
-	EClass getCanvasMapping();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDiagramCanvas <em>Diagram Canvas</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Diagram Canvas</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDiagramCanvas()
-	 * @see #getCanvasMapping()
-	 * @generated
-	 */
-	EReference getCanvasMapping_DiagramCanvas();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDomainModel <em>Domain Model</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Domain Model</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDomainModel()
-	 * @see #getCanvasMapping()
-	 * @generated
-	 */
-	EReference getCanvasMapping_DomainModel();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDomainMetaElement <em>Domain Meta Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Domain Meta Element</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CanvasMapping#getDomainMetaElement()
-	 * @see #getCanvasMapping()
-	 * @generated
-	 */
-	EReference getCanvasMapping_DomainMetaElement();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getPalette <em>Palette</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Palette</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CanvasMapping#getPalette()
-	 * @see #getCanvasMapping()
-	 * @generated
-	 */
-	EReference getCanvasMapping_Palette();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getMenuContributions <em>Menu Contributions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Menu Contributions</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CanvasMapping#getMenuContributions()
-	 * @see #getCanvasMapping()
-	 * @generated
-	 */
-	EReference getCanvasMapping_MenuContributions();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping#getToolbarContributions <em>Toolbar Contributions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Toolbar Contributions</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.CanvasMapping#getToolbarContributions()
-	 * @see #getCanvasMapping()
-	 * @generated
-	 */
-	EReference getCanvasMapping_ToolbarContributions();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.LabelMapping <em>Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Label Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelMapping
-	 * @generated
-	 */
-	EClass getLabelMapping();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#getDiagramLabel <em>Diagram Label</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Diagram Label</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelMapping#getDiagramLabel()
-	 * @see #getLabelMapping()
-	 * @generated
-	 */
-	EReference getLabelMapping_DiagramLabel();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#isReadOnly <em>Read Only</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Read Only</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelMapping#isReadOnly()
-	 * @see #getLabelMapping()
-	 * @generated
-	 */
-	EAttribute getLabelMapping_ReadOnly();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#getMapEntry <em>Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Map Entry</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelMapping#getMapEntry()
-	 * @see #getLabelMapping()
-	 * @generated
-	 */
-	EReference getLabelMapping_MapEntry();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping <em>Feature Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Label Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping
-	 * @generated
-	 */
-	EClass getFeatureLabelMapping();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getFeatures <em>Features</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Features</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getFeatures()
-	 * @see #getFeatureLabelMapping()
-	 * @generated
-	 */
-	EReference getFeatureLabelMapping_Features();
-
-	/**
-	 * Returns the meta object for the reference list '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditableFeatures <em>Editable Features</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference list '<em>Editable Features</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditableFeatures()
-	 * @see #getFeatureLabelMapping()
-	 * @generated
-	 */
-	EReference getFeatureLabelMapping_EditableFeatures();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getViewPattern <em>View Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>View Pattern</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getViewPattern()
-	 * @see #getFeatureLabelMapping()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelMapping_ViewPattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditorPattern <em>Editor Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Editor Pattern</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditorPattern()
-	 * @see #getFeatureLabelMapping()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelMapping_EditorPattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getViewMethod <em>View Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>View Method</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getViewMethod()
-	 * @see #getFeatureLabelMapping()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelMapping_ViewMethod();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditPattern <em>Edit Pattern</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Edit Pattern</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditPattern()
-	 * @see #getFeatureLabelMapping()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelMapping_EditPattern();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditMethod <em>Edit Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Edit Method</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping#getEditMethod()
-	 * @see #getFeatureLabelMapping()
-	 * @generated
-	 */
-	EAttribute getFeatureLabelMapping_EditMethod();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping <em>Ocl Choice Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Ocl Choice Label Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping
-	 * @generated
-	 */
-	EClass getOclChoiceLabelMapping();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getFeature <em>Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Feature</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getFeature()
-	 * @see #getOclChoiceLabelMapping()
-	 * @generated
-	 */
-	EReference getOclChoiceLabelMapping_Feature();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getItemsExpression <em>Items Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Items Expression</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getItemsExpression()
-	 * @see #getOclChoiceLabelMapping()
-	 * @generated
-	 */
-	EReference getOclChoiceLabelMapping_ItemsExpression();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getShowExpression <em>Show Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Show Expression</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getShowExpression()
-	 * @see #getOclChoiceLabelMapping()
-	 * @generated
-	 */
-	EReference getOclChoiceLabelMapping_ShowExpression();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.DesignLabelMapping <em>Design Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Design Label Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.DesignLabelMapping
-	 * @generated
-	 */
-	EClass getDesignLabelMapping();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping <em>Expression Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Expression Label Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping
-	 * @generated
-	 */
-	EClass getExpressionLabelMapping();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getViewExpression <em>View Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>View Expression</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getViewExpression()
-	 * @see #getExpressionLabelMapping()
-	 * @generated
-	 */
-	EReference getExpressionLabelMapping_ViewExpression();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getEditExpression <em>Edit Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Edit Expression</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getEditExpression()
-	 * @see #getExpressionLabelMapping()
-	 * @generated
-	 */
-	EReference getExpressionLabelMapping_EditExpression();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getValidateExpression <em>Validate Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Validate Expression</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping#getValidateExpression()
-	 * @see #getExpressionLabelMapping()
-	 * @generated
-	 */
-	EReference getExpressionLabelMapping_ValidateExpression();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.Mapping <em>Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Mapping
-	 * @generated
-	 */
-	EClass getMapping();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getNodes <em>Nodes</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Nodes</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Mapping#getNodes()
-	 * @see #getMapping()
-	 * @generated
-	 */
-	EReference getMapping_Nodes();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getLinks <em>Links</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Links</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Mapping#getLinks()
-	 * @see #getMapping()
-	 * @generated
-	 */
-	EReference getMapping_Links();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getDiagram <em>Diagram</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Diagram</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Mapping#getDiagram()
-	 * @see #getMapping()
-	 * @generated
-	 */
-	EReference getMapping_Diagram();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getAppearanceStyles <em>Appearance Styles</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Appearance Styles</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Mapping#getAppearanceStyles()
-	 * @see #getMapping()
-	 * @generated
-	 */
-	EReference getMapping_AppearanceStyles();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getAudits <em>Audits</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Audits</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Mapping#getAudits()
-	 * @see #getMapping()
-	 * @generated
-	 */
-	EReference getMapping_Audits();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getMetrics <em>Metrics</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Metrics</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Mapping#getMetrics()
-	 * @see #getMapping()
-	 * @generated
-	 */
-	EReference getMapping_Metrics();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.Constraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Constraint</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Constraint
-	 * @generated
-	 */
-	EClass getConstraint();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints <em>Link Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Link Constraints</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkConstraints
-	 * @generated
-	 */
-	EClass getLinkConstraints();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getLinkMapping <em>Link Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Link Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkConstraints#getLinkMapping()
-	 * @see #getLinkConstraints()
-	 * @generated
-	 */
-	EReference getLinkConstraints_LinkMapping();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getSourceEnd <em>Source End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Source End</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkConstraints#getSourceEnd()
-	 * @see #getLinkConstraints()
-	 * @generated
-	 */
-	EReference getLinkConstraints_SourceEnd();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getTargetEnd <em>Target End</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Target End</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkConstraints#getTargetEnd()
-	 * @see #getLinkConstraints()
-	 * @generated
-	 */
-	EReference getLinkConstraints_TargetEnd();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.ValueExpression <em>Value Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Value Expression</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ValueExpression
-	 * @generated
-	 */
-	EClass getValueExpression();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.ValueExpression#getBody <em>Body</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Body</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ValueExpression#getBody()
-	 * @see #getValueExpression()
-	 * @generated
-	 */
-	EAttribute getValueExpression_Body();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.ValueExpression#getLanguage <em>Language</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Language</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ValueExpression#getLanguage()
-	 * @see #getValueExpression()
-	 * @generated
-	 */
-	EAttribute getValueExpression_Language();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.ValueExpression#getLangName <em>Lang Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Lang Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ValueExpression#getLangName()
-	 * @see #getValueExpression()
-	 * @generated
-	 */
-	EAttribute getValueExpression_LangName();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.ElementInitializer <em>Element Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Element Initializer</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ElementInitializer
-	 * @generated
-	 */
-	EClass getElementInitializer();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.ElementInitializer#getMappingEntry <em>Mapping Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Mapping Entry</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ElementInitializer#getMappingEntry()
-	 * @see #getElementInitializer()
-	 * @generated
-	 */
-	EReference getElementInitializer_MappingEntry();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer <em>Feature Seq Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Seq Initializer</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer
-	 * @generated
-	 */
-	EClass getFeatureSeqInitializer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getInitializers <em>Initializers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Initializers</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getInitializers()
-	 * @see #getFeatureSeqInitializer()
-	 * @generated
-	 */
-	EReference getFeatureSeqInitializer_Initializers();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getElementClass <em>Element Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element Class</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getElementClass()
-	 * @see #getFeatureSeqInitializer()
-	 * @generated
-	 */
-	EReference getFeatureSeqInitializer_ElementClass();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getCreatingInitializer <em>Creating Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Creating Initializer</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getCreatingInitializer()
-	 * @see #getFeatureSeqInitializer()
-	 * @generated
-	 */
-	EReference getFeatureSeqInitializer_CreatingInitializer();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer <em>Feature Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Initializer</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureInitializer
-	 * @generated
-	 */
-	EClass getFeatureInitializer();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeature <em>Feature</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Feature</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeature()
-	 * @see #getFeatureInitializer()
-	 * @generated
-	 */
-	EReference getFeatureInitializer_Feature();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeatureSeqInitializer <em>Feature Seq Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Feature Seq Initializer</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureInitializer#getFeatureSeqInitializer()
-	 * @see #getFeatureInitializer()
-	 * @generated
-	 */
-	EReference getFeatureInitializer_FeatureSeqInitializer();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.FeatureValueSpec <em>Feature Value Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Feature Value Spec</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureValueSpec
-	 * @generated
-	 */
-	EClass getFeatureValueSpec();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.FeatureValueSpec#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Value</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureValueSpec#getValue()
-	 * @see #getFeatureValueSpec()
-	 * @generated
-	 */
-	EReference getFeatureValueSpec_Value();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec <em>Reference New Element Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Reference New Element Spec</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec
-	 * @generated
-	 */
-	EClass getReferenceNewElementSpec();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec#getNewElementInitializers <em>New Element Initializers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>New Element Initializers</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec#getNewElementInitializers()
-	 * @see #getReferenceNewElementSpec()
-	 * @generated
-	 */
-	EReference getReferenceNewElementSpec_NewElementInitializers();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.MenuOwner <em>Menu Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Menu Owner</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MenuOwner
-	 * @generated
-	 */
-	EClass getMenuOwner();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.MenuOwner#getContextMenu <em>Context Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Context Menu</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MenuOwner#getContextMenu()
-	 * @see #getMenuOwner()
-	 * @generated
-	 */
-	EReference getMenuOwner_ContextMenu();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.ToolOwner <em>Tool Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool Owner</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ToolOwner
-	 * @generated
-	 */
-	EClass getToolOwner();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.ToolOwner#getTool <em>Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Tool</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.ToolOwner#getTool()
-	 * @see #getToolOwner()
-	 * @generated
-	 */
-	EReference getToolOwner_Tool();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.AppearanceSteward <em>Appearance Steward</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Appearance Steward</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AppearanceSteward
-	 * @generated
-	 */
-	EClass getAppearanceSteward();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.AppearanceSteward#getAppearanceStyle <em>Appearance Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Appearance Style</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AppearanceSteward#getAppearanceStyle()
-	 * @see #getAppearanceSteward()
-	 * @generated
-	 */
-	EReference getAppearanceSteward_AppearanceStyle();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer <em>Audit Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Audit Container</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer
-	 * @generated
-	 */
-	EClass getAuditContainer();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getId()
-	 * @see #getAuditContainer()
-	 * @generated
-	 */
-	EAttribute getAuditContainer_Id();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getName()
-	 * @see #getAuditContainer()
-	 * @generated
-	 */
-	EAttribute getAuditContainer_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getDescription()
-	 * @see #getAuditContainer()
-	 * @generated
-	 */
-	EAttribute getAuditContainer_Description();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getParentContainer <em>Parent Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Parent Container</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getParentContainer()
-	 * @see #getAuditContainer()
-	 * @generated
-	 */
-	EReference getAuditContainer_ParentContainer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getAudits <em>Audits</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Audits</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getAudits()
-	 * @see #getAuditContainer()
-	 * @generated
-	 */
-	EReference getAuditContainer_Audits();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer#getChildContainers <em>Child Containers</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Child Containers</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer#getChildContainers()
-	 * @see #getAuditContainer()
-	 * @generated
-	 */
-	EReference getAuditContainer_ChildContainers();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.AuditRule <em>Audit Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Audit Rule</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule
-	 * @generated
-	 */
-	EClass getAuditRule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getId <em>Id</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Id</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule#getId()
-	 * @see #getAuditRule()
-	 * @generated
-	 */
-	EAttribute getAuditRule_Id();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getRule <em>Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Rule</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule#getRule()
-	 * @see #getAuditRule()
-	 * @generated
-	 */
-	EReference getAuditRule_Rule();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Target</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule#getTarget()
-	 * @see #getAuditRule()
-	 * @generated
-	 */
-	EReference getAuditRule_Target();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getSeverity <em>Severity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Severity</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule#getSeverity()
-	 * @see #getAuditRule()
-	 * @generated
-	 */
-	EAttribute getAuditRule_Severity();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#isUseInLiveMode <em>Use In Live Mode</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Use In Live Mode</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule#isUseInLiveMode()
-	 * @see #getAuditRule()
-	 * @generated
-	 */
-	EAttribute getAuditRule_UseInLiveMode();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getMessage <em>Message</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Message</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule#getMessage()
-	 * @see #getAuditRule()
-	 * @generated
-	 */
-	EAttribute getAuditRule_Message();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.AuditRule#getContainer <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Container</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule#getContainer()
-	 * @see #getAuditRule()
-	 * @generated
-	 */
-	EReference getAuditRule_Container();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.RuleBase <em>Rule Base</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Rule Base</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.RuleBase
-	 * @generated
-	 */
-	EClass getRuleBase();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.RuleBase#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.RuleBase#getName()
-	 * @see #getRuleBase()
-	 * @generated
-	 */
-	EAttribute getRuleBase_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.RuleBase#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.RuleBase#getDescription()
-	 * @see #getRuleBase()
-	 * @generated
-	 */
-	EAttribute getRuleBase_Description();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.DomainElementTarget <em>Domain Element Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Domain Element Target</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.DomainElementTarget
-	 * @generated
-	 */
-	EClass getDomainElementTarget();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.DomainElementTarget#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.DomainElementTarget#getElement()
-	 * @see #getDomainElementTarget()
-	 * @generated
-	 */
-	EReference getDomainElementTarget_Element();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget <em>Domain Attribute Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Domain Attribute Target</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget
-	 * @generated
-	 */
-	EClass getDomainAttributeTarget();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget#getAttribute <em>Attribute</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Attribute</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget#getAttribute()
-	 * @see #getDomainAttributeTarget()
-	 * @generated
-	 */
-	EReference getDomainAttributeTarget_Attribute();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget#isNullAsError <em>Null As Error</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Null As Error</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget#isNullAsError()
-	 * @see #getDomainAttributeTarget()
-	 * @generated
-	 */
-	EAttribute getDomainAttributeTarget_NullAsError();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.DiagramElementTarget <em>Diagram Element Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Diagram Element Target</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.DiagramElementTarget
-	 * @generated
-	 */
-	EClass getDiagramElementTarget();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.DiagramElementTarget#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.DiagramElementTarget#getElement()
-	 * @see #getDiagramElementTarget()
-	 * @generated
-	 */
-	EReference getDiagramElementTarget_Element();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.NotationElementTarget <em>Notation Element Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Notation Element Target</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NotationElementTarget
-	 * @generated
-	 */
-	EClass getNotationElementTarget();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.NotationElementTarget#getElement <em>Element</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Element</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.NotationElementTarget#getElement()
-	 * @see #getNotationElementTarget()
-	 * @generated
-	 */
-	EReference getNotationElementTarget_Element();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.MetricContainer <em>Metric Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Metric Container</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricContainer
-	 * @generated
-	 */
-	EClass getMetricContainer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.mappings.MetricContainer#getMetrics <em>Metrics</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Metrics</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricContainer#getMetrics()
-	 * @see #getMetricContainer()
-	 * @generated
-	 */
-	EReference getMetricContainer_Metrics();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.MetricRule <em>Metric Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Metric Rule</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule
-	 * @generated
-	 */
-	EClass getMetricRule();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getKey <em>Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Key</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule#getKey()
-	 * @see #getMetricRule()
-	 * @generated
-	 */
-	EAttribute getMetricRule_Key();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getRule <em>Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Rule</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule#getRule()
-	 * @see #getMetricRule()
-	 * @generated
-	 */
-	EReference getMetricRule_Rule();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getTarget <em>Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Target</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule#getTarget()
-	 * @see #getMetricRule()
-	 * @generated
-	 */
-	EReference getMetricRule_Target();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getLowLimit <em>Low Limit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Low Limit</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule#getLowLimit()
-	 * @see #getMetricRule()
-	 * @generated
-	 */
-	EAttribute getMetricRule_LowLimit();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getHighLimit <em>High Limit</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>High Limit</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule#getHighLimit()
-	 * @see #getMetricRule()
-	 * @generated
-	 */
-	EAttribute getMetricRule_HighLimit();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getContainer <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Container</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule#getContainer()
-	 * @see #getMetricRule()
-	 * @generated
-	 */
-	EReference getMetricRule_Container();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget <em>Audited Metric Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Audited Metric Target</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget
-	 * @generated
-	 */
-	EClass getAuditedMetricTarget();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget#getMetric <em>Metric</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Metric</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget#getMetric()
-	 * @see #getAuditedMetricTarget()
-	 * @generated
-	 */
-	EReference getAuditedMetricTarget_Metric();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.Auditable <em>Auditable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Auditable</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Auditable
-	 * @generated
-	 */
-	EClass getAuditable();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.Measurable <em>Measurable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Measurable</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Measurable
-	 * @generated
-	 */
-	EClass getMeasurable();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping <em>Visual Effect Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Visual Effect Mapping</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.VisualEffectMapping
-	 * @generated
-	 */
-	EClass getVisualEffectMapping();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getDiagramPin <em>Diagram Pin</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Diagram Pin</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getDiagramPin()
-	 * @see #getVisualEffectMapping()
-	 * @generated
-	 */
-	EReference getVisualEffectMapping_DiagramPin();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getOclExpression <em>Ocl Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Ocl Expression</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getOclExpression()
-	 * @see #getVisualEffectMapping()
-	 * @generated
-	 */
-	EAttribute getVisualEffectMapping_OclExpression();
-
-	/**
-	 * Returns the meta object for the container reference '{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getParentMapEntry <em>Parent Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the container reference '<em>Parent Map Entry</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getParentMapEntry()
-	 * @see #getVisualEffectMapping()
-	 * @generated
-	 */
-	EReference getVisualEffectMapping_ParentMapEntry();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod <em>Label Text Access Method</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Label Text Access Method</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod
-	 * @generated
-	 */
-	EEnum getLabelTextAccessMethod();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.mappings.Severity <em>Severity</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Severity</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Severity
-	 * @generated
-	 */
-	EEnum getSeverity();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.mappings.Language <em>Language</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Language</em>'.
-	 * @see org.eclipse.papyrus.gmf.mappings.Language
-	 * @generated
-	 */
-	EEnum getLanguage();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	GMFMapFactory getGMFMapFactory();
-
-} //GMFMapPackage
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LabelMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LabelMapping.java
deleted file mode 100644
index 5378b5e3fea..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LabelMapping.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Label definition; text is taken from the graph model; no editing support; user may contribute custom parser
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#getDiagramLabel <em>Diagram Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#isReadOnly <em>Read Only</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#getMapEntry <em>Map Entry</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLabelMapping()
- * @model
- * @generated
- */
-public interface LabelMapping extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Diagram Label</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram Label</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram Label</em>' reference.
-	 * @see #setDiagramLabel(DiagramLabel)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLabelMapping_DiagramLabel()
-	 * @model required="true"
-	 * @generated
-	 */
-	DiagramLabel getDiagramLabel();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#getDiagramLabel <em>Diagram Label</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Diagram Label</em>' reference.
-	 * @see #getDiagramLabel()
-	 * @generated
-	 */
-	void setDiagramLabel(DiagramLabel value);
-
-	/**
-	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Read Only</em>' attribute.
-	 * @see #setReadOnly(boolean)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLabelMapping_ReadOnly()
-	 * @model
-	 * @generated
-	 */
-	boolean isReadOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#isReadOnly <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Only</em>' attribute.
-	 * @see #isReadOnly()
-	 * @generated
-	 */
-	void setReadOnly(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Map Entry</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getLabelMappings <em>Label Mappings</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Map Entry</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Map Entry</em>' container reference.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLabelMapping_MapEntry()
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry#getLabelMappings
-	 * @model opposite="labelMappings" resolveProxies="false" required="true" transient="false" changeable="false"
-	 * @generated
-	 */
-	MappingEntry getMapEntry();
-
-} // LabelMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LabelTextAccessMethod.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LabelTextAccessMethod.java
deleted file mode 100644
index c8fadb113ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LabelTextAccessMethod.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Label Text Access Method</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLabelTextAccessMethod()
- * @model
- * @generated
- */
-public enum LabelTextAccessMethod implements Enumerator {
-	/**
-	 * The '<em><b>MESSAGE FORMAT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MESSAGE_FORMAT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	MESSAGE_FORMAT(0, "MESSAGE_FORMAT", "MESSAGE_FORMAT"),
-
-	/**
-	 * The '<em><b>NATIVE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NATIVE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NATIVE(1, "NATIVE", "NATIVE"),
-
-	/**
-	 * The '<em><b>REGEXP</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REGEXP_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	REGEXP(2, "REGEXP", "REGEXP"),
-
-	/**
-	 * The '<em><b>PRINTF</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PRINTF_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	PRINTF(3, "PRINTF", "PRINTF");
-
-	/**
-	 * The '<em><b>MESSAGE FORMAT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>MESSAGE FORMAT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MESSAGE_FORMAT
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MESSAGE_FORMAT_VALUE = 0;
-
-	/**
-	 * The '<em><b>NATIVE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>NATIVE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NATIVE
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NATIVE_VALUE = 1;
-
-	/**
-	 * The '<em><b>REGEXP</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>REGEXP</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REGEXP
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REGEXP_VALUE = 2;
-
-	/**
-	 * The '<em><b>PRINTF</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>PRINTF</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PRINTF
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PRINTF_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>Label Text Access Method</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final LabelTextAccessMethod[] VALUES_ARRAY =
-		new LabelTextAccessMethod[] {
-			MESSAGE_FORMAT,
-			NATIVE,
-			REGEXP,
-			PRINTF,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Label Text Access Method</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<LabelTextAccessMethod> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Label Text Access Method</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LabelTextAccessMethod get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LabelTextAccessMethod result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Label Text Access Method</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LabelTextAccessMethod getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			LabelTextAccessMethod result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Label Text Access Method</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static LabelTextAccessMethod get(int value) {
-		switch (value) {
-			case MESSAGE_FORMAT_VALUE: return MESSAGE_FORMAT;
-			case NATIVE_VALUE: return NATIVE;
-			case REGEXP_VALUE: return REGEXP;
-			case PRINTF_VALUE: return PRINTF;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private LabelTextAccessMethod(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //LabelTextAccessMethod
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Language.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Language.java
deleted file mode 100644
index c745d00e544..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Language.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Language.java,v 1.3 2008/07/01 11:40:21 atikhomirov Exp $
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Language</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLanguage()
- * @model
- * @generated
- */
-public enum Language implements Enumerator
-{
-	/**
-	 * The '<em><b>Ocl</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #OCL
-	 * @generated
-	 * @ordered
-	 */
-	OCL_LITERAL(0, "ocl", "ocl"),
-	/**
-	 * The '<em><b>Java</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #JAVA
-	 * @generated
-	 * @ordered
-	 */
-	JAVA_LITERAL(1, "java", "java"),
-	/**
-	 * The '<em><b>Regexp</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REGEXP
-	 * @generated
-	 * @ordered
-	 */
-	REGEXP_LITERAL(2, "regexp", "regexp"),
-	/**
-	 * The '<em><b>Nregexp</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NREGEXP
-	 * @generated
-	 * @ordered
-	 */
-	NREGEXP_LITERAL(3, "nregexp", "nregexp"), /**
-	 * The '<em><b>Literal</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LITERAL
-	 * @generated
-	 * @ordered
-	 */
-	LITERAL_LITERAL(4, "literal", "literal");
-	/**
-	 * The '<em><b>Ocl</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Ocl</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #OCL_LITERAL
-	 * @model name="ocl"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int OCL = 0;
-
-	/**
-	 * The '<em><b>Java</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Java</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #JAVA_LITERAL
-	 * @model name="java"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int JAVA = 1;
-
-	/**
-	 * The '<em><b>Regexp</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Regexp</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REGEXP_LITERAL
-	 * @model name="regexp"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REGEXP = 2;
-
-	/**
-	 * The '<em><b>Nregexp</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Nregexp</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NREGEXP_LITERAL
-	 * @model name="nregexp"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NREGEXP = 3;
-
-	/**
-	 * The '<em><b>Literal</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Literal</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LITERAL_LITERAL
-	 * @model name="literal"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LITERAL = 4;
-
-	/**
-	 * An array of all the '<em><b>Language</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Language[] VALUES_ARRAY =
-		new Language[] {
-			OCL_LITERAL,
-			JAVA_LITERAL,
-			REGEXP_LITERAL,
-			NREGEXP_LITERAL,
-			LITERAL_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Language</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Language> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Language</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Language get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Language result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Language</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Language getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Language result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Language</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Language get(int value) {
-		switch (value) {
-			case OCL: return OCL_LITERAL;
-			case JAVA: return JAVA_LITERAL;
-			case REGEXP: return REGEXP_LITERAL;
-			case NREGEXP: return NREGEXP_LITERAL;
-			case LITERAL: return LITERAL_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Language(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LinkConstraints.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LinkConstraints.java
deleted file mode 100644
index 82c503368e1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LinkConstraints.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Link Constraints</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Groups constraints on the link source and target end
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getLinkMapping <em>Link Mapping</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getSourceEnd <em>Source End</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getTargetEnd <em>Target End</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkConstraints()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not (sourceEnd.oclIsUndefined() and targetEnd.oclIsUndefined())' description='Either \'sourceEnd\' or \'targetEnd\' constraint must be specified'"
- * @generated
- */
-public interface LinkConstraints extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Link Mapping</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getCreationConstraints <em>Creation Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * References the link mapping restricted by these constraints
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Link Mapping</em>' container reference.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkConstraints_LinkMapping()
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkMapping#getCreationConstraints
-	 * @model opposite="creationConstraints" resolveProxies="false" required="true" transient="false" changeable="false"
-	 * @generated
-	 */
-	LinkMapping getLinkMapping();
-
-	/**
-	 * Returns the value of the '<em><b>Source End</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Restriction enforced by the the source end, may reference variable 'oppositeEnd' pointing to targetEnd domainMetaElement instance if available.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Source End</em>' containment reference.
-	 * @see #setSourceEnd(Constraint)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkConstraints_SourceEnd()
-	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='variable' name='oppositeEnd' type.ocl='linkMapping.linkMetaFeature.eType'"
-	 * @generated
-	 */
-	Constraint getSourceEnd();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getSourceEnd <em>Source End</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source End</em>' containment reference.
-	 * @see #getSourceEnd()
-	 * @generated
-	 */
-	void setSourceEnd(Constraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Target End</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Restriction enforced by the the target end, may reference variable 'oppositeEnd' pointing to sourceEnd domainMetaElement instance.
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Target End</em>' containment reference.
-	 * @see #setTargetEnd(Constraint)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkConstraints_TargetEnd()
-	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='linkMapping.linkMetaFeature.eType.oclAsType(ecore::EClass)'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='variable' name='oppositeEnd' type.ocl='let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif'"
-	 * @generated
-	 */
-	Constraint getTargetEnd();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getTargetEnd <em>Target End</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target End</em>' containment reference.
-	 * @see #getTargetEnd()
-	 * @generated
-	 */
-	void setTargetEnd(Constraint value);
-
-} // LinkConstraints
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LinkMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LinkMapping.java
deleted file mode 100644
index 7ce596ba7ce..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/LinkMapping.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Link Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Connection element
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getDiagramLink <em>Diagram Link</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getSourceMetaFeature <em>Source Meta Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getLinkMetaFeature <em>Link Meta Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getCreationConstraints <em>Creation Constraints</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkMapping()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='domainMetaElement.oclIsUndefined() implies containmentFeature.oclIsUndefined() and sourceMetaFeature.oclIsUndefined()' description='Link mapping without \'Domain Element\' class does not use \'Containment Feature\' and \'Source Feature\''"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not domainMetaElement.oclIsUndefined()  implies containmentFeature.eReferenceType.isSuperTypeOf(domainMetaElement)' description='\'Containment Feature\' must reference the same class or super type of \'Domain Element\' EClass'"
- * @generated
- */
-public interface LinkMapping extends MappingEntry, NeedsContainment, MenuOwner, ToolOwner, AppearanceSteward {
-	/**
-	 * Returns the value of the '<em><b>Diagram Link</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram Link</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram Link</em>' reference.
-	 * @see #setDiagramLink(Connection)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkMapping_DiagramLink()
-	 * @model required="true"
-	 * @generated
-	 */
-	Connection getDiagramLink();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getDiagramLink <em>Diagram Link</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Diagram Link</em>' reference.
-	 * @see #getDiagramLink()
-	 * @generated
-	 */
-	void setDiagramLink(Connection value);
-
-	/**
-	 * Returns the value of the '<em><b>Source Meta Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Source Meta Feature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Source Meta Feature</em>' reference.
-	 * @see #setSourceMetaFeature(EStructuralFeature)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkMapping_SourceMetaFeature()
-	 * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not domainMetaElement.oclIsUndefined() implies sourceMetaFeature.oclIsUndefined() or sourceMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)' description='\'Source Feature\' must be owned by the link \'Domain Element\' or its super type'"
-	 * @generated
-	 */
-	EStructuralFeature getSourceMetaFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getSourceMetaFeature <em>Source Meta Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Source Meta Feature</em>' reference.
-	 * @see #getSourceMetaFeature()
-	 * @generated
-	 */
-	void setSourceMetaFeature(EStructuralFeature value);
-
-	/**
-	 * Returns the value of the '<em><b>Link Meta Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Link Meta Feature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Link Meta Feature</em>' reference.
-	 * @see #setLinkMetaFeature(EStructuralFeature)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkMapping_LinkMetaFeature()
-	 * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not(domainMetaElement.oclIsUndefined() or linkMetaFeature.oclIsUndefined()) implies linkMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)' description='\'Target Feature\' must be owned by the link \'Domain Element\' or its super type'"
-	 * @generated
-	 */
-	EStructuralFeature getLinkMetaFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getLinkMetaFeature <em>Link Meta Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Link Meta Feature</em>' reference.
-	 * @see #getLinkMetaFeature()
-	 * @generated
-	 */
-	void setLinkMetaFeature(EStructuralFeature value);
-
-	/**
-	 * Returns the value of the '<em><b>Creation Constraints</b></em>' containment reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints#getLinkMapping <em>Link Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies additional restrictions on link creation
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Creation Constraints</em>' containment reference.
-	 * @see #setCreationConstraints(LinkConstraints)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getLinkMapping_CreationConstraints()
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkConstraints#getLinkMapping
-	 * @model opposite="linkMapping" containment="true"
-	 * @generated
-	 */
-	LinkConstraints getCreationConstraints();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping#getCreationConstraints <em>Creation Constraints</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Creation Constraints</em>' containment reference.
-	 * @see #getCreationConstraints()
-	 * @generated
-	 */
-	void setCreationConstraints(LinkConstraints value);
-
-} // LinkMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Mapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Mapping.java
deleted file mode 100644
index a19cd49faf9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Mapping.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.tooldef.StyleSelector;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.Mapping#getNodes <em>Nodes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.Mapping#getLinks <em>Links</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.Mapping#getDiagram <em>Diagram</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.Mapping#getAppearanceStyles <em>Appearance Styles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.Mapping#getAudits <em>Audits</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.Mapping#getMetrics <em>Metrics</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMapping()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='nodes->forAll(n|n.containmentFeature.oclIsUndefined() and not n.child.domainMetaElement.oclIsUndefined() implies links->exists(let r:ecore::EReference= linkMetaFeature.oclAsType(ecore::EReference) in r.containment and r.eReferenceType.isSuperTypeOf(n.child.domainMetaElement)))' description='Phantom nodes that are not targeted by a link mapping representing containment reference present in the model'"
- * @generated
- */
-public interface Mapping extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Nodes</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.TopNodeReference}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Nodes</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Nodes</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMapping_Nodes()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<TopNodeReference> getNodes();
-
-	/**
-	 * Returns the value of the '<em><b>Links</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.LinkMapping}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Links</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Links</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMapping_Links()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<LinkMapping> getLinks();
-
-	/**
-	 * Returns the value of the '<em><b>Diagram</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram</em>' containment reference.
-	 * @see #setDiagram(CanvasMapping)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMapping_Diagram()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	CanvasMapping getDiagram();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getDiagram <em>Diagram</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Diagram</em>' containment reference.
-	 * @see #getDiagram()
-	 * @generated
-	 */
-	void setDiagram(CanvasMapping value);
-
-	/**
-	 * Returns the value of the '<em><b>Appearance Styles</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.tooldef.StyleSelector}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Appearance Styles</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Appearance Styles</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMapping_AppearanceStyles()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<StyleSelector> getAppearanceStyles();
-
-	/**
-	 * Returns the value of the '<em><b>Audits</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Audits</em>' containment reference.
-	 * @see #setAudits(AuditContainer)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMapping_Audits()
-	 * @model containment="true"
-	 * @generated
-	 */
-	AuditContainer getAudits();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getAudits <em>Audits</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Audits</em>' containment reference.
-	 * @see #getAudits()
-	 * @generated
-	 */
-	void setAudits(AuditContainer value);
-
-	/**
-	 * Returns the value of the '<em><b>Metrics</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Metrics</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Metrics</em>' containment reference.
-	 * @see #setMetrics(MetricContainer)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMapping_Metrics()
-	 * @model containment="true"
-	 * @generated
-	 */
-	MetricContainer getMetrics();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.Mapping#getMetrics <em>Metrics</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Metrics</em>' containment reference.
-	 * @see #getMetrics()
-	 * @generated
-	 */
-	void setMetrics(MetricContainer value);
-
-} // Mapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MappingEntry.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MappingEntry.java
deleted file mode 100644
index 664526245a2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MappingEntry.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Entry</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainMetaElement <em>Domain Meta Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainSpecialization <em>Domain Specialization</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainInitializer <em>Domain Initializer</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getLabelMappings <em>Label Mappings</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getRelatedDiagrams <em>Related Diagrams</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getVisualEffects <em>Visual Effects</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMappingEntry()
- * @model abstract="true"
- * @generated
- */
-public interface MappingEntry extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Domain Meta Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Domain Meta Element</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Domain Meta Element</em>' reference.
-	 * @see #setDomainMetaElement(EClass)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMappingEntry_DomainMetaElement()
-	 * @model
-	 * @generated
-	 */
-	EClass getDomainMetaElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainMetaElement <em>Domain Meta Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Domain Meta Element</em>' reference.
-	 * @see #getDomainMetaElement()
-	 * @generated
-	 */
-	void setDomainMetaElement(EClass value);
-
-	/**
-	 * Returns the value of the '<em><b>Domain Specialization</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specializes further the domain meta element EClass associated with this mapping and should be evaluated in this EClass context
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Domain Specialization</em>' containment reference.
-	 * @see #setDomainSpecialization(Constraint)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMappingEntry_DomainSpecialization()
-	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='self.getDomainContext()'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not domainSpecialization.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()' description='Using \'Domain Specialization\' requires \'Domain Meta Element\' to be set'"
-	 * @generated
-	 */
-	Constraint getDomainSpecialization();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainSpecialization <em>Domain Specialization</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Domain Specialization</em>' containment reference.
-	 * @see #getDomainSpecialization()
-	 * @generated
-	 */
-	void setDomainSpecialization(Constraint value);
-
-	/**
-	 * Returns the value of the '<em><b>Domain Initializer</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Initializer for the domain model element associated with mapping
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Domain Initializer</em>' containment reference.
-	 * @see #setDomainInitializer(ElementInitializer)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMappingEntry_DomainInitializer()
-	 * @model containment="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not domainInitializer.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()' description='\'Domain Element\' must be set in mapping with \'Element Initializers\''"
-	 * @generated
-	 */
-	ElementInitializer getDomainInitializer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getDomainInitializer <em>Domain Initializer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Domain Initializer</em>' containment reference.
-	 * @see #getDomainInitializer()
-	 * @generated
-	 */
-	void setDomainInitializer(ElementInitializer value);
-
-	/**
-	 * Returns the value of the '<em><b>Label Mappings</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.LabelMapping}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.LabelMapping#getMapEntry <em>Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Label Mappings</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Label Mappings</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMappingEntry_LabelMappings()
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelMapping#getMapEntry
-	 * @model opposite="mapEntry" containment="true"
-	 * @generated
-	 */
-	EList<LabelMapping> getLabelMappings();
-
-	/**
-	 * Returns the value of the '<em><b>Related Diagrams</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.CanvasMapping}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Diagrams that may be associated with this diagram element. It's up to client application to define what this association means (e.g. open diagram)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Related Diagrams</em>' reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMappingEntry_RelatedDiagrams()
-	 * @model
-	 * @generated
-	 */
-	EList<CanvasMapping> getRelatedDiagrams();
-
-	/**
-	 * Returns the value of the '<em><b>Visual Effects</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getParentMapEntry <em>Parent Map Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Visual Effects</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Visual Effects</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMappingEntry_VisualEffects()
-	 * @see org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getParentMapEntry
-	 * @model opposite="parentMapEntry" containment="true"
-	 * @generated
-	 */
-	EList<VisualEffectMapping> getVisualEffects();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * This method simplifies OCL expressions (makes it easy to write for both Node and Link).
-	 * <!-- end-model-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EClass getDomainContext();
-
-} // MappingEntry
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Measurable.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Measurable.java
deleted file mode 100644
index 49cdf31e257..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Measurable.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Measurable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Marker interface for anything that can be subject to metrics
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMeasurable()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Measurable extends EObject {
-} // Measurable
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MenuOwner.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MenuOwner.java
deleted file mode 100644
index 8f9d4c45245..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MenuOwner.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.tooldef.ContextMenu;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Menu Owner</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MenuOwner#getContextMenu <em>Context Menu</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMenuOwner()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface MenuOwner extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Context Menu</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Context Menu</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Context Menu</em>' reference.
-	 * @see #setContextMenu(ContextMenu)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMenuOwner_ContextMenu()
-	 * @model
-	 * @generated
-	 */
-	ContextMenu getContextMenu();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MenuOwner#getContextMenu <em>Context Menu</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Context Menu</em>' reference.
-	 * @see #getContextMenu()
-	 * @generated
-	 */
-	void setContextMenu(ContextMenu value);
-
-} // MenuOwner
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MetricContainer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MetricContainer.java
deleted file mode 100644
index a9472de3716..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MetricContainer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Metric Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MetricContainer#getMetrics <em>Metrics</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricContainer()
- * @model
- * @generated
- */
-public interface MetricContainer extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Metrics</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.MetricRule}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getContainer <em>Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Metrics</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Metrics</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricContainer_Metrics()
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule#getContainer
-	 * @model opposite="container" containment="true" required="true"
-	 * @generated
-	 */
-	EList<MetricRule> getMetrics();
-
-} // MetricContainer
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MetricRule.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MetricRule.java
deleted file mode 100644
index 4c3521d252e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/MetricRule.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Metric Rule</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getRule <em>Rule</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getLowLimit <em>Low Limit</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getHighLimit <em>High Limit</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getContainer <em>Container</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricRule()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not lowLimit.oclIsUndefined() and not highLimit.oclIsUndefined()  implies lowLimit < highLimit' description='Metric value \'lowLimit\' must be smaller then \'highLimit\''"
- * @generated
- */
-public interface MetricRule extends RuleBase {
-	/**
-	 * Returns the value of the '<em><b>Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Unique key identifying this metric an abbreviation for this metric
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Key</em>' attribute.
-	 * @see #setKey(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricRule_Key()
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not key.oclIsUndefined() implies container.metrics->one(i | i.key = self.key)' description='Metric rule with the same \'key\' already exists'"
-	 * @generated
-	 */
-	String getKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getKey <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Key</em>' attribute.
-	 * @see #getKey()
-	 * @generated
-	 */
-	void setKey(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Rule</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Expression that calculates the value of this metric which is of EDataType that encapsulates java.lang.Number subclasses or their primitives
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Rule</em>' containment reference.
-	 * @see #setRule(ValueExpression)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricRule_Rule()
-	 * @model containment="true" required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ref='target'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='type' ocl='\'ecore::EDoubleObject\''"
-	 * @generated
-	 */
-	ValueExpression getRule();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getRule <em>Rule</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Rule</em>' containment reference.
-	 * @see #getRule()
-	 * @generated
-	 */
-	void setRule(ValueExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Target</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The target representing the context this metric is evaluated in
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Target</em>' containment reference.
-	 * @see #setTarget(Measurable)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricRule_Target()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	Measurable getTarget();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getTarget <em>Target</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Target</em>' containment reference.
-	 * @see #getTarget()
-	 * @generated
-	 */
-	void setTarget(Measurable value);
-
-	/**
-	 * Returns the value of the '<em><b>Low Limit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Low Limit</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The lowest acceptable value of the rule expression result
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Low Limit</em>' attribute.
-	 * @see #setLowLimit(Double)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricRule_LowLimit()
-	 * @model
-	 * @generated
-	 */
-	Double getLowLimit();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getLowLimit <em>Low Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Low Limit</em>' attribute.
-	 * @see #getLowLimit()
-	 * @generated
-	 */
-	void setLowLimit(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>High Limit</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>High Limit</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The highest acceptable value of the rule expression result
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>High Limit</em>' attribute.
-	 * @see #setHighLimit(Double)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricRule_HighLimit()
-	 * @model
-	 * @generated
-	 */
-	Double getHighLimit();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getHighLimit <em>High Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>High Limit</em>' attribute.
-	 * @see #getHighLimit()
-	 * @generated
-	 */
-	void setHighLimit(Double value);
-
-	/**
-	 * Returns the value of the '<em><b>Container</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.MetricContainer#getMetrics <em>Metrics</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The containing metric container of this metric rule
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Container</em>' container reference.
-	 * @see #setContainer(MetricContainer)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getMetricRule_Container()
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricContainer#getMetrics
-	 * @model opposite="metrics" required="true" transient="false"
-	 * @generated
-	 */
-	MetricContainer getContainer();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.MetricRule#getContainer <em>Container</em>}' container reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Container</em>' container reference.
-	 * @see #getContainer()
-	 * @generated
-	 */
-	void setContainer(MetricContainer value);
-
-} // MetricRule
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NeedsContainment.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NeedsContainment.java
deleted file mode 100644
index 488beed2cad..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NeedsContainment.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Needs Containment</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.NeedsContainment#getContainmentFeature <em>Containment Feature</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNeedsContainment()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface NeedsContainment extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Containment Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Containment Feature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Containment Feature</em>' reference.
-	 * @see #setContainmentFeature(EReference)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNeedsContainment_ContainmentFeature()
-	 * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not containmentFeature.oclIsUndefined() implies containmentFeature.containment' description='Containment EReference expected'"
-	 * @generated
-	 */
-	EReference getContainmentFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.NeedsContainment#getContainmentFeature <em>Containment Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Containment Feature</em>' reference.
-	 * @see #getContainmentFeature()
-	 * @generated
-	 */
-	void setContainmentFeature(EReference value);
-
-} // NeedsContainment
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NodeMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NodeMapping.java
deleted file mode 100644
index c7075f24f41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NodeMapping.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Node Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Both top-level diagram node and any inner node
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getDiagramNode <em>Diagram Node</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getChildren <em>Children</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getCompartments <em>Compartments</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNodeMapping()
- * @model
- * @generated
- */
-public interface NodeMapping extends MappingEntry, MenuOwner, ToolOwner, AppearanceSteward {
-	/**
-	 * Returns the value of the '<em><b>Diagram Node</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram Node</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram Node</em>' reference.
-	 * @see #setDiagramNode(Node)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNodeMapping_DiagramNode()
-	 * @model required="true"
-	 * @generated
-	 */
-	Node getDiagramNode();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.NodeMapping#getDiagramNode <em>Diagram Node</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Diagram Node</em>' reference.
-	 * @see #getDiagramNode()
-	 * @generated
-	 */
-	void setDiagramNode(Node value);
-
-	/**
-	 * Returns the value of the '<em><b>Children</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.ChildReference}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.ChildReference#getParentNode <em>Parent Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Children</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Children</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNodeMapping_Children()
-	 * @see org.eclipse.papyrus.gmf.mappings.ChildReference#getParentNode
-	 * @model opposite="parentNode" containment="true"
-	 * @generated
-	 */
-	EList<ChildReference> getChildren();
-
-	/**
-	 * Returns the value of the '<em><b>Compartments</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getParentNode <em>Parent Node</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Compartments</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Compartments</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNodeMapping_Compartments()
-	 * @see org.eclipse.papyrus.gmf.mappings.CompartmentMapping#getParentNode
-	 * @model opposite="parentNode" containment="true"
-	 * @generated
-	 */
-	EList<CompartmentMapping> getCompartments();
-
-} // NodeMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NodeReference.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NodeReference.java
deleted file mode 100644
index 1bf32bb368c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NodeReference.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Node Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.NodeReference#getChildrenFeature <em>Children Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.NodeReference#getChild <em>Child</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNodeReference()
- * @model abstract="true"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not containmentFeature.oclIsUndefined() implies containmentFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)' description='\'Containment Feature\' must reference the same class or super type of \'Domain Meta Element\' of the referenced node'"
- * @generated
- */
-public interface NodeReference extends NeedsContainment {
-	/**
-	 * Returns the value of the '<em><b>Children Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Children Feature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Children Feature</em>' reference.
-	 * @see #setChildrenFeature(EReference)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNodeReference_ChildrenFeature()
-	 * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='not childrenFeature.oclIsUndefined() implies childrenFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)' description='\'Children Feature\' must reference the same class or super type of \'Domain Meta Element\' of the referenced node'"
-	 * @generated
-	 */
-	EReference getChildrenFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.NodeReference#getChildrenFeature <em>Children Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Children Feature</em>' reference.
-	 * @see #getChildrenFeature()
-	 * @generated
-	 */
-	void setChildrenFeature(EReference value);
-
-	/**
-	 * Returns the value of the '<em><b>Child</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Child</em>' reference.
-	 * @see #isSetChild()
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNodeReference_Child()
-	 * @model resolveProxies="false" unsettable="true" transient="true" changeable="false" volatile="true" derived="true"
-	 * @generated
-	 */
-	NodeMapping getChild();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.papyrus.gmf.mappings.NodeReference#getChild <em>Child</em>}' reference is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Child</em>' reference is set.
-	 * @see #getChild()
-	 * @generated
-	 */
-	boolean isSetChild();
-
-} // NodeReference
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NotationElementTarget.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NotationElementTarget.java
deleted file mode 100644
index 55e0decafec..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/NotationElementTarget.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Notation Element Target</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Target for rules applied on diagram notation model elements
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.NotationElementTarget#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNotationElementTarget()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='context' ocl='element'"
- * @generated
- */
-public interface NotationElementTarget extends Auditable, Measurable {
-	/**
-	 * Returns the value of the '<em><b>Element</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Targeted diagram notation model element
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Element</em>' reference.
-	 * @see #setElement(EClass)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getNotationElementTarget_Element()
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='element.eAllSuperTypes->including(element)->one(ePackage.name = \'notation\' and name = \'View\')' description='\'notation::View\' or its sub-class must be set to NotationElement target'"
-	 * @generated
-	 */
-	EClass getElement();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.NotationElementTarget#getElement <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Element</em>' reference.
-	 * @see #getElement()
-	 * @generated
-	 */
-	void setElement(EClass value);
-
-} // NotationElementTarget
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/OclChoiceLabelMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/OclChoiceLabelMapping.java
deleted file mode 100644
index 3108da86e36..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/OclChoiceLabelMapping.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Ocl Choice Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Label based on a feature (reference or attribute) from domain model and list of choices
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getItemsExpression <em>Items Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getShowExpression <em>Show Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getOclChoiceLabelMapping()
- * @model
- * @generated
- */
-public interface OclChoiceLabelMapping extends LabelMapping {
-	/**
-	 * Returns the value of the '<em><b>Feature</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Feature</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Feature</em>' reference.
-	 * @see #setFeature(EStructuralFeature)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getOclChoiceLabelMapping_Feature()
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='feature.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement)' description='Label reference must be available in \'Domain Element\' EClass of the labeled mapping entry'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='feature.oclIsKindOf(ecore::EReference) implies (not(feature.oclAsType(ecore::EReference).containment) and (feature.oclAsType(ecore::EReference).upperBound = 1))' description='Reference feature should not be containment and don\'t be multiple'"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='feature.oclIsKindOf(ecore::EAttribute) implies (itemsExpression <> null)' description='Items expression should be set if feature is an EAttribute'"
-	 * @generated
-	 */
-	EStructuralFeature getFeature();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getFeature <em>Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Feature</em>' reference.
-	 * @see #getFeature()
-	 * @generated
-	 */
-	void setFeature(EStructuralFeature value);
-
-	/**
-	 * Returns the value of the '<em><b>Items Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Items Expression</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Items Expression</em>' containment reference.
-	 * @see #setItemsExpression(ValueExpression)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getOclChoiceLabelMapping_ItemsExpression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ValueExpression getItemsExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getItemsExpression <em>Items Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Items Expression</em>' containment reference.
-	 * @see #getItemsExpression()
-	 * @generated
-	 */
-	void setItemsExpression(ValueExpression value);
-
-	/**
-	 * Returns the value of the '<em><b>Show Expression</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Show Expression</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Show Expression</em>' containment reference.
-	 * @see #setShowExpression(ValueExpression)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getOclChoiceLabelMapping_ShowExpression()
-	 * @model containment="true"
-	 * @generated
-	 */
-	ValueExpression getShowExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping#getShowExpression <em>Show Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Show Expression</em>' containment reference.
-	 * @see #getShowExpression()
-	 * @generated
-	 */
-	void setShowExpression(ValueExpression value);
-
-} // OclChoiceLabelMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ReferenceNewElementSpec.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ReferenceNewElementSpec.java
deleted file mode 100644
index f4b007f9f65..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ReferenceNewElementSpec.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceNewElementSpec.java,v 1.3 2008/03/03 17:45:08 atikhomirov Exp $
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Reference New Element Spec</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec#getNewElementInitializers <em>New Element Initializers</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getReferenceNewElementSpec()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints ocl='feature.many = false implies not (newElementInitializers->size() > 1)' description='FeatureInitializer for single element EReference can\'t contain multiple element initializers'"
- *        annotation="http://www.eclipse.org/gmf/2005/constraints ocl='let r: ecore::EReference = feature.oclAsType(ecore::EReference) in feature <> null implies r.containment' description='\'feature\' of \'ReferenceNewElementSpec\' must refer to containment ecore::EReference'"
- * @generated
- */
-public interface ReferenceNewElementSpec extends FeatureInitializer {
-	/**
-	 * Returns the value of the '<em><b>New Element Initializers</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer}.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getCreatingInitializer <em>Creating Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>New Element Initializers</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>New Element Initializers</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getReferenceNewElementSpec_NewElementInitializers()
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer#getCreatingInitializer
-	 * @model opposite="creatingInitializer" containment="true" required="true"
-	 * @generated
-	 */
-	EList<FeatureSeqInitializer> getNewElementInitializers();
-
-} // ReferenceNewElementSpec
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/RuleBase.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/RuleBase.java
deleted file mode 100644
index d536f23f80c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/RuleBase.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Rule Base</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Base class for rule like audit, metric rules...
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.RuleBase#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.RuleBase#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getRuleBase()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface RuleBase extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * A human readable name of this rule
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getRuleBase_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.RuleBase#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The detailed description of this rule semantics
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getRuleBase_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.RuleBase#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-} // RuleBase
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Severity.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Severity.java
deleted file mode 100644
index e12c2297104..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/Severity.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Severity</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getSeverity()
- * @model
- * @generated
- */
-public enum Severity implements Enumerator
-{
-	/**
-	 * The '<em><b>INFO</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #INFO
-	 * @generated
-	 * @ordered
-	 */
-	INFO_LITERAL(0, "INFO", "INFO"),
-	/**
-	 * The '<em><b>WARNING</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #WARNING
-	 * @generated
-	 * @ordered
-	 */
-	WARNING_LITERAL(1, "WARNING", "WARNING"),
-	/**
-	 * The '<em><b>ERROR</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ERROR
-	 * @generated
-	 * @ordered
-	 */
-	ERROR_LITERAL(2, "ERROR", "ERROR");
-	/**
-	 * The '<em><b>INFO</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>INFO</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #INFO_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int INFO = 0;
-
-	/**
-	 * The '<em><b>WARNING</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>WARNING</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #WARNING_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int WARNING = 1;
-
-	/**
-	 * The '<em><b>ERROR</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ERROR</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ERROR_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ERROR = 2;
-
-	/**
-	 * An array of all the '<em><b>Severity</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final Severity[] VALUES_ARRAY =
-		new Severity[] {
-			INFO_LITERAL,
-			WARNING_LITERAL,
-			ERROR_LITERAL,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>Severity</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<Severity> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Severity</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Severity get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Severity result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Severity</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Severity getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			Severity result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Severity</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static Severity get(int value) {
-		switch (value) {
-			case INFO: return INFO_LITERAL;
-			case WARNING: return WARNING_LITERAL;
-			case ERROR: return ERROR_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private Severity(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ToolOwner.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ToolOwner.java
deleted file mode 100644
index fb9b825c6a6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ToolOwner.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool Owner</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ToolOwner#getTool <em>Tool</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getToolOwner()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface ToolOwner extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Tool</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Way to create this element
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Tool</em>' reference.
-	 * @see #setTool(AbstractTool)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getToolOwner_Tool()
-	 * @model
-	 * @generated
-	 */
-	AbstractTool getTool();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ToolOwner#getTool <em>Tool</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tool</em>' reference.
-	 * @see #getTool()
-	 * @generated
-	 */
-	void setTool(AbstractTool value);
-
-} // ToolOwner
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/TopNodeReference.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/TopNodeReference.java
deleted file mode 100644
index 8ab9c8baafa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/TopNodeReference.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Top Node Reference</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.TopNodeReference#getOwnedChild <em>Owned Child</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getTopNodeReference()
- * @model
- * @generated
- */
-public interface TopNodeReference extends NodeReference {
-	/**
-	 * Returns the value of the '<em><b>Owned Child</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Owned Child</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Owned Child</em>' containment reference.
-	 * @see #setOwnedChild(NodeMapping)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getTopNodeReference_OwnedChild()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	NodeMapping getOwnedChild();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.TopNodeReference#getOwnedChild <em>Owned Child</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Owned Child</em>' containment reference.
-	 * @see #getOwnedChild()
-	 * @generated
-	 */
-	void setOwnedChild(NodeMapping value);
-
-} // TopNodeReference
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ValueExpression.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ValueExpression.java
deleted file mode 100644
index 2dc47aa1a0e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/ValueExpression.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Value Expression</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Expression as a textual statement which results in a value when evaluated in a context
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ValueExpression#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ValueExpression#getLanguage <em>Language</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.ValueExpression#getLangName <em>Lang Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getValueExpression()
- * @model annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='ValueSpec'"
- * @generated
- */
-public interface ValueExpression extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Body</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * The text of the expression
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Body</em>' attribute.
-	 * @see #setBody(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getValueExpression_Body()
-	 * @model required="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='body'"
-	 * @generated
-	 */
-	String getBody();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ValueExpression#getBody <em>Body</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Body</em>' attribute.
-	 * @see #getBody()
-	 * @generated
-	 */
-	void setBody(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Language</b></em>' attribute.
-	 * The default value is <code>"ocl"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.mappings.Language}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Specifies the language in which the expression is stated
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Language</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.Language
-	 * @see #setLanguage(Language)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getValueExpression_Language()
-	 * @model default="ocl" required="true"
-	 * @generated
-	 */
-	Language getLanguage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.ValueExpression#getLanguage <em>Language</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Language</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.Language
-	 * @see #getLanguage()
-	 * @generated
-	 */
-	void setLanguage(Language value);
-
-	/**
-	 * Returns the value of the '<em><b>Lang Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lang Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lang Name</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getValueExpression_LangName()
-	 * @model transient="true" changeable="false" volatile="true" derived="true"
-	 *        annotation="http://www.eclipse.org/gmf/2005/constraints/meta def='lang'"
-	 * @generated
-	 */
-	String getLangName();
-
-} // ValueExpression
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/VisualEffectMapping.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/VisualEffectMapping.java
deleted file mode 100644
index 7816dedb1eb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/VisualEffectMapping.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.gmfgraph.Pin;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Visual Effect Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getDiagramPin <em>Diagram Pin</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getOclExpression <em>Ocl Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getParentMapEntry <em>Parent Map Entry</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getVisualEffectMapping()
- * @model
- * @generated
- */
-public interface VisualEffectMapping extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Diagram Pin</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Diagram Pin</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Diagram Pin</em>' reference.
-	 * @see #setDiagramPin(Pin)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getVisualEffectMapping_DiagramPin()
-	 * @model required="true"
-	 * @generated
-	 */
-	Pin getDiagramPin();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getDiagramPin <em>Diagram Pin</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Diagram Pin</em>' reference.
-	 * @see #getDiagramPin()
-	 * @generated
-	 */
-	void setDiagramPin(Pin value);
-
-	/**
-	 * Returns the value of the '<em><b>Ocl Expression</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ocl Expression</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ocl Expression</em>' attribute.
-	 * @see #setOclExpression(String)
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getVisualEffectMapping_OclExpression()
-	 * @model
-	 * @generated
-	 */
-	String getOclExpression();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping#getOclExpression <em>Ocl Expression</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ocl Expression</em>' attribute.
-	 * @see #getOclExpression()
-	 * @generated
-	 */
-	void setOclExpression(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Parent Map Entry</b></em>' container reference.
-	 * It is bidirectional and its opposite is '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry#getVisualEffects <em>Visual Effects</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Parent Map Entry</em>' container reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Parent Map Entry</em>' container reference.
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#getVisualEffectMapping_ParentMapEntry()
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry#getVisualEffects
-	 * @model opposite="visualEffects" required="true" transient="false" changeable="false"
-	 * @generated
-	 */
-	MappingEntry getParentMapEntry();
-
-} // VisualEffectMapping
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditContainerImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditContainerImpl.java
deleted file mode 100644
index cb52acbe983..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditContainerImpl.java
+++ /dev/null
@@ -1,469 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.AuditRule;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Audit Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditContainerImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditContainerImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditContainerImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditContainerImpl#getParentContainer <em>Parent Container</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditContainerImpl#getAudits <em>Audits</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditContainerImpl#getChildContainers <em>Child Containers</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AuditContainerImpl extends EObjectImpl implements AuditContainer {
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getAudits() <em>Audits</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAudits()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<AuditRule> audits;
-
-	/**
-	 * The cached value of the '{@link #getChildContainers() <em>Child Containers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildContainers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<AuditContainer> childContainers;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AuditContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getAuditContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_CONTAINER__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_CONTAINER__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_CONTAINER__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditContainer getParentContainer() {
-		if (eContainerFeatureID() != GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER) return null;
-		return (AuditContainer)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetParentContainer(AuditContainer newParentContainer, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newParentContainer, GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentContainer(AuditContainer newParentContainer) {
-		if (newParentContainer != eInternalContainer() || (eContainerFeatureID() != GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER && newParentContainer != null)) {
-			if (EcoreUtil.isAncestor(this, newParentContainer))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newParentContainer != null)
-				msgs = ((InternalEObject)newParentContainer).eInverseAdd(this, GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS, AuditContainer.class, msgs);
-			msgs = basicSetParentContainer(newParentContainer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER, newParentContainer, newParentContainer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<AuditRule> getAudits() {
-		if (audits == null) {
-			audits = new EObjectContainmentWithInverseEList<AuditRule>(AuditRule.class, this, GMFMapPackage.AUDIT_CONTAINER__AUDITS, GMFMapPackage.AUDIT_RULE__CONTAINER);
-		}
-		return audits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<AuditContainer> getChildContainers() {
-		if (childContainers == null) {
-			childContainers = new EObjectContainmentWithInverseEList<AuditContainer>(AuditContainer.class, this, GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS, GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER);
-		}
-		return childContainers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetParentContainer((AuditContainer)otherEnd, msgs);
-			case GMFMapPackage.AUDIT_CONTAINER__AUDITS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getAudits()).basicAdd(otherEnd, msgs);
-			case GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildContainers()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER:
-				return basicSetParentContainer(null, msgs);
-			case GMFMapPackage.AUDIT_CONTAINER__AUDITS:
-				return ((InternalEList<?>)getAudits()).basicRemove(otherEnd, msgs);
-			case GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS:
-				return ((InternalEList<?>)getChildContainers()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS, AuditContainer.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_CONTAINER__ID:
-				return getId();
-			case GMFMapPackage.AUDIT_CONTAINER__NAME:
-				return getName();
-			case GMFMapPackage.AUDIT_CONTAINER__DESCRIPTION:
-				return getDescription();
-			case GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER:
-				return getParentContainer();
-			case GMFMapPackage.AUDIT_CONTAINER__AUDITS:
-				return getAudits();
-			case GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS:
-				return getChildContainers();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_CONTAINER__ID:
-				setId((String)newValue);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__NAME:
-				setName((String)newValue);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER:
-				setParentContainer((AuditContainer)newValue);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__AUDITS:
-				getAudits().clear();
-				getAudits().addAll((Collection<? extends AuditRule>)newValue);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS:
-				getChildContainers().clear();
-				getChildContainers().addAll((Collection<? extends AuditContainer>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_CONTAINER__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER:
-				setParentContainer((AuditContainer)null);
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__AUDITS:
-				getAudits().clear();
-				return;
-			case GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS:
-				getChildContainers().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_CONTAINER__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case GMFMapPackage.AUDIT_CONTAINER__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFMapPackage.AUDIT_CONTAINER__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case GMFMapPackage.AUDIT_CONTAINER__PARENT_CONTAINER:
-				return getParentContainer() != null;
-			case GMFMapPackage.AUDIT_CONTAINER__AUDITS:
-				return audits != null && !audits.isEmpty();
-			case GMFMapPackage.AUDIT_CONTAINER__CHILD_CONTAINERS:
-				return childContainers != null && !childContainers.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (id: ");
-		result.append(id);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AuditContainerImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditRuleImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditRuleImpl.java
deleted file mode 100644
index 4dd589d9e04..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditRuleImpl.java
+++ /dev/null
@@ -1,683 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.AuditRule;
-import org.eclipse.papyrus.gmf.mappings.Auditable;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.Severity;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Audit Rule</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#getId <em>Id</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#getRule <em>Rule</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#getSeverity <em>Severity</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#isUseInLiveMode <em>Use In Live Mode</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#getMessage <em>Message</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditRuleImpl#getContainer <em>Container</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AuditRuleImpl extends EObjectImpl implements AuditRule {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getId() <em>Id</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getId()
-	 * @generated
-	 * @ordered
-	 */
-	protected String id = ID_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRule() <em>Rule</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRule()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint rule;
-
-	/**
-	 * The cached value of the '{@link #getTarget() <em>Target</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTarget()
-	 * @generated
-	 * @ordered
-	 */
-	protected Auditable target;
-
-	/**
-	 * The default value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeverity()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Severity SEVERITY_EDEFAULT = Severity.ERROR_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getSeverity() <em>Severity</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSeverity()
-	 * @generated
-	 * @ordered
-	 */
-	protected Severity severity = SEVERITY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isUseInLiveMode() <em>Use In Live Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUseInLiveMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean USE_IN_LIVE_MODE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isUseInLiveMode() <em>Use In Live Mode</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isUseInLiveMode()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean useInLiveMode = USE_IN_LIVE_MODE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String MESSAGE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getMessage() <em>Message</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMessage()
-	 * @generated
-	 * @ordered
-	 */
-	protected String message = MESSAGE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AuditRuleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getAuditRule();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getId() {
-		return id;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setId(String newId) {
-		String oldId = id;
-		id = newId;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__ID, oldId, id));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getRule() {
-		return rule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRule(Constraint newRule, NotificationChain msgs) {
-		Constraint oldRule = rule;
-		rule = newRule;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__RULE, oldRule, newRule);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRule(Constraint newRule) {
-		if (newRule != rule) {
-			NotificationChain msgs = null;
-			if (rule != null)
-				msgs = ((InternalEObject)rule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.AUDIT_RULE__RULE, null, msgs);
-			if (newRule != null)
-				msgs = ((InternalEObject)newRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.AUDIT_RULE__RULE, null, msgs);
-			msgs = basicSetRule(newRule, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__RULE, newRule, newRule));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Auditable getTarget() {
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTarget(Auditable newTarget, NotificationChain msgs) {
-		Auditable oldTarget = target;
-		target = newTarget;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__TARGET, oldTarget, newTarget);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTarget(Auditable newTarget) {
-		if (newTarget != target) {
-			NotificationChain msgs = null;
-			if (target != null)
-				msgs = ((InternalEObject)target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.AUDIT_RULE__TARGET, null, msgs);
-			if (newTarget != null)
-				msgs = ((InternalEObject)newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.AUDIT_RULE__TARGET, null, msgs);
-			msgs = basicSetTarget(newTarget, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__TARGET, newTarget, newTarget));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Severity getSeverity() {
-		return severity;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSeverity(Severity newSeverity) {
-		Severity oldSeverity = severity;
-		severity = newSeverity == null ? SEVERITY_EDEFAULT : newSeverity;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__SEVERITY, oldSeverity, severity));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isUseInLiveMode() {
-		return useInLiveMode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUseInLiveMode(boolean newUseInLiveMode) {
-		boolean oldUseInLiveMode = useInLiveMode;
-		useInLiveMode = newUseInLiveMode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__USE_IN_LIVE_MODE, oldUseInLiveMode, useInLiveMode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getMessage() {
-		return message;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMessage(String newMessage) {
-		String oldMessage = message;
-		message = newMessage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__MESSAGE, oldMessage, message));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditContainer getContainer() {
-		if (eContainerFeatureID() != GMFMapPackage.AUDIT_RULE__CONTAINER) return null;
-		return (AuditContainer)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetContainer(AuditContainer newContainer, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newContainer, GMFMapPackage.AUDIT_RULE__CONTAINER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainer(AuditContainer newContainer) {
-		if (newContainer != eInternalContainer() || (eContainerFeatureID() != GMFMapPackage.AUDIT_RULE__CONTAINER && newContainer != null)) {
-			if (EcoreUtil.isAncestor(this, newContainer))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newContainer != null)
-				msgs = ((InternalEObject)newContainer).eInverseAdd(this, GMFMapPackage.AUDIT_CONTAINER__AUDITS, AuditContainer.class, msgs);
-			msgs = basicSetContainer(newContainer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDIT_RULE__CONTAINER, newContainer, newContainer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_RULE__CONTAINER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetContainer((AuditContainer)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_RULE__RULE:
-				return basicSetRule(null, msgs);
-			case GMFMapPackage.AUDIT_RULE__TARGET:
-				return basicSetTarget(null, msgs);
-			case GMFMapPackage.AUDIT_RULE__CONTAINER:
-				return basicSetContainer(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.AUDIT_RULE__CONTAINER:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.AUDIT_CONTAINER__AUDITS, AuditContainer.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_RULE__NAME:
-				return getName();
-			case GMFMapPackage.AUDIT_RULE__DESCRIPTION:
-				return getDescription();
-			case GMFMapPackage.AUDIT_RULE__ID:
-				return getId();
-			case GMFMapPackage.AUDIT_RULE__RULE:
-				return getRule();
-			case GMFMapPackage.AUDIT_RULE__TARGET:
-				return getTarget();
-			case GMFMapPackage.AUDIT_RULE__SEVERITY:
-				return getSeverity();
-			case GMFMapPackage.AUDIT_RULE__USE_IN_LIVE_MODE:
-				return isUseInLiveMode();
-			case GMFMapPackage.AUDIT_RULE__MESSAGE:
-				return getMessage();
-			case GMFMapPackage.AUDIT_RULE__CONTAINER:
-				return getContainer();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_RULE__NAME:
-				setName((String)newValue);
-				return;
-			case GMFMapPackage.AUDIT_RULE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case GMFMapPackage.AUDIT_RULE__ID:
-				setId((String)newValue);
-				return;
-			case GMFMapPackage.AUDIT_RULE__RULE:
-				setRule((Constraint)newValue);
-				return;
-			case GMFMapPackage.AUDIT_RULE__TARGET:
-				setTarget((Auditable)newValue);
-				return;
-			case GMFMapPackage.AUDIT_RULE__SEVERITY:
-				setSeverity((Severity)newValue);
-				return;
-			case GMFMapPackage.AUDIT_RULE__USE_IN_LIVE_MODE:
-				setUseInLiveMode((Boolean)newValue);
-				return;
-			case GMFMapPackage.AUDIT_RULE__MESSAGE:
-				setMessage((String)newValue);
-				return;
-			case GMFMapPackage.AUDIT_RULE__CONTAINER:
-				setContainer((AuditContainer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_RULE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_RULE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_RULE__ID:
-				setId(ID_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_RULE__RULE:
-				setRule((Constraint)null);
-				return;
-			case GMFMapPackage.AUDIT_RULE__TARGET:
-				setTarget((Auditable)null);
-				return;
-			case GMFMapPackage.AUDIT_RULE__SEVERITY:
-				setSeverity(SEVERITY_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_RULE__USE_IN_LIVE_MODE:
-				setUseInLiveMode(USE_IN_LIVE_MODE_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_RULE__MESSAGE:
-				setMessage(MESSAGE_EDEFAULT);
-				return;
-			case GMFMapPackage.AUDIT_RULE__CONTAINER:
-				setContainer((AuditContainer)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.AUDIT_RULE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFMapPackage.AUDIT_RULE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case GMFMapPackage.AUDIT_RULE__ID:
-				return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);
-			case GMFMapPackage.AUDIT_RULE__RULE:
-				return rule != null;
-			case GMFMapPackage.AUDIT_RULE__TARGET:
-				return target != null;
-			case GMFMapPackage.AUDIT_RULE__SEVERITY:
-				return severity != SEVERITY_EDEFAULT;
-			case GMFMapPackage.AUDIT_RULE__USE_IN_LIVE_MODE:
-				return useInLiveMode != USE_IN_LIVE_MODE_EDEFAULT;
-			case GMFMapPackage.AUDIT_RULE__MESSAGE:
-				return MESSAGE_EDEFAULT == null ? message != null : !MESSAGE_EDEFAULT.equals(message);
-			case GMFMapPackage.AUDIT_RULE__CONTAINER:
-				return getContainer() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", id: ");
-		result.append(id);
-		result.append(", severity: ");
-		result.append(severity);
-		result.append(", useInLiveMode: ");
-		result.append(useInLiveMode);
-		result.append(", message: ");
-		result.append(message);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AuditRuleImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditedMetricTargetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditedMetricTargetImpl.java
deleted file mode 100644
index e2e64a66135..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/AuditedMetricTargetImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Audited Metric Target</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.AuditedMetricTargetImpl#getMetric <em>Metric</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AuditedMetricTargetImpl extends EObjectImpl implements AuditedMetricTarget {
-	/**
-	 * The cached value of the '{@link #getMetric() <em>Metric</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMetric()
-	 * @generated
-	 * @ordered
-	 */
-	protected MetricRule metric;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AuditedMetricTargetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getAuditedMetricTarget();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MetricRule getMetric() {
-		if (metric != null && metric.eIsProxy()) {
-			InternalEObject oldMetric = (InternalEObject)metric;
-			metric = (MetricRule)eResolveProxy(oldMetric);
-			if (metric != oldMetric) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.AUDITED_METRIC_TARGET__METRIC, oldMetric, metric));
-			}
-		}
-		return metric;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MetricRule basicGetMetric() {
-		return metric;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMetric(MetricRule newMetric) {
-		MetricRule oldMetric = metric;
-		metric = newMetric;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.AUDITED_METRIC_TARGET__METRIC, oldMetric, metric));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.AUDITED_METRIC_TARGET__METRIC:
-				if (resolve) return getMetric();
-				return basicGetMetric();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.AUDITED_METRIC_TARGET__METRIC:
-				setMetric((MetricRule)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.AUDITED_METRIC_TARGET__METRIC:
-				setMetric((MetricRule)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.AUDITED_METRIC_TARGET__METRIC:
-				return metric != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //AuditedMetricTargetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/CanvasMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/CanvasMappingImpl.java
deleted file mode 100644
index 08589c30812..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/CanvasMappingImpl.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.papyrus.gmf.gmfgraph.Canvas;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.tooldef.MainMenu;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.Toolbar;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Canvas Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CanvasMappingImpl#getDiagramCanvas <em>Diagram Canvas</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CanvasMappingImpl#getDomainModel <em>Domain Model</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CanvasMappingImpl#getDomainMetaElement <em>Domain Meta Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CanvasMappingImpl#getPalette <em>Palette</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CanvasMappingImpl#getMenuContributions <em>Menu Contributions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CanvasMappingImpl#getToolbarContributions <em>Toolbar Contributions</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CanvasMappingImpl extends EObjectImpl implements CanvasMapping {
-	/**
-	 * The cached value of the '{@link #getDiagramCanvas() <em>Diagram Canvas</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagramCanvas()
-	 * @generated
-	 * @ordered
-	 */
-	protected Canvas diagramCanvas;
-
-	/**
-	 * The cached value of the '{@link #getDomainModel() <em>Domain Model</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDomainModel()
-	 * @generated
-	 * @ordered
-	 */
-	protected EPackage domainModel;
-
-	/**
-	 * The cached value of the '{@link #getDomainMetaElement() <em>Domain Meta Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDomainMetaElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClass domainMetaElement;
-
-	/**
-	 * The cached value of the '{@link #getPalette() <em>Palette</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPalette()
-	 * @generated
-	 * @ordered
-	 */
-	protected Palette palette;
-
-	/**
-	 * The cached value of the '{@link #getMenuContributions() <em>Menu Contributions</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMenuContributions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MainMenu> menuContributions;
-
-	/**
-	 * The cached value of the '{@link #getToolbarContributions() <em>Toolbar Contributions</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolbarContributions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Toolbar> toolbarContributions;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CanvasMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getCanvasMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Canvas getDiagramCanvas() {
-		if (diagramCanvas != null && diagramCanvas.eIsProxy()) {
-			InternalEObject oldDiagramCanvas = (InternalEObject)diagramCanvas;
-			diagramCanvas = (Canvas)eResolveProxy(oldDiagramCanvas);
-			if (diagramCanvas != oldDiagramCanvas) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.CANVAS_MAPPING__DIAGRAM_CANVAS, oldDiagramCanvas, diagramCanvas));
-			}
-		}
-		return diagramCanvas;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Canvas basicGetDiagramCanvas() {
-		return diagramCanvas;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiagramCanvas(Canvas newDiagramCanvas) {
-		Canvas oldDiagramCanvas = diagramCanvas;
-		diagramCanvas = newDiagramCanvas;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CANVAS_MAPPING__DIAGRAM_CANVAS, oldDiagramCanvas, diagramCanvas));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EPackage getDomainModel() {
-		if (domainModel != null && domainModel.eIsProxy()) {
-			InternalEObject oldDomainModel = (InternalEObject)domainModel;
-			domainModel = (EPackage)eResolveProxy(oldDomainModel);
-			if (domainModel != oldDomainModel) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.CANVAS_MAPPING__DOMAIN_MODEL, oldDomainModel, domainModel));
-			}
-		}
-		return domainModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EPackage basicGetDomainModel() {
-		return domainModel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDomainModel(EPackage newDomainModel) {
-		EPackage oldDomainModel = domainModel;
-		domainModel = newDomainModel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CANVAS_MAPPING__DOMAIN_MODEL, oldDomainModel, domainModel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDomainMetaElement() {
-		if (domainMetaElement != null && domainMetaElement.eIsProxy()) {
-			InternalEObject oldDomainMetaElement = (InternalEObject)domainMetaElement;
-			domainMetaElement = (EClass)eResolveProxy(oldDomainMetaElement);
-			if (domainMetaElement != oldDomainMetaElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.CANVAS_MAPPING__DOMAIN_META_ELEMENT, oldDomainMetaElement, domainMetaElement));
-			}
-		}
-		return domainMetaElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass basicGetDomainMetaElement() {
-		return domainMetaElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDomainMetaElement(EClass newDomainMetaElement) {
-		EClass oldDomainMetaElement = domainMetaElement;
-		domainMetaElement = newDomainMetaElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CANVAS_MAPPING__DOMAIN_META_ELEMENT, oldDomainMetaElement, domainMetaElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Palette getPalette() {
-		if (palette != null && palette.eIsProxy()) {
-			InternalEObject oldPalette = (InternalEObject)palette;
-			palette = (Palette)eResolveProxy(oldPalette);
-			if (palette != oldPalette) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.CANVAS_MAPPING__PALETTE, oldPalette, palette));
-			}
-		}
-		return palette;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Palette basicGetPalette() {
-		return palette;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPalette(Palette newPalette) {
-		Palette oldPalette = palette;
-		palette = newPalette;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CANVAS_MAPPING__PALETTE, oldPalette, palette));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<MainMenu> getMenuContributions() {
-		if (menuContributions == null) {
-			menuContributions = new EObjectResolvingEList<MainMenu>(MainMenu.class, this, GMFMapPackage.CANVAS_MAPPING__MENU_CONTRIBUTIONS);
-		}
-		return menuContributions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Toolbar> getToolbarContributions() {
-		if (toolbarContributions == null) {
-			toolbarContributions = new EObjectResolvingEList<Toolbar>(Toolbar.class, this, GMFMapPackage.CANVAS_MAPPING__TOOLBAR_CONTRIBUTIONS);
-		}
-		return toolbarContributions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.CANVAS_MAPPING__DIAGRAM_CANVAS:
-				if (resolve) return getDiagramCanvas();
-				return basicGetDiagramCanvas();
-			case GMFMapPackage.CANVAS_MAPPING__DOMAIN_MODEL:
-				if (resolve) return getDomainModel();
-				return basicGetDomainModel();
-			case GMFMapPackage.CANVAS_MAPPING__DOMAIN_META_ELEMENT:
-				if (resolve) return getDomainMetaElement();
-				return basicGetDomainMetaElement();
-			case GMFMapPackage.CANVAS_MAPPING__PALETTE:
-				if (resolve) return getPalette();
-				return basicGetPalette();
-			case GMFMapPackage.CANVAS_MAPPING__MENU_CONTRIBUTIONS:
-				return getMenuContributions();
-			case GMFMapPackage.CANVAS_MAPPING__TOOLBAR_CONTRIBUTIONS:
-				return getToolbarContributions();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.CANVAS_MAPPING__DIAGRAM_CANVAS:
-				setDiagramCanvas((Canvas)newValue);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__DOMAIN_MODEL:
-				setDomainModel((EPackage)newValue);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__DOMAIN_META_ELEMENT:
-				setDomainMetaElement((EClass)newValue);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__PALETTE:
-				setPalette((Palette)newValue);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__MENU_CONTRIBUTIONS:
-				getMenuContributions().clear();
-				getMenuContributions().addAll((Collection<? extends MainMenu>)newValue);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__TOOLBAR_CONTRIBUTIONS:
-				getToolbarContributions().clear();
-				getToolbarContributions().addAll((Collection<? extends Toolbar>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.CANVAS_MAPPING__DIAGRAM_CANVAS:
-				setDiagramCanvas((Canvas)null);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__DOMAIN_MODEL:
-				setDomainModel((EPackage)null);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__DOMAIN_META_ELEMENT:
-				setDomainMetaElement((EClass)null);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__PALETTE:
-				setPalette((Palette)null);
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__MENU_CONTRIBUTIONS:
-				getMenuContributions().clear();
-				return;
-			case GMFMapPackage.CANVAS_MAPPING__TOOLBAR_CONTRIBUTIONS:
-				getToolbarContributions().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.CANVAS_MAPPING__DIAGRAM_CANVAS:
-				return diagramCanvas != null;
-			case GMFMapPackage.CANVAS_MAPPING__DOMAIN_MODEL:
-				return domainModel != null;
-			case GMFMapPackage.CANVAS_MAPPING__DOMAIN_META_ELEMENT:
-				return domainMetaElement != null;
-			case GMFMapPackage.CANVAS_MAPPING__PALETTE:
-				return palette != null;
-			case GMFMapPackage.CANVAS_MAPPING__MENU_CONTRIBUTIONS:
-				return menuContributions != null && !menuContributions.isEmpty();
-			case GMFMapPackage.CANVAS_MAPPING__TOOLBAR_CONTRIBUTIONS:
-				return toolbarContributions != null && !toolbarContributions.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //CanvasMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ChildReferenceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ChildReferenceImpl.java
deleted file mode 100644
index f5b8dda052f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ChildReferenceImpl.java
+++ /dev/null
@@ -1,434 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Child Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ChildReferenceImpl#getParentNode <em>Parent Node</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ChildReferenceImpl#getCompartment <em>Compartment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ChildReferenceImpl#getOwnedChild <em>Owned Child</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ChildReferenceImpl#getReferencedChild <em>Referenced Child</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ChildReferenceImpl extends NodeReferenceImpl implements ChildReference {
-	/**
-	 * The cached value of the '{@link #getCompartment() <em>Compartment</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompartment()
-	 * @generated
-	 * @ordered
-	 */
-	protected CompartmentMapping compartment;
-
-	/**
-	 * The cached value of the '{@link #getOwnedChild() <em>Owned Child</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOwnedChild()
-	 * @generated
-	 * @ordered
-	 */
-	protected NodeMapping ownedChild;
-
-	/**
-	 * The cached value of the '{@link #getReferencedChild() <em>Referenced Child</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getReferencedChild()
-	 * @generated
-	 * @ordered
-	 */
-	protected NodeMapping referencedChild;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ChildReferenceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getChildReference();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeMapping getParentNode() {
-		if (eContainerFeatureID() != GMFMapPackage.CHILD_REFERENCE__PARENT_NODE) return null;
-		return (NodeMapping)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetParentNode(NodeMapping newParentNode, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newParentNode, GMFMapPackage.CHILD_REFERENCE__PARENT_NODE, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentNode(NodeMapping newParentNode) {
-		if (newParentNode != eInternalContainer() || (eContainerFeatureID() != GMFMapPackage.CHILD_REFERENCE__PARENT_NODE && newParentNode != null)) {
-			if (EcoreUtil.isAncestor(this, newParentNode))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newParentNode != null)
-				msgs = ((InternalEObject)newParentNode).eInverseAdd(this, GMFMapPackage.NODE_MAPPING__CHILDREN, NodeMapping.class, msgs);
-			msgs = basicSetParentNode(newParentNode, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CHILD_REFERENCE__PARENT_NODE, newParentNode, newParentNode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompartmentMapping getCompartment() {
-		if (compartment != null && compartment.eIsProxy()) {
-			InternalEObject oldCompartment = (InternalEObject)compartment;
-			compartment = (CompartmentMapping)eResolveProxy(oldCompartment);
-			if (compartment != oldCompartment) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.CHILD_REFERENCE__COMPARTMENT, oldCompartment, compartment));
-			}
-		}
-		return compartment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompartmentMapping basicGetCompartment() {
-		return compartment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCompartment(CompartmentMapping newCompartment, NotificationChain msgs) {
-		CompartmentMapping oldCompartment = compartment;
-		compartment = newCompartment;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.CHILD_REFERENCE__COMPARTMENT, oldCompartment, newCompartment);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCompartment(CompartmentMapping newCompartment) {
-		if (newCompartment != compartment) {
-			NotificationChain msgs = null;
-			if (compartment != null)
-				msgs = ((InternalEObject)compartment).eInverseRemove(this, GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN, CompartmentMapping.class, msgs);
-			if (newCompartment != null)
-				msgs = ((InternalEObject)newCompartment).eInverseAdd(this, GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN, CompartmentMapping.class, msgs);
-			msgs = basicSetCompartment(newCompartment, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CHILD_REFERENCE__COMPARTMENT, newCompartment, newCompartment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeMapping getOwnedChild() {
-		return ownedChild;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOwnedChild(NodeMapping newOwnedChild, NotificationChain msgs) {
-		NodeMapping oldOwnedChild = ownedChild;
-		ownedChild = newOwnedChild;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD, oldOwnedChild, newOwnedChild);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOwnedChild(NodeMapping newOwnedChild) {
-		if (newOwnedChild != ownedChild) {
-			NotificationChain msgs = null;
-			if (ownedChild != null)
-				msgs = ((InternalEObject)ownedChild).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD, null, msgs);
-			if (newOwnedChild != null)
-				msgs = ((InternalEObject)newOwnedChild).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD, null, msgs);
-			msgs = basicSetOwnedChild(newOwnedChild, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD, newOwnedChild, newOwnedChild));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeMapping getReferencedChild() {
-		if (referencedChild != null && referencedChild.eIsProxy()) {
-			InternalEObject oldReferencedChild = (InternalEObject)referencedChild;
-			referencedChild = (NodeMapping)eResolveProxy(oldReferencedChild);
-			if (referencedChild != oldReferencedChild) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD, oldReferencedChild, referencedChild));
-			}
-		}
-		return referencedChild;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeMapping basicGetReferencedChild() {
-		return referencedChild;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReferencedChild(NodeMapping newReferencedChild) {
-		NodeMapping oldReferencedChild = referencedChild;
-		referencedChild = newReferencedChild;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD, oldReferencedChild, referencedChild));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetParentNode((NodeMapping)otherEnd, msgs);
-			case GMFMapPackage.CHILD_REFERENCE__COMPARTMENT:
-				if (compartment != null)
-					msgs = ((InternalEObject)compartment).eInverseRemove(this, GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN, CompartmentMapping.class, msgs);
-				return basicSetCompartment((CompartmentMapping)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
-				return basicSetParentNode(null, msgs);
-			case GMFMapPackage.CHILD_REFERENCE__COMPARTMENT:
-				return basicSetCompartment(null, msgs);
-			case GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD:
-				return basicSetOwnedChild(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.NODE_MAPPING__CHILDREN, NodeMapping.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
-				return getParentNode();
-			case GMFMapPackage.CHILD_REFERENCE__COMPARTMENT:
-				if (resolve) return getCompartment();
-				return basicGetCompartment();
-			case GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD:
-				return getOwnedChild();
-			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
-				if (resolve) return getReferencedChild();
-				return basicGetReferencedChild();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
-				setParentNode((NodeMapping)newValue);
-				return;
-			case GMFMapPackage.CHILD_REFERENCE__COMPARTMENT:
-				setCompartment((CompartmentMapping)newValue);
-				return;
-			case GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD:
-				setOwnedChild((NodeMapping)newValue);
-				return;
-			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
-				setReferencedChild((NodeMapping)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
-				setParentNode((NodeMapping)null);
-				return;
-			case GMFMapPackage.CHILD_REFERENCE__COMPARTMENT:
-				setCompartment((CompartmentMapping)null);
-				return;
-			case GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD:
-				setOwnedChild((NodeMapping)null);
-				return;
-			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
-				setReferencedChild((NodeMapping)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.CHILD_REFERENCE__PARENT_NODE:
-				return getParentNode() != null;
-			case GMFMapPackage.CHILD_REFERENCE__COMPARTMENT:
-				return compartment != null;
-			case GMFMapPackage.CHILD_REFERENCE__OWNED_CHILD:
-				return ownedChild != null;
-			case GMFMapPackage.CHILD_REFERENCE__REFERENCED_CHILD:
-				return referencedChild != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	public NodeMapping getChild() {
-		if (getOwnedChild() != null) {
-			return getOwnedChild();
-		}
-		return getReferencedChild();
-	}
-
-	public boolean isSetChild() {
-		return getOwnedChild() != null || getReferencedChild() != null;
-	}
-} //ChildReferenceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/CompartmentMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/CompartmentMappingImpl.java
deleted file mode 100644
index 855950a7614..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/CompartmentMappingImpl.java
+++ /dev/null
@@ -1,279 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.Compartment;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Compartment Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CompartmentMappingImpl#getCompartment <em>Compartment</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CompartmentMappingImpl#getParentNode <em>Parent Node</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.CompartmentMappingImpl#getChildren <em>Children</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class CompartmentMappingImpl extends EObjectImpl implements CompartmentMapping {
-	/**
-	 * The cached value of the '{@link #getCompartment() <em>Compartment</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompartment()
-	 * @generated
-	 * @ordered
-	 */
-	protected Compartment compartment;
-
-	/**
-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildren()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ChildReference> children;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CompartmentMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getCompartmentMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Compartment getCompartment() {
-		if (compartment != null && compartment.eIsProxy()) {
-			InternalEObject oldCompartment = (InternalEObject)compartment;
-			compartment = (Compartment)eResolveProxy(oldCompartment);
-			if (compartment != oldCompartment) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.COMPARTMENT_MAPPING__COMPARTMENT, oldCompartment, compartment));
-			}
-		}
-		return compartment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Compartment basicGetCompartment() {
-		return compartment;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCompartment(Compartment newCompartment) {
-		Compartment oldCompartment = compartment;
-		compartment = newCompartment;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.COMPARTMENT_MAPPING__COMPARTMENT, oldCompartment, compartment));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeMapping getParentNode() {
-		if (eContainerFeatureID() != GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE) return null;
-		return (NodeMapping)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ChildReference> getChildren() {
-		if (children == null) {
-			children = new EObjectWithInverseResolvingEList<ChildReference>(ChildReference.class, this, GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN, GMFMapPackage.CHILD_REFERENCE__COMPARTMENT);
-		}
-		return children;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return eBasicSetContainer(otherEnd, GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE, msgs);
-			case GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE:
-				return eBasicSetContainer(null, GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE, msgs);
-			case GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN:
-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.NODE_MAPPING__COMPARTMENTS, NodeMapping.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.COMPARTMENT_MAPPING__COMPARTMENT:
-				if (resolve) return getCompartment();
-				return basicGetCompartment();
-			case GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE:
-				return getParentNode();
-			case GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN:
-				return getChildren();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.COMPARTMENT_MAPPING__COMPARTMENT:
-				setCompartment((Compartment)newValue);
-				return;
-			case GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN:
-				getChildren().clear();
-				getChildren().addAll((Collection<? extends ChildReference>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.COMPARTMENT_MAPPING__COMPARTMENT:
-				setCompartment((Compartment)null);
-				return;
-			case GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN:
-				getChildren().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.COMPARTMENT_MAPPING__COMPARTMENT:
-				return compartment != null;
-			case GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE:
-				return getParentNode() != null;
-			case GMFMapPackage.COMPARTMENT_MAPPING__CHILDREN:
-				return children != null && !children.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //CompartmentMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ConstraintImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ConstraintImpl.java
deleted file mode 100644
index fa666ade6ed..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ConstraintImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Constraint</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ConstraintImpl extends ValueExpressionImpl implements Constraint {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ConstraintImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getConstraint();
-	}
-
-} //ConstraintImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DesignLabelMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DesignLabelMappingImpl.java
deleted file mode 100644
index 6f2969e41b0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DesignLabelMappingImpl.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.mappings.DesignLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Design Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DesignLabelMappingImpl extends LabelMappingImpl implements DesignLabelMapping {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DesignLabelMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getDesignLabelMapping();
-	}
-
-} //DesignLabelMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DiagramElementTargetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DiagramElementTargetImpl.java
deleted file mode 100644
index f318bc40d05..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DiagramElementTargetImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.DiagramElementTarget;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Diagram Element Target</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.DiagramElementTargetImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DiagramElementTargetImpl extends EObjectImpl implements DiagramElementTarget {
-	/**
-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected MappingEntry element;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DiagramElementTargetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getDiagramElementTarget();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MappingEntry getElement() {
-		if (element != null && element.eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject)element;
-			element = (MappingEntry)eResolveProxy(oldElement);
-			if (element != oldElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.DIAGRAM_ELEMENT_TARGET__ELEMENT, oldElement, element));
-			}
-		}
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MappingEntry basicGetElement() {
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElement(MappingEntry newElement) {
-		MappingEntry oldElement = element;
-		element = newElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.DIAGRAM_ELEMENT_TARGET__ELEMENT, oldElement, element));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.DIAGRAM_ELEMENT_TARGET__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.DIAGRAM_ELEMENT_TARGET__ELEMENT:
-				setElement((MappingEntry)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.DIAGRAM_ELEMENT_TARGET__ELEMENT:
-				setElement((MappingEntry)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.DIAGRAM_ELEMENT_TARGET__ELEMENT:
-				return element != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DiagramElementTargetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DomainAttributeTargetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DomainAttributeTargetImpl.java
deleted file mode 100644
index 451702da9b5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DomainAttributeTargetImpl.java
+++ /dev/null
@@ -1,240 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DomainAttributeTargetImpl.java,v 1.4 2010/03/01 20:35:29 atikhomirov Exp $
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Domain Attribute Target</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.DomainAttributeTargetImpl#getAttribute <em>Attribute</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.DomainAttributeTargetImpl#isNullAsError <em>Null As Error</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DomainAttributeTargetImpl extends EObjectImpl implements DomainAttributeTarget {
-	/**
-	 * The cached value of the '{@link #getAttribute() <em>Attribute</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAttribute()
-	 * @generated
-	 * @ordered
-	 */
-	protected EAttribute attribute;
-
-	/**
-	 * The default value of the '{@link #isNullAsError() <em>Null As Error</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNullAsError()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean NULL_AS_ERROR_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isNullAsError() <em>Null As Error</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isNullAsError()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean nullAsError = NULL_AS_ERROR_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DomainAttributeTargetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getDomainAttributeTarget();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAttribute() {
-		if (attribute != null && attribute.eIsProxy()) {
-			InternalEObject oldAttribute = (InternalEObject)attribute;
-			attribute = (EAttribute)eResolveProxy(oldAttribute);
-			if (attribute != oldAttribute) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__ATTRIBUTE, oldAttribute, attribute));
-			}
-		}
-		return attribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute basicGetAttribute() {
-		return attribute;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAttribute(EAttribute newAttribute) {
-		EAttribute oldAttribute = attribute;
-		attribute = newAttribute;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__ATTRIBUTE, oldAttribute, attribute));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isNullAsError() {
-		return nullAsError;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNullAsError(boolean newNullAsError) {
-		boolean oldNullAsError = nullAsError;
-		nullAsError = newNullAsError;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__NULL_AS_ERROR, oldNullAsError, nullAsError));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__ATTRIBUTE:
-				if (resolve) return getAttribute();
-				return basicGetAttribute();
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__NULL_AS_ERROR:
-				return isNullAsError();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__ATTRIBUTE:
-				setAttribute((EAttribute)newValue);
-				return;
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__NULL_AS_ERROR:
-				setNullAsError((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__ATTRIBUTE:
-				setAttribute((EAttribute)null);
-				return;
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__NULL_AS_ERROR:
-				setNullAsError(NULL_AS_ERROR_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__ATTRIBUTE:
-				return attribute != null;
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET__NULL_AS_ERROR:
-				return nullAsError != NULL_AS_ERROR_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (nullAsError: ");
-		result.append(nullAsError);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DomainAttributeTargetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DomainElementTargetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DomainElementTargetImpl.java
deleted file mode 100644
index 91f80816828..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/DomainElementTargetImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.DomainElementTarget;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Domain Element Target</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.DomainElementTargetImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DomainElementTargetImpl extends EObjectImpl implements DomainElementTarget {
-	/**
-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClass element;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DomainElementTargetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getDomainElementTarget();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElement() {
-		if (element != null && element.eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject)element;
-			element = (EClass)eResolveProxy(oldElement);
-			if (element != oldElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.DOMAIN_ELEMENT_TARGET__ELEMENT, oldElement, element));
-			}
-		}
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass basicGetElement() {
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElement(EClass newElement) {
-		EClass oldElement = element;
-		element = newElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.DOMAIN_ELEMENT_TARGET__ELEMENT, oldElement, element));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.DOMAIN_ELEMENT_TARGET__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.DOMAIN_ELEMENT_TARGET__ELEMENT:
-				setElement((EClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.DOMAIN_ELEMENT_TARGET__ELEMENT:
-				setElement((EClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.DOMAIN_ELEMENT_TARGET__ELEMENT:
-				return element != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //DomainElementTargetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ExpressionLabelMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ExpressionLabelMappingImpl.java
deleted file mode 100644
index 0128e6a3784..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ExpressionLabelMappingImpl.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Expression Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ExpressionLabelMappingImpl#getViewExpression <em>View Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ExpressionLabelMappingImpl#getEditExpression <em>Edit Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ExpressionLabelMappingImpl#getValidateExpression <em>Validate Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ExpressionLabelMappingImpl extends LabelMappingImpl implements ExpressionLabelMapping {
-	/**
-	 * The cached value of the '{@link #getViewExpression() <em>View Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getViewExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected ValueExpression viewExpression;
-
-	/**
-	 * The cached value of the '{@link #getEditExpression() <em>Edit Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected ValueExpression editExpression;
-
-	/**
-	 * The cached value of the '{@link #getValidateExpression() <em>Validate Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValidateExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint validateExpression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ExpressionLabelMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getExpressionLabelMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueExpression getViewExpression() {
-		return viewExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetViewExpression(ValueExpression newViewExpression, NotificationChain msgs) {
-		ValueExpression oldViewExpression = viewExpression;
-		viewExpression = newViewExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION, oldViewExpression, newViewExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setViewExpression(ValueExpression newViewExpression) {
-		if (newViewExpression != viewExpression) {
-			NotificationChain msgs = null;
-			if (viewExpression != null)
-				msgs = ((InternalEObject)viewExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION, null, msgs);
-			if (newViewExpression != null)
-				msgs = ((InternalEObject)newViewExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION, null, msgs);
-			msgs = basicSetViewExpression(newViewExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION, newViewExpression, newViewExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueExpression getEditExpression() {
-		return editExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetEditExpression(ValueExpression newEditExpression, NotificationChain msgs) {
-		ValueExpression oldEditExpression = editExpression;
-		editExpression = newEditExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION, oldEditExpression, newEditExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEditExpression(ValueExpression newEditExpression) {
-		if (newEditExpression != editExpression) {
-			NotificationChain msgs = null;
-			if (editExpression != null)
-				msgs = ((InternalEObject)editExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION, null, msgs);
-			if (newEditExpression != null)
-				msgs = ((InternalEObject)newEditExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION, null, msgs);
-			msgs = basicSetEditExpression(newEditExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION, newEditExpression, newEditExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getValidateExpression() {
-		return validateExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValidateExpression(Constraint newValidateExpression, NotificationChain msgs) {
-		Constraint oldValidateExpression = validateExpression;
-		validateExpression = newValidateExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION, oldValidateExpression, newValidateExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValidateExpression(Constraint newValidateExpression) {
-		if (newValidateExpression != validateExpression) {
-			NotificationChain msgs = null;
-			if (validateExpression != null)
-				msgs = ((InternalEObject)validateExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION, null, msgs);
-			if (newValidateExpression != null)
-				msgs = ((InternalEObject)newValidateExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION, null, msgs);
-			msgs = basicSetValidateExpression(newValidateExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION, newValidateExpression, newValidateExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION:
-				return basicSetViewExpression(null, msgs);
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION:
-				return basicSetEditExpression(null, msgs);
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION:
-				return basicSetValidateExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION:
-				return getViewExpression();
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION:
-				return getEditExpression();
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION:
-				return getValidateExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION:
-				setViewExpression((ValueExpression)newValue);
-				return;
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION:
-				setEditExpression((ValueExpression)newValue);
-				return;
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION:
-				setValidateExpression((Constraint)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION:
-				setViewExpression((ValueExpression)null);
-				return;
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION:
-				setEditExpression((ValueExpression)null);
-				return;
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION:
-				setValidateExpression((Constraint)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION:
-				return viewExpression != null;
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION:
-				return editExpression != null;
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION:
-				return validateExpression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ExpressionLabelMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureInitializerImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureInitializerImpl.java
deleted file mode 100644
index a6ba193d740..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureInitializerImpl.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Initializer</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureInitializerImpl#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureInitializerImpl#getFeatureSeqInitializer <em>Feature Seq Initializer</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class FeatureInitializerImpl extends EObjectImpl implements FeatureInitializer {
-	/**
-	 * The cached value of the '{@link #getFeature() <em>Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature feature;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureInitializerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getFeatureInitializer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature getFeature() {
-		if (feature != null && feature.eIsProxy()) {
-			InternalEObject oldFeature = (InternalEObject)feature;
-			feature = (EStructuralFeature)eResolveProxy(oldFeature);
-			if (feature != oldFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.FEATURE_INITIALIZER__FEATURE, oldFeature, feature));
-			}
-		}
-		return feature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature basicGetFeature() {
-		return feature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFeature(EStructuralFeature newFeature) {
-		EStructuralFeature oldFeature = feature;
-		feature = newFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_INITIALIZER__FEATURE, oldFeature, feature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureSeqInitializer getFeatureSeqInitializer() {
-		if (eContainerFeatureID() != GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER) return null;
-		return (FeatureSeqInitializer)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return eBasicSetContainer(otherEnd, GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER:
-				return eBasicSetContainer(null, GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS, FeatureSeqInitializer.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE:
-				if (resolve) return getFeature();
-				return basicGetFeature();
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER:
-				return getFeatureSeqInitializer();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE:
-				setFeature((EStructuralFeature)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE:
-				setFeature((EStructuralFeature)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE:
-				return feature != null;
-			case GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER:
-				return getFeatureSeqInitializer() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //FeatureInitializerImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureLabelMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureLabelMappingImpl.java
deleted file mode 100644
index 24122cf975c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureLabelMappingImpl.java
+++ /dev/null
@@ -1,468 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl#getFeatures <em>Features</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl#getEditableFeatures <em>Editable Features</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl#getViewPattern <em>View Pattern</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl#getEditorPattern <em>Editor Pattern</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl#getEditPattern <em>Edit Pattern</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl#getViewMethod <em>View Method</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureLabelMappingImpl#getEditMethod <em>Edit Method</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureLabelMappingImpl extends LabelMappingImpl implements FeatureLabelMapping {
-	/**
-	 * The cached value of the '{@link #getFeatures() <em>Features</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFeatures()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EAttribute> features;
-
-	/**
-	 * The cached value of the '{@link #getEditableFeatures() <em>Editable Features</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditableFeatures()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<EAttribute> editableFeatures;
-
-	/**
-	 * The default value of the '{@link #getViewPattern() <em>View Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getViewPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String VIEW_PATTERN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getViewPattern() <em>View Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getViewPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected String viewPattern = VIEW_PATTERN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEditorPattern() <em>Editor Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditorPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EDITOR_PATTERN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEditorPattern() <em>Editor Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditorPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected String editorPattern = EDITOR_PATTERN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEditPattern() <em>Edit Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String EDIT_PATTERN_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getEditPattern() <em>Edit Pattern</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditPattern()
-	 * @generated
-	 * @ordered
-	 */
-	protected String editPattern = EDIT_PATTERN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getViewMethod() <em>View Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getViewMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final LabelTextAccessMethod VIEW_METHOD_EDEFAULT = LabelTextAccessMethod.MESSAGE_FORMAT;
-
-	/**
-	 * The cached value of the '{@link #getViewMethod() <em>View Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getViewMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected LabelTextAccessMethod viewMethod = VIEW_METHOD_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getEditMethod() <em>Edit Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final LabelTextAccessMethod EDIT_METHOD_EDEFAULT = LabelTextAccessMethod.MESSAGE_FORMAT;
-
-	/**
-	 * The cached value of the '{@link #getEditMethod() <em>Edit Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getEditMethod()
-	 * @generated
-	 * @ordered
-	 */
-	protected LabelTextAccessMethod editMethod = EDIT_METHOD_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureLabelMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getFeatureLabelMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<EAttribute> getFeatures() {
-		if (features == null) {
-			features = new EObjectResolvingEList<EAttribute>(EAttribute.class, this, GMFMapPackage.FEATURE_LABEL_MAPPING__FEATURES);
-		}
-		return features;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<EAttribute> getEditableFeatures() {
-		if (editableFeatures == null) {
-			editableFeatures = new EObjectResolvingEList<EAttribute>(EAttribute.class, this, GMFMapPackage.FEATURE_LABEL_MAPPING__EDITABLE_FEATURES);
-		}
-		return editableFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getViewPattern() {
-		return viewPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setViewPattern(String newViewPattern) {
-		String oldViewPattern = viewPattern;
-		viewPattern = newViewPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_PATTERN, oldViewPattern, viewPattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEditorPattern() {
-		return editorPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEditorPattern(String newEditorPattern) {
-		String oldEditorPattern = editorPattern;
-		editorPattern = newEditorPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_LABEL_MAPPING__EDITOR_PATTERN, oldEditorPattern, editorPattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelTextAccessMethod getViewMethod() {
-		return viewMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setViewMethod(LabelTextAccessMethod newViewMethod) {
-		LabelTextAccessMethod oldViewMethod = viewMethod;
-		viewMethod = newViewMethod == null ? VIEW_METHOD_EDEFAULT : newViewMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_METHOD, oldViewMethod, viewMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getEditPattern() {
-		return editPattern;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEditPattern(String newEditPattern) {
-		String oldEditPattern = editPattern;
-		editPattern = newEditPattern;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_PATTERN, oldEditPattern, editPattern));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelTextAccessMethod getEditMethod() {
-		return editMethod;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setEditMethod(LabelTextAccessMethod newEditMethod) {
-		LabelTextAccessMethod oldEditMethod = editMethod;
-		editMethod = newEditMethod == null ? EDIT_METHOD_EDEFAULT : newEditMethod;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_METHOD, oldEditMethod, editMethod));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__FEATURES:
-				return getFeatures();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITABLE_FEATURES:
-				return getEditableFeatures();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_PATTERN:
-				return getViewPattern();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITOR_PATTERN:
-				return getEditorPattern();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_PATTERN:
-				return getEditPattern();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_METHOD:
-				return getViewMethod();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_METHOD:
-				return getEditMethod();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__FEATURES:
-				getFeatures().clear();
-				getFeatures().addAll((Collection<? extends EAttribute>)newValue);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITABLE_FEATURES:
-				getEditableFeatures().clear();
-				getEditableFeatures().addAll((Collection<? extends EAttribute>)newValue);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_PATTERN:
-				setViewPattern((String)newValue);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITOR_PATTERN:
-				setEditorPattern((String)newValue);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_PATTERN:
-				setEditPattern((String)newValue);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_METHOD:
-				setViewMethod((LabelTextAccessMethod)newValue);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_METHOD:
-				setEditMethod((LabelTextAccessMethod)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__FEATURES:
-				getFeatures().clear();
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITABLE_FEATURES:
-				getEditableFeatures().clear();
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_PATTERN:
-				setViewPattern(VIEW_PATTERN_EDEFAULT);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITOR_PATTERN:
-				setEditorPattern(EDITOR_PATTERN_EDEFAULT);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_PATTERN:
-				setEditPattern(EDIT_PATTERN_EDEFAULT);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_METHOD:
-				setViewMethod(VIEW_METHOD_EDEFAULT);
-				return;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_METHOD:
-				setEditMethod(EDIT_METHOD_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__FEATURES:
-				return features != null && !features.isEmpty();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITABLE_FEATURES:
-				return editableFeatures != null && !editableFeatures.isEmpty();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_PATTERN:
-				return VIEW_PATTERN_EDEFAULT == null ? viewPattern != null : !VIEW_PATTERN_EDEFAULT.equals(viewPattern);
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDITOR_PATTERN:
-				return EDITOR_PATTERN_EDEFAULT == null ? editorPattern != null : !EDITOR_PATTERN_EDEFAULT.equals(editorPattern);
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_PATTERN:
-				return EDIT_PATTERN_EDEFAULT == null ? editPattern != null : !EDIT_PATTERN_EDEFAULT.equals(editPattern);
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__VIEW_METHOD:
-				return viewMethod != VIEW_METHOD_EDEFAULT;
-			case GMFMapPackage.FEATURE_LABEL_MAPPING__EDIT_METHOD:
-				return editMethod != EDIT_METHOD_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (viewPattern: ");
-		result.append(viewPattern);
-		result.append(", editorPattern: ");
-		result.append(editorPattern);
-		result.append(", editPattern: ");
-		result.append(editPattern);
-		result.append(", viewMethod: ");
-		result.append(viewMethod);
-		result.append(", editMethod: ");
-		result.append(editMethod);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FeatureLabelMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureSeqInitializerImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureSeqInitializerImpl.java
deleted file mode 100644
index 4703fbaa2a6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureSeqInitializerImpl.java
+++ /dev/null
@@ -1,342 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Seq Initializer</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureSeqInitializerImpl#getMappingEntry <em>Mapping Entry</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureSeqInitializerImpl#getInitializers <em>Initializers</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureSeqInitializerImpl#getElementClass <em>Element Class</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureSeqInitializerImpl#getCreatingInitializer <em>Creating Initializer</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureSeqInitializerImpl extends EObjectImpl implements FeatureSeqInitializer {
-	/**
-	 * The cached value of the '{@link #getInitializers() <em>Initializers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getInitializers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FeatureInitializer> initializers;
-
-	/**
-	 * The cached value of the '{@link #getElementClass() <em>Element Class</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElementClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClass elementClass;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureSeqInitializerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getFeatureSeqInitializer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MappingEntry getMappingEntry() {
-		MappingEntry mappingEntry = basicGetMappingEntry();
-		return mappingEntry != null && mappingEntry.eIsProxy() ? (MappingEntry)eResolveProxy((InternalEObject)mappingEntry) : mappingEntry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public MappingEntry basicGetMappingEntry() {
-		EObject container = eContainer();
-		while(container != null && !(container instanceof MappingEntry)) {
-			container = container.eContainer();
-		}
-		return (container != null) ? (MappingEntry)container : null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<FeatureInitializer> getInitializers() {
-		if (initializers == null) {
-			initializers = new EObjectContainmentWithInverseEList<FeatureInitializer>(FeatureInitializer.class, this, GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS, GMFMapPackage.FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER);
-		}
-		return initializers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public EClass getElementClass() {
-		if(getCreatingInitializer() == null) {
-			return (getMappingEntry() != null) ? getMappingEntry().getDomainContext() : null;
-		}
-		EClass eClass = getElementClassGen();
-		if(eClass != null) {
-			return eClass;
-		}
-		EClassifier eClassifier = null;
-		if(getCreatingInitializer().getFeature() != null) {
-			eClassifier = getCreatingInitializer().getFeature().getEType();			
-		}
-		return (eClassifier instanceof EClass) ? (EClass)eClassifier : null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElementClassGen() {
-		if (elementClass != null && elementClass.eIsProxy()) {
-			InternalEObject oldElementClass = (InternalEObject)elementClass;
-			elementClass = (EClass)eResolveProxy(oldElementClass);
-			if (elementClass != oldElementClass) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS, oldElementClass, elementClass));
-			}
-		}
-		return elementClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass basicGetElementClass() {
-		return elementClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void setElementClass(EClass newElementClass) {
-		if(getCreatingInitializer() == null && eContainer() != null) {
-			return;
-		}
-		setElementClassGen(newElementClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElementClassGen(EClass newElementClass) {
-		EClass oldElementClass = elementClass;
-		elementClass = newElementClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS, oldElementClass, elementClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReferenceNewElementSpec getCreatingInitializer() {
-		if (eContainerFeatureID() != GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER) return null;
-		return (ReferenceNewElementSpec)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getInitializers()).basicAdd(otherEnd, msgs);
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return eBasicSetContainer(otherEnd, GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS:
-				return ((InternalEList<?>)getInitializers()).basicRemove(otherEnd, msgs);
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER:
-				return eBasicSetContainer(null, GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS, ReferenceNewElementSpec.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__MAPPING_ENTRY:
-				if (resolve) return getMappingEntry();
-				return basicGetMappingEntry();
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS:
-				return getInitializers();
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS:
-				if (resolve) return getElementClass();
-				return basicGetElementClass();
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER:
-				return getCreatingInitializer();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS:
-				getInitializers().clear();
-				getInitializers().addAll((Collection<? extends FeatureInitializer>)newValue);
-				return;
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS:
-				setElementClass((EClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS:
-				getInitializers().clear();
-				return;
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS:
-				setElementClass((EClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__MAPPING_ENTRY:
-				return basicGetMappingEntry() != null;
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__INITIALIZERS:
-				return initializers != null && !initializers.isEmpty();
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS:
-				return elementClass != null;
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER:
-				return getCreatingInitializer() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //FeatureSeqInitializerImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureValueSpecImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureValueSpecImpl.java
deleted file mode 100644
index 4c1fbca292c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/FeatureValueSpecImpl.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.mappings.FeatureValueSpec;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Feature Value Spec</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.FeatureValueSpecImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FeatureValueSpecImpl extends FeatureInitializerImpl implements FeatureValueSpec {
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected ValueExpression value;
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FeatureValueSpecImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getFeatureValueSpec();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueExpression getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetValue(ValueExpression newValue, NotificationChain msgs) {
-		ValueExpression oldValue = value;
-		value = newValue;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_VALUE_SPEC__VALUE, oldValue, newValue);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(ValueExpression newValue) {
-		if (newValue != value) {
-			NotificationChain msgs = null;
-			if (value != null)
-				msgs = ((InternalEObject)value).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.FEATURE_VALUE_SPEC__VALUE, null, msgs);
-			if (newValue != null)
-				msgs = ((InternalEObject)newValue).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.FEATURE_VALUE_SPEC__VALUE, null, msgs);
-			msgs = basicSetValue(newValue, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.FEATURE_VALUE_SPEC__VALUE, newValue, newValue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_VALUE_SPEC__VALUE:
-				return basicSetValue(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_VALUE_SPEC__VALUE:
-				return getValue();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_VALUE_SPEC__VALUE:
-				setValue((ValueExpression)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_VALUE_SPEC__VALUE:
-				setValue((ValueExpression)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.FEATURE_VALUE_SPEC__VALUE:
-				return value != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //FeatureValueSpecImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/GMFMapFactoryImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/GMFMapFactoryImpl.java
deleted file mode 100644
index eceb5482f9b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/GMFMapFactoryImpl.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.AuditRule;
-import org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.DesignLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.DiagramElementTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainElementTarget;
-import org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureValueSpec;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod;
-import org.eclipse.papyrus.gmf.mappings.Language;
-import org.eclipse.papyrus.gmf.mappings.LinkConstraints;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NotationElementTarget;
-import org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec;
-import org.eclipse.papyrus.gmf.mappings.Severity;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-import org.eclipse.papyrus.gmf.mappings.VisualEffectMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFMapFactoryImpl extends EFactoryImpl implements GMFMapFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static GMFMapFactory init() {
-		try {
-			GMFMapFactory theGMFMapFactory = (GMFMapFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/gmf/2020/mappings"); 
-			if (theGMFMapFactory != null) {
-				return theGMFMapFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new GMFMapFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case GMFMapPackage.MAPPING: return createMapping();
-			case GMFMapPackage.CHILD_REFERENCE: return createChildReference();
-			case GMFMapPackage.TOP_NODE_REFERENCE: return createTopNodeReference();
-			case GMFMapPackage.NODE_MAPPING: return createNodeMapping();
-			case GMFMapPackage.COMPARTMENT_MAPPING: return createCompartmentMapping();
-			case GMFMapPackage.LINK_MAPPING: return createLinkMapping();
-			case GMFMapPackage.CANVAS_MAPPING: return createCanvasMapping();
-			case GMFMapPackage.LABEL_MAPPING: return createLabelMapping();
-			case GMFMapPackage.FEATURE_LABEL_MAPPING: return createFeatureLabelMapping();
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING: return createOclChoiceLabelMapping();
-			case GMFMapPackage.DESIGN_LABEL_MAPPING: return createDesignLabelMapping();
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING: return createExpressionLabelMapping();
-			case GMFMapPackage.CONSTRAINT: return createConstraint();
-			case GMFMapPackage.LINK_CONSTRAINTS: return createLinkConstraints();
-			case GMFMapPackage.VALUE_EXPRESSION: return createValueExpression();
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER: return createFeatureSeqInitializer();
-			case GMFMapPackage.FEATURE_VALUE_SPEC: return createFeatureValueSpec();
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC: return createReferenceNewElementSpec();
-			case GMFMapPackage.AUDIT_CONTAINER: return createAuditContainer();
-			case GMFMapPackage.AUDIT_RULE: return createAuditRule();
-			case GMFMapPackage.DOMAIN_ELEMENT_TARGET: return createDomainElementTarget();
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET: return createDomainAttributeTarget();
-			case GMFMapPackage.DIAGRAM_ELEMENT_TARGET: return createDiagramElementTarget();
-			case GMFMapPackage.NOTATION_ELEMENT_TARGET: return createNotationElementTarget();
-			case GMFMapPackage.METRIC_CONTAINER: return createMetricContainer();
-			case GMFMapPackage.METRIC_RULE: return createMetricRule();
-			case GMFMapPackage.AUDITED_METRIC_TARGET: return createAuditedMetricTarget();
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING: return createVisualEffectMapping();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-			case GMFMapPackage.LABEL_TEXT_ACCESS_METHOD:
-				return createLabelTextAccessMethodFromString(eDataType, initialValue);
-			case GMFMapPackage.SEVERITY:
-				return createSeverityFromString(eDataType, initialValue);
-			case GMFMapPackage.LANGUAGE:
-				return createLanguageFromString(eDataType, initialValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-			case GMFMapPackage.LABEL_TEXT_ACCESS_METHOD:
-				return convertLabelTextAccessMethodToString(eDataType, instanceValue);
-			case GMFMapPackage.SEVERITY:
-				return convertSeverityToString(eDataType, instanceValue);
-			case GMFMapPackage.LANGUAGE:
-				return convertLanguageToString(eDataType, instanceValue);
-			default:
-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeMapping createNodeMapping() {
-		NodeMappingImpl nodeMapping = new NodeMappingImpl();
-		return nodeMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CompartmentMapping createCompartmentMapping() {
-		CompartmentMappingImpl compartmentMapping = new CompartmentMappingImpl();
-		return compartmentMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LinkMapping createLinkMapping() {
-		LinkMappingImpl linkMapping = new LinkMappingImpl();
-		return linkMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CanvasMapping createCanvasMapping() {
-		CanvasMappingImpl canvasMapping = new CanvasMappingImpl();
-		return canvasMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelMapping createLabelMapping() {
-		LabelMappingImpl labelMapping = new LabelMappingImpl();
-		return labelMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureLabelMapping createFeatureLabelMapping() {
-		FeatureLabelMappingImpl featureLabelMapping = new FeatureLabelMappingImpl();
-		return featureLabelMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public OclChoiceLabelMapping createOclChoiceLabelMapping() {
-		OclChoiceLabelMappingImpl oclChoiceLabelMapping = new OclChoiceLabelMappingImpl();
-		return oclChoiceLabelMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DesignLabelMapping createDesignLabelMapping() {
-		DesignLabelMappingImpl designLabelMapping = new DesignLabelMappingImpl();
-		return designLabelMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ExpressionLabelMapping createExpressionLabelMapping() {
-		ExpressionLabelMappingImpl expressionLabelMapping = new ExpressionLabelMappingImpl();
-		return expressionLabelMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Mapping createMapping() {
-		MappingImpl mapping = new MappingImpl();
-		return mapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ChildReference createChildReference() {
-		ChildReferenceImpl childReference = new ChildReferenceImpl();
-		return childReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TopNodeReference createTopNodeReference() {
-		TopNodeReferenceImpl topNodeReference = new TopNodeReferenceImpl();
-		return topNodeReference;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint createConstraint() {
-		ConstraintImpl constraint = new ConstraintImpl();
-		return constraint;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LinkConstraints createLinkConstraints() {
-		LinkConstraintsImpl linkConstraints = new LinkConstraintsImpl();
-		return linkConstraints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueExpression createValueExpression() {
-		ValueExpressionImpl valueExpression = new ValueExpressionImpl();
-		return valueExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureSeqInitializer createFeatureSeqInitializer() {
-		FeatureSeqInitializerImpl featureSeqInitializer = new FeatureSeqInitializerImpl();
-		return featureSeqInitializer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public FeatureValueSpec createFeatureValueSpec() {
-		FeatureValueSpecImpl featureValueSpec = new FeatureValueSpecImpl();
-		return featureValueSpec;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ReferenceNewElementSpec createReferenceNewElementSpec() {
-		ReferenceNewElementSpecImpl referenceNewElementSpec = new ReferenceNewElementSpecImpl();
-		return referenceNewElementSpec;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditContainer createAuditContainer() {
-		AuditContainerImpl auditContainer = new AuditContainerImpl();
-		return auditContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditRule createAuditRule() {
-		AuditRuleImpl auditRule = new AuditRuleImpl();
-		return auditRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DomainElementTarget createDomainElementTarget() {
-		DomainElementTargetImpl domainElementTarget = new DomainElementTargetImpl();
-		return domainElementTarget;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DomainAttributeTarget createDomainAttributeTarget() {
-		DomainAttributeTargetImpl domainAttributeTarget = new DomainAttributeTargetImpl();
-		return domainAttributeTarget;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramElementTarget createDiagramElementTarget() {
-		DiagramElementTargetImpl diagramElementTarget = new DiagramElementTargetImpl();
-		return diagramElementTarget;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotationElementTarget createNotationElementTarget() {
-		NotationElementTargetImpl notationElementTarget = new NotationElementTargetImpl();
-		return notationElementTarget;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MetricContainer createMetricContainer() {
-		MetricContainerImpl metricContainer = new MetricContainerImpl();
-		return metricContainer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MetricRule createMetricRule() {
-		MetricRuleImpl metricRule = new MetricRuleImpl();
-		return metricRule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditedMetricTarget createAuditedMetricTarget() {
-		AuditedMetricTargetImpl auditedMetricTarget = new AuditedMetricTargetImpl();
-		return auditedMetricTarget;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public VisualEffectMapping createVisualEffectMapping() {
-		VisualEffectMappingImpl visualEffectMapping = new VisualEffectMappingImpl();
-		return visualEffectMapping;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LabelTextAccessMethod createLabelTextAccessMethodFromString(EDataType eDataType, String initialValue) {
-		LabelTextAccessMethod result = LabelTextAccessMethod.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLabelTextAccessMethodToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Severity createSeverityFromString(EDataType eDataType, String initialValue) {
-		Severity result = Severity.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertSeverityToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Language createLanguageFromString(EDataType eDataType, String initialValue) {
-		Language result = Language.get(initialValue);
-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertLanguageToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapPackage getGMFMapPackage() {
-		return (GMFMapPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static GMFMapPackage getPackage() {
-		return GMFMapPackage.eINSTANCE;
-	}
-
-} //GMFMapFactoryImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/GMFMapPackageImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/GMFMapPackageImpl.java
deleted file mode 100644
index af08b3f369b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/GMFMapPackageImpl.java
+++ /dev/null
@@ -1,2636 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.GMFGraphPackage;
-import org.eclipse.papyrus.gmf.mappings.AppearanceSteward;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.AuditRule;
-import org.eclipse.papyrus.gmf.mappings.Auditable;
-import org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.DesignLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.DiagramElementTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainElementTarget;
-import org.eclipse.papyrus.gmf.mappings.ElementInitializer;
-import org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureValueSpec;
-import org.eclipse.papyrus.gmf.mappings.GMFMapFactory;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.LabelTextAccessMethod;
-import org.eclipse.papyrus.gmf.mappings.Language;
-import org.eclipse.papyrus.gmf.mappings.LinkConstraints;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.Measurable;
-import org.eclipse.papyrus.gmf.mappings.MenuOwner;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-import org.eclipse.papyrus.gmf.mappings.NeedsContainment;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.NotationElementTarget;
-import org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec;
-import org.eclipse.papyrus.gmf.mappings.RuleBase;
-import org.eclipse.papyrus.gmf.mappings.Severity;
-import org.eclipse.papyrus.gmf.mappings.ToolOwner;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-import org.eclipse.papyrus.gmf.mappings.VisualEffectMapping;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.validate.GMFValidator;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFMapPackageImpl extends EPackageImpl implements GMFMapPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mappingEntryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass needsContainmentEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass nodeReferenceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass childReferenceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass topNodeReferenceEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass nodeMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass compartmentMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass linkMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass canvasMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass labelMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureLabelMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass oclChoiceLabelMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass designLabelMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass expressionLabelMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass constraintEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass linkConstraintsEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass valueExpressionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass elementInitializerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureSeqInitializerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureInitializerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass featureValueSpecEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass referenceNewElementSpecEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass menuOwnerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolOwnerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass appearanceStewardEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass auditContainerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass auditRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass ruleBaseEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass domainElementTargetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass domainAttributeTargetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass diagramElementTargetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass notationElementTargetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass metricContainerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass metricRuleEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass auditedMetricTargetEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass auditableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass measurableEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass visualEffectMappingEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum labelTextAccessMethodEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum severityEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum languageEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private GMFMapPackageImpl() {
-		super(eNS_URI, GMFMapFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link GMFMapPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static GMFMapPackage init() {
-		if (isInited) return (GMFMapPackage)EPackage.Registry.INSTANCE.getEPackage(GMFMapPackage.eNS_URI);
-
-		// Obtain or create and register package
-		GMFMapPackageImpl theGMFMapPackage = (GMFMapPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof GMFMapPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new GMFMapPackageImpl());
-
-		isInited = true;
-
-		// Initialize simple dependencies
-		GMFGraphPackage.eINSTANCE.eClass();
-		GMFToolPackage.eINSTANCE.eClass();
-		EcorePackage.eINSTANCE.eClass();
-
-		// Create package meta-data objects
-		theGMFMapPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theGMFMapPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theGMFMapPackage.freeze();
-
-  
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(GMFMapPackage.eNS_URI, theGMFMapPackage);
-		return theGMFMapPackage;
-	}
-
-	public void initializePackageContents() {
-		initializePackageContentsGen();
-		// Can't use GMFMapPackage.eINSTANCE here
-		EValidator.Registry.INSTANCE.put(this, GMFValidator.INSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMappingEntry() {
-		return mappingEntryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMappingEntry_DomainMetaElement() {
-		return (EReference)mappingEntryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMappingEntry_DomainSpecialization() {
-		return (EReference)mappingEntryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMappingEntry_DomainInitializer() {
-		return (EReference)mappingEntryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMappingEntry_LabelMappings() {
-		return (EReference)mappingEntryEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMappingEntry_RelatedDiagrams() {
-		return (EReference)mappingEntryEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMappingEntry_VisualEffects() {
-		return (EReference)mappingEntryEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNeedsContainment() {
-		return needsContainmentEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNeedsContainment_ContainmentFeature() {
-		return (EReference)needsContainmentEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNodeReference() {
-		return nodeReferenceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNodeReference_ChildrenFeature() {
-		return (EReference)nodeReferenceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNodeReference_Child() {
-		return (EReference)nodeReferenceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getChildReference() {
-		return childReferenceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildReference_ParentNode() {
-		return (EReference)childReferenceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildReference_Compartment() {
-		return (EReference)childReferenceEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildReference_OwnedChild() {
-		return (EReference)childReferenceEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildReference_ReferencedChild() {
-		return (EReference)childReferenceEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTopNodeReference() {
-		return topNodeReferenceEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getTopNodeReference_OwnedChild() {
-		return (EReference)topNodeReferenceEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNodeMapping() {
-		return nodeMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNodeMapping_DiagramNode() {
-		return (EReference)nodeMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNodeMapping_Children() {
-		return (EReference)nodeMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNodeMapping_Compartments() {
-		return (EReference)nodeMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCompartmentMapping() {
-		return compartmentMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCompartmentMapping_Compartment() {
-		return (EReference)compartmentMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCompartmentMapping_ParentNode() {
-		return (EReference)compartmentMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCompartmentMapping_Children() {
-		return (EReference)compartmentMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLinkMapping() {
-		return linkMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLinkMapping_DiagramLink() {
-		return (EReference)linkMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLinkMapping_SourceMetaFeature() {
-		return (EReference)linkMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLinkMapping_LinkMetaFeature() {
-		return (EReference)linkMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLinkMapping_CreationConstraints() {
-		return (EReference)linkMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCanvasMapping() {
-		return canvasMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvasMapping_DiagramCanvas() {
-		return (EReference)canvasMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvasMapping_DomainModel() {
-		return (EReference)canvasMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvasMapping_DomainMetaElement() {
-		return (EReference)canvasMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvasMapping_Palette() {
-		return (EReference)canvasMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvasMapping_MenuContributions() {
-		return (EReference)canvasMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getCanvasMapping_ToolbarContributions() {
-		return (EReference)canvasMappingEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLabelMapping() {
-		return labelMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLabelMapping_DiagramLabel() {
-		return (EReference)labelMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getLabelMapping_ReadOnly() {
-		return (EAttribute)labelMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLabelMapping_MapEntry() {
-		return (EReference)labelMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureLabelMapping() {
-		return featureLabelMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureLabelMapping_Features() {
-		return (EReference)featureLabelMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureLabelMapping_EditableFeatures() {
-		return (EReference)featureLabelMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelMapping_ViewPattern() {
-		return (EAttribute)featureLabelMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelMapping_EditorPattern() {
-		return (EAttribute)featureLabelMappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelMapping_ViewMethod() {
-		return (EAttribute)featureLabelMappingEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelMapping_EditPattern() {
-		return (EAttribute)featureLabelMappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFeatureLabelMapping_EditMethod() {
-		return (EAttribute)featureLabelMappingEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getOclChoiceLabelMapping() {
-		return oclChoiceLabelMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOclChoiceLabelMapping_Feature() {
-		return (EReference)oclChoiceLabelMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOclChoiceLabelMapping_ItemsExpression() {
-		return (EReference)oclChoiceLabelMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getOclChoiceLabelMapping_ShowExpression() {
-		return (EReference)oclChoiceLabelMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDesignLabelMapping() {
-		return designLabelMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getExpressionLabelMapping() {
-		return expressionLabelMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExpressionLabelMapping_ViewExpression() {
-		return (EReference)expressionLabelMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExpressionLabelMapping_EditExpression() {
-		return (EReference)expressionLabelMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getExpressionLabelMapping_ValidateExpression() {
-		return (EReference)expressionLabelMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMapping() {
-		return mappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMapping_Nodes() {
-		return (EReference)mappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMapping_Links() {
-		return (EReference)mappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMapping_Diagram() {
-		return (EReference)mappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMapping_AppearanceStyles() {
-		return (EReference)mappingEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMapping_Audits() {
-		return (EReference)mappingEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMapping_Metrics() {
-		return (EReference)mappingEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getConstraint() {
-		return constraintEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getLinkConstraints() {
-		return linkConstraintsEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLinkConstraints_LinkMapping() {
-		return (EReference)linkConstraintsEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLinkConstraints_SourceEnd() {
-		return (EReference)linkConstraintsEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getLinkConstraints_TargetEnd() {
-		return (EReference)linkConstraintsEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getValueExpression() {
-		return valueExpressionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValueExpression_Body() {
-		return (EAttribute)valueExpressionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValueExpression_Language() {
-		return (EAttribute)valueExpressionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getValueExpression_LangName() {
-		return (EAttribute)valueExpressionEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElementInitializer() {
-		return elementInitializerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getElementInitializer_MappingEntry() {
-		return (EReference)elementInitializerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureSeqInitializer() {
-		return featureSeqInitializerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureSeqInitializer_Initializers() {
-		return (EReference)featureSeqInitializerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureSeqInitializer_ElementClass() {
-		return (EReference)featureSeqInitializerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureSeqInitializer_CreatingInitializer() {
-		return (EReference)featureSeqInitializerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureInitializer() {
-		return featureInitializerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureInitializer_Feature() {
-		return (EReference)featureInitializerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureInitializer_FeatureSeqInitializer() {
-		return (EReference)featureInitializerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFeatureValueSpec() {
-		return featureValueSpecEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getFeatureValueSpec_Value() {
-		return (EReference)featureValueSpecEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getReferenceNewElementSpec() {
-		return referenceNewElementSpecEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getReferenceNewElementSpec_NewElementInitializers() {
-		return (EReference)referenceNewElementSpecEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMenuOwner() {
-		return menuOwnerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMenuOwner_ContextMenu() {
-		return (EReference)menuOwnerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getToolOwner() {
-		return toolOwnerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getToolOwner_Tool() {
-		return (EReference)toolOwnerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAppearanceSteward() {
-		return appearanceStewardEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAppearanceSteward_AppearanceStyle() {
-		return (EReference)appearanceStewardEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAuditContainer() {
-		return auditContainerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuditContainer_Id() {
-		return (EAttribute)auditContainerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuditContainer_Name() {
-		return (EAttribute)auditContainerEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuditContainer_Description() {
-		return (EAttribute)auditContainerEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuditContainer_ParentContainer() {
-		return (EReference)auditContainerEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuditContainer_Audits() {
-		return (EReference)auditContainerEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuditContainer_ChildContainers() {
-		return (EReference)auditContainerEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAuditRule() {
-		return auditRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuditRule_Id() {
-		return (EAttribute)auditRuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuditRule_Rule() {
-		return (EReference)auditRuleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuditRule_Target() {
-		return (EReference)auditRuleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuditRule_Severity() {
-		return (EAttribute)auditRuleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuditRule_UseInLiveMode() {
-		return (EAttribute)auditRuleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAuditRule_Message() {
-		return (EAttribute)auditRuleEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuditRule_Container() {
-		return (EReference)auditRuleEClass.getEStructuralFeatures().get(6);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getRuleBase() {
-		return ruleBaseEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRuleBase_Name() {
-		return (EAttribute)ruleBaseEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getRuleBase_Description() {
-		return (EAttribute)ruleBaseEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDomainElementTarget() {
-		return domainElementTargetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDomainElementTarget_Element() {
-		return (EReference)domainElementTargetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDomainAttributeTarget() {
-		return domainAttributeTargetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDomainAttributeTarget_Attribute() {
-		return (EReference)domainAttributeTargetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDomainAttributeTarget_NullAsError() {
-		return (EAttribute)domainAttributeTargetEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDiagramElementTarget() {
-		return diagramElementTargetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getDiagramElementTarget_Element() {
-		return (EReference)diagramElementTargetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNotationElementTarget() {
-		return notationElementTargetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getNotationElementTarget_Element() {
-		return (EReference)notationElementTargetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMetricContainer() {
-		return metricContainerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMetricContainer_Metrics() {
-		return (EReference)metricContainerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMetricRule() {
-		return metricRuleEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMetricRule_Key() {
-		return (EAttribute)metricRuleEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMetricRule_Rule() {
-		return (EReference)metricRuleEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMetricRule_Target() {
-		return (EReference)metricRuleEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMetricRule_LowLimit() {
-		return (EAttribute)metricRuleEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMetricRule_HighLimit() {
-		return (EAttribute)metricRuleEClass.getEStructuralFeatures().get(4);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMetricRule_Container() {
-		return (EReference)metricRuleEClass.getEStructuralFeatures().get(5);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAuditedMetricTarget() {
-		return auditedMetricTargetEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAuditedMetricTarget_Metric() {
-		return (EReference)auditedMetricTargetEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAuditable() {
-		return auditableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMeasurable() {
-		return measurableEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getVisualEffectMapping() {
-		return visualEffectMappingEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getVisualEffectMapping_DiagramPin() {
-		return (EReference)visualEffectMappingEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getVisualEffectMapping_OclExpression() {
-		return (EAttribute)visualEffectMappingEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getVisualEffectMapping_ParentMapEntry() {
-		return (EReference)visualEffectMappingEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getLabelTextAccessMethod() {
-		return labelTextAccessMethodEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getSeverity() {
-		return severityEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getLanguage() {
-		return languageEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapFactory getGMFMapFactory() {
-		return (GMFMapFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		mappingEClass = createEClass(MAPPING);
-		createEReference(mappingEClass, MAPPING__NODES);
-		createEReference(mappingEClass, MAPPING__LINKS);
-		createEReference(mappingEClass, MAPPING__DIAGRAM);
-		createEReference(mappingEClass, MAPPING__APPEARANCE_STYLES);
-		createEReference(mappingEClass, MAPPING__AUDITS);
-		createEReference(mappingEClass, MAPPING__METRICS);
-
-		mappingEntryEClass = createEClass(MAPPING_ENTRY);
-		createEReference(mappingEntryEClass, MAPPING_ENTRY__DOMAIN_META_ELEMENT);
-		createEReference(mappingEntryEClass, MAPPING_ENTRY__DOMAIN_SPECIALIZATION);
-		createEReference(mappingEntryEClass, MAPPING_ENTRY__DOMAIN_INITIALIZER);
-		createEReference(mappingEntryEClass, MAPPING_ENTRY__LABEL_MAPPINGS);
-		createEReference(mappingEntryEClass, MAPPING_ENTRY__RELATED_DIAGRAMS);
-		createEReference(mappingEntryEClass, MAPPING_ENTRY__VISUAL_EFFECTS);
-
-		needsContainmentEClass = createEClass(NEEDS_CONTAINMENT);
-		createEReference(needsContainmentEClass, NEEDS_CONTAINMENT__CONTAINMENT_FEATURE);
-
-		nodeReferenceEClass = createEClass(NODE_REFERENCE);
-		createEReference(nodeReferenceEClass, NODE_REFERENCE__CHILDREN_FEATURE);
-		createEReference(nodeReferenceEClass, NODE_REFERENCE__CHILD);
-
-		childReferenceEClass = createEClass(CHILD_REFERENCE);
-		createEReference(childReferenceEClass, CHILD_REFERENCE__PARENT_NODE);
-		createEReference(childReferenceEClass, CHILD_REFERENCE__COMPARTMENT);
-		createEReference(childReferenceEClass, CHILD_REFERENCE__OWNED_CHILD);
-		createEReference(childReferenceEClass, CHILD_REFERENCE__REFERENCED_CHILD);
-
-		topNodeReferenceEClass = createEClass(TOP_NODE_REFERENCE);
-		createEReference(topNodeReferenceEClass, TOP_NODE_REFERENCE__OWNED_CHILD);
-
-		nodeMappingEClass = createEClass(NODE_MAPPING);
-		createEReference(nodeMappingEClass, NODE_MAPPING__DIAGRAM_NODE);
-		createEReference(nodeMappingEClass, NODE_MAPPING__CHILDREN);
-		createEReference(nodeMappingEClass, NODE_MAPPING__COMPARTMENTS);
-
-		compartmentMappingEClass = createEClass(COMPARTMENT_MAPPING);
-		createEReference(compartmentMappingEClass, COMPARTMENT_MAPPING__COMPARTMENT);
-		createEReference(compartmentMappingEClass, COMPARTMENT_MAPPING__PARENT_NODE);
-		createEReference(compartmentMappingEClass, COMPARTMENT_MAPPING__CHILDREN);
-
-		linkMappingEClass = createEClass(LINK_MAPPING);
-		createEReference(linkMappingEClass, LINK_MAPPING__DIAGRAM_LINK);
-		createEReference(linkMappingEClass, LINK_MAPPING__SOURCE_META_FEATURE);
-		createEReference(linkMappingEClass, LINK_MAPPING__LINK_META_FEATURE);
-		createEReference(linkMappingEClass, LINK_MAPPING__CREATION_CONSTRAINTS);
-
-		canvasMappingEClass = createEClass(CANVAS_MAPPING);
-		createEReference(canvasMappingEClass, CANVAS_MAPPING__DIAGRAM_CANVAS);
-		createEReference(canvasMappingEClass, CANVAS_MAPPING__DOMAIN_MODEL);
-		createEReference(canvasMappingEClass, CANVAS_MAPPING__DOMAIN_META_ELEMENT);
-		createEReference(canvasMappingEClass, CANVAS_MAPPING__PALETTE);
-		createEReference(canvasMappingEClass, CANVAS_MAPPING__MENU_CONTRIBUTIONS);
-		createEReference(canvasMappingEClass, CANVAS_MAPPING__TOOLBAR_CONTRIBUTIONS);
-
-		labelMappingEClass = createEClass(LABEL_MAPPING);
-		createEReference(labelMappingEClass, LABEL_MAPPING__DIAGRAM_LABEL);
-		createEAttribute(labelMappingEClass, LABEL_MAPPING__READ_ONLY);
-		createEReference(labelMappingEClass, LABEL_MAPPING__MAP_ENTRY);
-
-		featureLabelMappingEClass = createEClass(FEATURE_LABEL_MAPPING);
-		createEReference(featureLabelMappingEClass, FEATURE_LABEL_MAPPING__FEATURES);
-		createEReference(featureLabelMappingEClass, FEATURE_LABEL_MAPPING__EDITABLE_FEATURES);
-		createEAttribute(featureLabelMappingEClass, FEATURE_LABEL_MAPPING__VIEW_PATTERN);
-		createEAttribute(featureLabelMappingEClass, FEATURE_LABEL_MAPPING__EDITOR_PATTERN);
-		createEAttribute(featureLabelMappingEClass, FEATURE_LABEL_MAPPING__EDIT_PATTERN);
-		createEAttribute(featureLabelMappingEClass, FEATURE_LABEL_MAPPING__VIEW_METHOD);
-		createEAttribute(featureLabelMappingEClass, FEATURE_LABEL_MAPPING__EDIT_METHOD);
-
-		oclChoiceLabelMappingEClass = createEClass(OCL_CHOICE_LABEL_MAPPING);
-		createEReference(oclChoiceLabelMappingEClass, OCL_CHOICE_LABEL_MAPPING__FEATURE);
-		createEReference(oclChoiceLabelMappingEClass, OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION);
-		createEReference(oclChoiceLabelMappingEClass, OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION);
-
-		designLabelMappingEClass = createEClass(DESIGN_LABEL_MAPPING);
-
-		expressionLabelMappingEClass = createEClass(EXPRESSION_LABEL_MAPPING);
-		createEReference(expressionLabelMappingEClass, EXPRESSION_LABEL_MAPPING__VIEW_EXPRESSION);
-		createEReference(expressionLabelMappingEClass, EXPRESSION_LABEL_MAPPING__EDIT_EXPRESSION);
-		createEReference(expressionLabelMappingEClass, EXPRESSION_LABEL_MAPPING__VALIDATE_EXPRESSION);
-
-		constraintEClass = createEClass(CONSTRAINT);
-
-		linkConstraintsEClass = createEClass(LINK_CONSTRAINTS);
-		createEReference(linkConstraintsEClass, LINK_CONSTRAINTS__LINK_MAPPING);
-		createEReference(linkConstraintsEClass, LINK_CONSTRAINTS__SOURCE_END);
-		createEReference(linkConstraintsEClass, LINK_CONSTRAINTS__TARGET_END);
-
-		valueExpressionEClass = createEClass(VALUE_EXPRESSION);
-		createEAttribute(valueExpressionEClass, VALUE_EXPRESSION__BODY);
-		createEAttribute(valueExpressionEClass, VALUE_EXPRESSION__LANGUAGE);
-		createEAttribute(valueExpressionEClass, VALUE_EXPRESSION__LANG_NAME);
-
-		elementInitializerEClass = createEClass(ELEMENT_INITIALIZER);
-		createEReference(elementInitializerEClass, ELEMENT_INITIALIZER__MAPPING_ENTRY);
-
-		featureSeqInitializerEClass = createEClass(FEATURE_SEQ_INITIALIZER);
-		createEReference(featureSeqInitializerEClass, FEATURE_SEQ_INITIALIZER__INITIALIZERS);
-		createEReference(featureSeqInitializerEClass, FEATURE_SEQ_INITIALIZER__ELEMENT_CLASS);
-		createEReference(featureSeqInitializerEClass, FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER);
-
-		featureInitializerEClass = createEClass(FEATURE_INITIALIZER);
-		createEReference(featureInitializerEClass, FEATURE_INITIALIZER__FEATURE);
-		createEReference(featureInitializerEClass, FEATURE_INITIALIZER__FEATURE_SEQ_INITIALIZER);
-
-		featureValueSpecEClass = createEClass(FEATURE_VALUE_SPEC);
-		createEReference(featureValueSpecEClass, FEATURE_VALUE_SPEC__VALUE);
-
-		referenceNewElementSpecEClass = createEClass(REFERENCE_NEW_ELEMENT_SPEC);
-		createEReference(referenceNewElementSpecEClass, REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS);
-
-		menuOwnerEClass = createEClass(MENU_OWNER);
-		createEReference(menuOwnerEClass, MENU_OWNER__CONTEXT_MENU);
-
-		toolOwnerEClass = createEClass(TOOL_OWNER);
-		createEReference(toolOwnerEClass, TOOL_OWNER__TOOL);
-
-		appearanceStewardEClass = createEClass(APPEARANCE_STEWARD);
-		createEReference(appearanceStewardEClass, APPEARANCE_STEWARD__APPEARANCE_STYLE);
-
-		auditContainerEClass = createEClass(AUDIT_CONTAINER);
-		createEAttribute(auditContainerEClass, AUDIT_CONTAINER__ID);
-		createEAttribute(auditContainerEClass, AUDIT_CONTAINER__NAME);
-		createEAttribute(auditContainerEClass, AUDIT_CONTAINER__DESCRIPTION);
-		createEReference(auditContainerEClass, AUDIT_CONTAINER__PARENT_CONTAINER);
-		createEReference(auditContainerEClass, AUDIT_CONTAINER__AUDITS);
-		createEReference(auditContainerEClass, AUDIT_CONTAINER__CHILD_CONTAINERS);
-
-		ruleBaseEClass = createEClass(RULE_BASE);
-		createEAttribute(ruleBaseEClass, RULE_BASE__NAME);
-		createEAttribute(ruleBaseEClass, RULE_BASE__DESCRIPTION);
-
-		auditRuleEClass = createEClass(AUDIT_RULE);
-		createEAttribute(auditRuleEClass, AUDIT_RULE__ID);
-		createEReference(auditRuleEClass, AUDIT_RULE__RULE);
-		createEReference(auditRuleEClass, AUDIT_RULE__TARGET);
-		createEAttribute(auditRuleEClass, AUDIT_RULE__SEVERITY);
-		createEAttribute(auditRuleEClass, AUDIT_RULE__USE_IN_LIVE_MODE);
-		createEAttribute(auditRuleEClass, AUDIT_RULE__MESSAGE);
-		createEReference(auditRuleEClass, AUDIT_RULE__CONTAINER);
-
-		domainElementTargetEClass = createEClass(DOMAIN_ELEMENT_TARGET);
-		createEReference(domainElementTargetEClass, DOMAIN_ELEMENT_TARGET__ELEMENT);
-
-		domainAttributeTargetEClass = createEClass(DOMAIN_ATTRIBUTE_TARGET);
-		createEReference(domainAttributeTargetEClass, DOMAIN_ATTRIBUTE_TARGET__ATTRIBUTE);
-		createEAttribute(domainAttributeTargetEClass, DOMAIN_ATTRIBUTE_TARGET__NULL_AS_ERROR);
-
-		diagramElementTargetEClass = createEClass(DIAGRAM_ELEMENT_TARGET);
-		createEReference(diagramElementTargetEClass, DIAGRAM_ELEMENT_TARGET__ELEMENT);
-
-		notationElementTargetEClass = createEClass(NOTATION_ELEMENT_TARGET);
-		createEReference(notationElementTargetEClass, NOTATION_ELEMENT_TARGET__ELEMENT);
-
-		metricContainerEClass = createEClass(METRIC_CONTAINER);
-		createEReference(metricContainerEClass, METRIC_CONTAINER__METRICS);
-
-		metricRuleEClass = createEClass(METRIC_RULE);
-		createEAttribute(metricRuleEClass, METRIC_RULE__KEY);
-		createEReference(metricRuleEClass, METRIC_RULE__RULE);
-		createEReference(metricRuleEClass, METRIC_RULE__TARGET);
-		createEAttribute(metricRuleEClass, METRIC_RULE__LOW_LIMIT);
-		createEAttribute(metricRuleEClass, METRIC_RULE__HIGH_LIMIT);
-		createEReference(metricRuleEClass, METRIC_RULE__CONTAINER);
-
-		auditedMetricTargetEClass = createEClass(AUDITED_METRIC_TARGET);
-		createEReference(auditedMetricTargetEClass, AUDITED_METRIC_TARGET__METRIC);
-
-		auditableEClass = createEClass(AUDITABLE);
-
-		measurableEClass = createEClass(MEASURABLE);
-
-		visualEffectMappingEClass = createEClass(VISUAL_EFFECT_MAPPING);
-		createEReference(visualEffectMappingEClass, VISUAL_EFFECT_MAPPING__DIAGRAM_PIN);
-		createEAttribute(visualEffectMappingEClass, VISUAL_EFFECT_MAPPING__OCL_EXPRESSION);
-		createEReference(visualEffectMappingEClass, VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY);
-
-		// Create enums
-		labelTextAccessMethodEEnum = createEEnum(LABEL_TEXT_ACCESS_METHOD);
-		severityEEnum = createEEnum(SEVERITY);
-		languageEEnum = createEEnum(LANGUAGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContentsGen() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Obtain other dependent packages
-		GMFToolPackage theGMFToolPackage = (GMFToolPackage)EPackage.Registry.INSTANCE.getEPackage(GMFToolPackage.eNS_URI);
-		GMFGraphPackage theGMFGraphPackage = (GMFGraphPackage)EPackage.Registry.INSTANCE.getEPackage(GMFGraphPackage.eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		nodeReferenceEClass.getESuperTypes().add(this.getNeedsContainment());
-		childReferenceEClass.getESuperTypes().add(this.getNodeReference());
-		topNodeReferenceEClass.getESuperTypes().add(this.getNodeReference());
-		nodeMappingEClass.getESuperTypes().add(this.getMappingEntry());
-		nodeMappingEClass.getESuperTypes().add(this.getMenuOwner());
-		nodeMappingEClass.getESuperTypes().add(this.getToolOwner());
-		nodeMappingEClass.getESuperTypes().add(this.getAppearanceSteward());
-		linkMappingEClass.getESuperTypes().add(this.getMappingEntry());
-		linkMappingEClass.getESuperTypes().add(this.getNeedsContainment());
-		linkMappingEClass.getESuperTypes().add(this.getMenuOwner());
-		linkMappingEClass.getESuperTypes().add(this.getToolOwner());
-		linkMappingEClass.getESuperTypes().add(this.getAppearanceSteward());
-		featureLabelMappingEClass.getESuperTypes().add(this.getLabelMapping());
-		oclChoiceLabelMappingEClass.getESuperTypes().add(this.getLabelMapping());
-		designLabelMappingEClass.getESuperTypes().add(this.getLabelMapping());
-		expressionLabelMappingEClass.getESuperTypes().add(this.getLabelMapping());
-		constraintEClass.getESuperTypes().add(this.getValueExpression());
-		featureSeqInitializerEClass.getESuperTypes().add(this.getElementInitializer());
-		featureValueSpecEClass.getESuperTypes().add(this.getFeatureInitializer());
-		referenceNewElementSpecEClass.getESuperTypes().add(this.getFeatureInitializer());
-		auditRuleEClass.getESuperTypes().add(this.getRuleBase());
-		domainElementTargetEClass.getESuperTypes().add(this.getAuditable());
-		domainElementTargetEClass.getESuperTypes().add(this.getMeasurable());
-		domainAttributeTargetEClass.getESuperTypes().add(this.getAuditable());
-		diagramElementTargetEClass.getESuperTypes().add(this.getAuditable());
-		diagramElementTargetEClass.getESuperTypes().add(this.getMeasurable());
-		notationElementTargetEClass.getESuperTypes().add(this.getAuditable());
-		notationElementTargetEClass.getESuperTypes().add(this.getMeasurable());
-		metricRuleEClass.getESuperTypes().add(this.getRuleBase());
-		auditedMetricTargetEClass.getESuperTypes().add(this.getAuditable());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(mappingEClass, Mapping.class, "Mapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMapping_Nodes(), this.getTopNodeReference(), null, "nodes", null, 0, -1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMapping_Links(), this.getLinkMapping(), null, "links", null, 0, -1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMapping_Diagram(), this.getCanvasMapping(), null, "diagram", null, 1, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMapping_AppearanceStyles(), theGMFToolPackage.getStyleSelector(), null, "appearanceStyles", null, 0, -1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMapping_Audits(), this.getAuditContainer(), null, "audits", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMapping_Metrics(), this.getMetricContainer(), null, "metrics", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(mappingEntryEClass, MappingEntry.class, "MappingEntry", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMappingEntry_DomainMetaElement(), ecorePackage.getEClass(), null, "domainMetaElement", null, 0, 1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMappingEntry_DomainSpecialization(), this.getConstraint(), null, "domainSpecialization", null, 0, 1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMappingEntry_DomainInitializer(), this.getElementInitializer(), null, "domainInitializer", null, 0, 1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMappingEntry_LabelMappings(), this.getLabelMapping(), this.getLabelMapping_MapEntry(), "labelMappings", null, 0, -1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMappingEntry_RelatedDiagrams(), this.getCanvasMapping(), null, "relatedDiagrams", null, 0, -1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMappingEntry_VisualEffects(), this.getVisualEffectMapping(), this.getVisualEffectMapping_ParentMapEntry(), "visualEffects", null, 0, -1, MappingEntry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		addEOperation(mappingEntryEClass, ecorePackage.getEClass(), "getDomainContext", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(needsContainmentEClass, NeedsContainment.class, "NeedsContainment", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getNeedsContainment_ContainmentFeature(), ecorePackage.getEReference(), null, "containmentFeature", null, 0, 1, NeedsContainment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(nodeReferenceEClass, NodeReference.class, "NodeReference", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getNodeReference_ChildrenFeature(), ecorePackage.getEReference(), null, "childrenFeature", null, 0, 1, NodeReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getNodeReference_Child(), this.getNodeMapping(), null, "child", null, 0, 1, NodeReference.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(childReferenceEClass, ChildReference.class, "ChildReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getChildReference_ParentNode(), this.getNodeMapping(), this.getNodeMapping_Children(), "parentNode", null, 1, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChildReference_Compartment(), this.getCompartmentMapping(), this.getCompartmentMapping_Children(), "compartment", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChildReference_OwnedChild(), this.getNodeMapping(), null, "ownedChild", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getChildReference_ReferencedChild(), this.getNodeMapping(), null, "referencedChild", null, 0, 1, ChildReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(topNodeReferenceEClass, TopNodeReference.class, "TopNodeReference", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getTopNodeReference_OwnedChild(), this.getNodeMapping(), null, "ownedChild", null, 1, 1, TopNodeReference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(nodeMappingEClass, NodeMapping.class, "NodeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getNodeMapping_DiagramNode(), theGMFGraphPackage.getNode(), null, "diagramNode", null, 1, 1, NodeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getNodeMapping_Children(), this.getChildReference(), this.getChildReference_ParentNode(), "children", null, 0, -1, NodeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getNodeMapping_Compartments(), this.getCompartmentMapping(), this.getCompartmentMapping_ParentNode(), "compartments", null, 0, -1, NodeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(compartmentMappingEClass, CompartmentMapping.class, "CompartmentMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCompartmentMapping_Compartment(), theGMFGraphPackage.getCompartment(), null, "compartment", null, 1, 1, CompartmentMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCompartmentMapping_ParentNode(), this.getNodeMapping(), this.getNodeMapping_Compartments(), "parentNode", null, 1, 1, CompartmentMapping.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCompartmentMapping_Children(), this.getChildReference(), this.getChildReference_Compartment(), "children", null, 0, -1, CompartmentMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(linkMappingEClass, LinkMapping.class, "LinkMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLinkMapping_DiagramLink(), theGMFGraphPackage.getConnection(), null, "diagramLink", null, 1, 1, LinkMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLinkMapping_SourceMetaFeature(), ecorePackage.getEStructuralFeature(), null, "sourceMetaFeature", null, 0, 1, LinkMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLinkMapping_LinkMetaFeature(), ecorePackage.getEStructuralFeature(), null, "linkMetaFeature", null, 0, 1, LinkMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLinkMapping_CreationConstraints(), this.getLinkConstraints(), this.getLinkConstraints_LinkMapping(), "creationConstraints", null, 0, 1, LinkMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(canvasMappingEClass, CanvasMapping.class, "CanvasMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getCanvasMapping_DiagramCanvas(), theGMFGraphPackage.getCanvas(), null, "diagramCanvas", null, 1, 1, CanvasMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvasMapping_DomainModel(), ecorePackage.getEPackage(), null, "domainModel", null, 0, 1, CanvasMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvasMapping_DomainMetaElement(), ecorePackage.getEClass(), null, "domainMetaElement", null, 0, 1, CanvasMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvasMapping_Palette(), theGMFToolPackage.getPalette(), null, "palette", null, 0, 1, CanvasMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvasMapping_MenuContributions(), theGMFToolPackage.getMainMenu(), null, "menuContributions", null, 0, -1, CanvasMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getCanvasMapping_ToolbarContributions(), theGMFToolPackage.getToolbar(), null, "toolbarContributions", null, 0, -1, CanvasMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(labelMappingEClass, LabelMapping.class, "LabelMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLabelMapping_DiagramLabel(), theGMFGraphPackage.getDiagramLabel(), null, "diagramLabel", null, 1, 1, LabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getLabelMapping_ReadOnly(), ecorePackage.getEBoolean(), "readOnly", null, 0, 1, LabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLabelMapping_MapEntry(), this.getMappingEntry(), this.getMappingEntry_LabelMappings(), "mapEntry", null, 1, 1, LabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(featureLabelMappingEClass, FeatureLabelMapping.class, "FeatureLabelMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFeatureLabelMapping_Features(), ecorePackage.getEAttribute(), null, "features", null, 1, -1, FeatureLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeatureLabelMapping_EditableFeatures(), ecorePackage.getEAttribute(), null, "editableFeatures", null, 0, -1, FeatureLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureLabelMapping_ViewPattern(), ecorePackage.getEString(), "viewPattern", null, 0, 1, FeatureLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureLabelMapping_EditorPattern(), ecorePackage.getEString(), "editorPattern", null, 0, 1, FeatureLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureLabelMapping_EditPattern(), ecorePackage.getEString(), "editPattern", null, 0, 1, FeatureLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureLabelMapping_ViewMethod(), this.getLabelTextAccessMethod(), "viewMethod", null, 0, 1, FeatureLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFeatureLabelMapping_EditMethod(), this.getLabelTextAccessMethod(), "editMethod", null, 0, 1, FeatureLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(oclChoiceLabelMappingEClass, OclChoiceLabelMapping.class, "OclChoiceLabelMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getOclChoiceLabelMapping_Feature(), ecorePackage.getEStructuralFeature(), null, "feature", null, 1, 1, OclChoiceLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOclChoiceLabelMapping_ItemsExpression(), this.getValueExpression(), null, "itemsExpression", null, 0, 1, OclChoiceLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getOclChoiceLabelMapping_ShowExpression(), this.getValueExpression(), null, "showExpression", null, 0, 1, OclChoiceLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(designLabelMappingEClass, DesignLabelMapping.class, "DesignLabelMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(expressionLabelMappingEClass, ExpressionLabelMapping.class, "ExpressionLabelMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getExpressionLabelMapping_ViewExpression(), this.getValueExpression(), null, "viewExpression", null, 1, 1, ExpressionLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExpressionLabelMapping_EditExpression(), this.getValueExpression(), null, "editExpression", null, 0, 1, ExpressionLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getExpressionLabelMapping_ValidateExpression(), this.getConstraint(), null, "validateExpression", null, 0, 1, ExpressionLabelMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(constraintEClass, Constraint.class, "Constraint", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(linkConstraintsEClass, LinkConstraints.class, "LinkConstraints", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getLinkConstraints_LinkMapping(), this.getLinkMapping(), this.getLinkMapping_CreationConstraints(), "linkMapping", null, 1, 1, LinkConstraints.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLinkConstraints_SourceEnd(), this.getConstraint(), null, "sourceEnd", null, 0, 1, LinkConstraints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getLinkConstraints_TargetEnd(), this.getConstraint(), null, "targetEnd", null, 0, 1, LinkConstraints.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(valueExpressionEClass, ValueExpression.class, "ValueExpression", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getValueExpression_Body(), ecorePackage.getEString(), "body", null, 1, 1, ValueExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getValueExpression_Language(), this.getLanguage(), "language", "ocl", 1, 1, ValueExpression.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getValueExpression_LangName(), ecorePackage.getEString(), "langName", null, 0, 1, ValueExpression.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
-
-		initEClass(elementInitializerEClass, ElementInitializer.class, "ElementInitializer", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getElementInitializer_MappingEntry(), this.getMappingEntry(), null, "mappingEntry", null, 1, 1, ElementInitializer.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(featureSeqInitializerEClass, FeatureSeqInitializer.class, "FeatureSeqInitializer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFeatureSeqInitializer_Initializers(), this.getFeatureInitializer(), this.getFeatureInitializer_FeatureSeqInitializer(), "initializers", null, 1, -1, FeatureSeqInitializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeatureSeqInitializer_ElementClass(), ecorePackage.getEClass(), null, "elementClass", null, 0, 1, FeatureSeqInitializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeatureSeqInitializer_CreatingInitializer(), this.getReferenceNewElementSpec(), this.getReferenceNewElementSpec_NewElementInitializers(), "creatingInitializer", null, 0, 1, FeatureSeqInitializer.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(featureInitializerEClass, FeatureInitializer.class, "FeatureInitializer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFeatureInitializer_Feature(), ecorePackage.getEStructuralFeature(), null, "feature", null, 1, 1, FeatureInitializer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getFeatureInitializer_FeatureSeqInitializer(), this.getFeatureSeqInitializer(), this.getFeatureSeqInitializer_Initializers(), "featureSeqInitializer", null, 1, 1, FeatureInitializer.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(featureValueSpecEClass, FeatureValueSpec.class, "FeatureValueSpec", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getFeatureValueSpec_Value(), this.getValueExpression(), null, "value", null, 1, 1, FeatureValueSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(referenceNewElementSpecEClass, ReferenceNewElementSpec.class, "ReferenceNewElementSpec", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getReferenceNewElementSpec_NewElementInitializers(), this.getFeatureSeqInitializer(), this.getFeatureSeqInitializer_CreatingInitializer(), "newElementInitializers", null, 1, -1, ReferenceNewElementSpec.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(menuOwnerEClass, MenuOwner.class, "MenuOwner", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMenuOwner_ContextMenu(), theGMFToolPackage.getContextMenu(), null, "contextMenu", null, 0, 1, MenuOwner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(toolOwnerEClass, ToolOwner.class, "ToolOwner", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getToolOwner_Tool(), theGMFToolPackage.getAbstractTool(), null, "tool", null, 0, 1, ToolOwner.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(appearanceStewardEClass, AppearanceSteward.class, "AppearanceSteward", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAppearanceSteward_AppearanceStyle(), theGMFToolPackage.getStyleSelector(), null, "appearanceStyle", null, 0, 1, AppearanceSteward.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(auditContainerEClass, AuditContainer.class, "AuditContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAuditContainer_Id(), ecorePackage.getEString(), "id", null, 1, 1, AuditContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuditContainer_Name(), ecorePackage.getEString(), "name", null, 0, 1, AuditContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuditContainer_Description(), ecorePackage.getEString(), "description", null, 0, 1, AuditContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuditContainer_ParentContainer(), this.getAuditContainer(), this.getAuditContainer_ChildContainers(), "parentContainer", null, 0, 1, AuditContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuditContainer_Audits(), this.getAuditRule(), this.getAuditRule_Container(), "audits", null, 0, -1, AuditContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuditContainer_ChildContainers(), this.getAuditContainer(), this.getAuditContainer_ParentContainer(), "childContainers", null, 0, -1, AuditContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(ruleBaseEClass, RuleBase.class, "RuleBase", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getRuleBase_Name(), ecorePackage.getEString(), "name", null, 0, 1, RuleBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getRuleBase_Description(), ecorePackage.getEString(), "description", null, 0, 1, RuleBase.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(auditRuleEClass, AuditRule.class, "AuditRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAuditRule_Id(), ecorePackage.getEString(), "id", null, 1, 1, AuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuditRule_Rule(), this.getConstraint(), null, "rule", null, 1, 1, AuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuditRule_Target(), this.getAuditable(), null, "target", null, 1, 1, AuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuditRule_Severity(), this.getSeverity(), "severity", "ERROR", 0, 1, AuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuditRule_UseInLiveMode(), ecorePackage.getEBoolean(), "useInLiveMode", "false", 0, 1, AuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAuditRule_Message(), ecorePackage.getEString(), "message", null, 0, 1, AuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAuditRule_Container(), this.getAuditContainer(), this.getAuditContainer_Audits(), "container", null, 1, 1, AuditRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(domainElementTargetEClass, DomainElementTarget.class, "DomainElementTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDomainElementTarget_Element(), ecorePackage.getEClass(), null, "element", null, 1, 1, DomainElementTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(domainAttributeTargetEClass, DomainAttributeTarget.class, "DomainAttributeTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDomainAttributeTarget_Attribute(), ecorePackage.getEAttribute(), null, "attribute", null, 1, 1, DomainAttributeTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDomainAttributeTarget_NullAsError(), ecorePackage.getEBoolean(), "nullAsError", null, 0, 1, DomainAttributeTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(diagramElementTargetEClass, DiagramElementTarget.class, "DiagramElementTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getDiagramElementTarget_Element(), this.getMappingEntry(), null, "element", null, 1, 1, DiagramElementTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(notationElementTargetEClass, NotationElementTarget.class, "NotationElementTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getNotationElementTarget_Element(), ecorePackage.getEClass(), null, "element", null, 1, 1, NotationElementTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(metricContainerEClass, MetricContainer.class, "MetricContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMetricContainer_Metrics(), this.getMetricRule(), this.getMetricRule_Container(), "metrics", null, 1, -1, MetricContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(metricRuleEClass, MetricRule.class, "MetricRule", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMetricRule_Key(), ecorePackage.getEString(), "key", null, 1, 1, MetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMetricRule_Rule(), this.getValueExpression(), null, "rule", null, 1, 1, MetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMetricRule_Target(), this.getMeasurable(), null, "target", null, 1, 1, MetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMetricRule_LowLimit(), ecorePackage.getEDoubleObject(), "lowLimit", null, 0, 1, MetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getMetricRule_HighLimit(), ecorePackage.getEDoubleObject(), "highLimit", null, 0, 1, MetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getMetricRule_Container(), this.getMetricContainer(), this.getMetricContainer_Metrics(), "container", null, 1, 1, MetricRule.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(auditedMetricTargetEClass, AuditedMetricTarget.class, "AuditedMetricTarget", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAuditedMetricTarget_Metric(), this.getMetricRule(), null, "metric", null, 1, 1, AuditedMetricTarget.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(auditableEClass, Auditable.class, "Auditable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(measurableEClass, Measurable.class, "Measurable", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(visualEffectMappingEClass, VisualEffectMapping.class, "VisualEffectMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getVisualEffectMapping_DiagramPin(), theGMFGraphPackage.getPin(), null, "diagramPin", null, 1, 1, VisualEffectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getVisualEffectMapping_OclExpression(), ecorePackage.getEString(), "oclExpression", null, 0, 1, VisualEffectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getVisualEffectMapping_ParentMapEntry(), this.getMappingEntry(), this.getMappingEntry_VisualEffects(), "parentMapEntry", null, 1, 1, VisualEffectMapping.class, !IS_TRANSIENT, !IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(labelTextAccessMethodEEnum, LabelTextAccessMethod.class, "LabelTextAccessMethod");
-		addEEnumLiteral(labelTextAccessMethodEEnum, LabelTextAccessMethod.MESSAGE_FORMAT);
-		addEEnumLiteral(labelTextAccessMethodEEnum, LabelTextAccessMethod.NATIVE);
-		addEEnumLiteral(labelTextAccessMethodEEnum, LabelTextAccessMethod.REGEXP);
-		addEEnumLiteral(labelTextAccessMethodEEnum, LabelTextAccessMethod.PRINTF);
-
-		initEEnum(severityEEnum, Severity.class, "Severity");
-		addEEnumLiteral(severityEEnum, Severity.INFO_LITERAL);
-		addEEnumLiteral(severityEEnum, Severity.WARNING_LITERAL);
-		addEEnumLiteral(severityEEnum, Severity.ERROR_LITERAL);
-
-		initEEnum(languageEEnum, Language.class, "Language");
-		addEEnumLiteral(languageEEnum, Language.OCL_LITERAL);
-		addEEnumLiteral(languageEEnum, Language.JAVA_LITERAL);
-		addEEnumLiteral(languageEEnum, Language.REGEXP_LITERAL);
-		addEEnumLiteral(languageEEnum, Language.NREGEXP_LITERAL);
-		addEEnumLiteral(languageEEnum, Language.LITERAL_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// http://www.eclipse.org/emf/2004/EmfaticAnnotationMap
-		createEmfaticAnnotationMapAnnotations();
-		// http://www.eclipse.org/gmf/2005/constraints
-		createConstraintsAnnotations();
-		// http://www.eclipse.org/gmf/2005/constraints/meta
-		createMetaAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/emf/2004/EmfaticAnnotationMap</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createEmfaticAnnotationMapAnnotations() {
-		String source = "http://www.eclipse.org/emf/2004/EmfaticAnnotationMap";		
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "constraints", "http://www.eclipse.org/gmf/2005/constraints",
-			 "constraintsMeta", "http://www.eclipse.org/gmf/2005/constraints/meta"
-		   });																																																																																																																										
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/gmf/2005/constraints/meta</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createMetaAnnotations() {
-		String source = "http://www.eclipse.org/gmf/2005/constraints/meta";							
-		addAnnotation
-		  (getMappingEntry_DomainSpecialization(), 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "self.getDomainContext()"
-		   });																																								
-		addAnnotation
-		  (constraintEClass, 
-		   source, 
-		   new String[] {
-			 "def", "Constraint"
-		   });						
-		addAnnotation
-		  (getLinkConstraints_SourceEnd(), 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif"
-		   });		
-		addAnnotation
-		  (getLinkConstraints_SourceEnd(), 
-		   source, 
-		   new String[] {
-			 "def", "variable",
-			 "name", "oppositeEnd",
-			 "type.ocl", "linkMapping.linkMetaFeature.eType"
-		   });			
-		addAnnotation
-		  (getLinkConstraints_TargetEnd(), 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "linkMapping.linkMetaFeature.eType.oclAsType(ecore::EClass)"
-		   });		
-		addAnnotation
-		  (getLinkConstraints_TargetEnd(), 
-		   source, 
-		   new String[] {
-			 "def", "variable",
-			 "name", "oppositeEnd",
-			 "type.ocl", "let lm:LinkMapping=linkMapping in if lm.sourceMetaFeature.oclIsUndefined() then (if lm.containmentFeature.oclIsUndefined() then lm.linkMetaFeature.eContainingClass else lm.containmentFeature.eContainingClass endif) else lm.sourceMetaFeature.oclAsType(ecore::EReference).eReferenceType endif"
-		   });		
-		addAnnotation
-		  (valueExpressionEClass, 
-		   source, 
-		   new String[] {
-			 "def", "ValueSpec"
-		   });				
-		addAnnotation
-		  (getValueExpression_Body(), 
-		   source, 
-		   new String[] {
-			 "def", "body"
-		   });			
-		addAnnotation
-		  (getValueExpression_LangName(), 
-		   source, 
-		   new String[] {
-			 "def", "lang"
-		   });													
-		addAnnotation
-		  (getFeatureValueSpec_Value(), 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "featureSeqInitializer.elementClass"
-		   });		
-		addAnnotation
-		  (getFeatureValueSpec_Value(), 
-		   source, 
-		   new String[] {
-			 "def", "type",
-			 "ocl", "feature"
-		   });																	
-		addAnnotation
-		  (getAuditRule_Rule(), 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ref", "target"
-		   });								
-		addAnnotation
-		  (domainElementTargetEClass, 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "element"
-		   });				
-		addAnnotation
-		  (domainAttributeTargetEClass, 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "attribute.eType"
-		   });					
-		addAnnotation
-		  (diagramElementTargetEClass, 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "if element.oclIsKindOf(NodeMapping) then \'notation::Node\' else \'notation::Edge\' endif"
-		   });				
-		addAnnotation
-		  (notationElementTargetEClass, 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "element"
-		   });								
-		addAnnotation
-		  (getMetricRule_Rule(), 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ref", "target"
-		   });		
-		addAnnotation
-		  (getMetricRule_Rule(), 
-		   source, 
-		   new String[] {
-			 "def", "type",
-			 "ocl", "\'ecore::EDoubleObject\'"
-		   });							
-		addAnnotation
-		  (auditedMetricTargetEClass, 
-		   source, 
-		   new String[] {
-			 "def", "context",
-			 "ocl", "\'ecore::EDoubleObject\'"
-		   });			
-	}
-
-	/**
-	 * Initializes the annotations for <b>http://www.eclipse.org/gmf/2005/constraints</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createConstraintsAnnotations() {
-		String source = "http://www.eclipse.org/gmf/2005/constraints";			
-		addAnnotation
-		  (this, 
-		   source, 
-		   new String[] {
-			 "import", "http://www.eclipse.org/gmf/runtime/1.0.0/notation"
-		   });		
-		addAnnotation
-		  (mappingEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "nodes->forAll(n|n.containmentFeature.oclIsUndefined() and not n.child.domainMetaElement.oclIsUndefined() implies links->exists(let r:ecore::EReference= linkMetaFeature.oclAsType(ecore::EReference) in r.containment and r.eReferenceType.isSuperTypeOf(n.child.domainMetaElement)))",
-			 "description", "Phantom nodes that are not targeted by a link mapping representing containment reference present in the model"
-		   });					
-		addAnnotation
-		  (getMappingEntry_DomainSpecialization(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not domainSpecialization.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()",
-			 "description", "Using \'Domain Specialization\' requires \'Domain Meta Element\' to be set"
-		   });			
-		addAnnotation
-		  (getMappingEntry_DomainInitializer(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not domainInitializer.oclIsUndefined() implies not domainMetaElement.oclIsUndefined()",
-			 "description", "\'Domain Element\' must be set in mapping with \'Element Initializers\'"
-		   });			
-		addAnnotation
-		  (getNeedsContainment_ContainmentFeature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not containmentFeature.oclIsUndefined() implies containmentFeature.containment",
-			 "description", "Containment EReference expected"
-		   });		
-		addAnnotation
-		  (nodeReferenceEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "not containmentFeature.oclIsUndefined() implies containmentFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)",
-			 "description", "\'Containment Feature\' must reference the same class or super type of \'Domain Meta Element\' of the referenced node"
-		   });		
-		addAnnotation
-		  (getNodeReference_ChildrenFeature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not childrenFeature.oclIsUndefined() implies childrenFeature.eReferenceType.isSuperTypeOf(child.domainMetaElement)",
-			 "description", "\'Children Feature\' must reference the same class or super type of \'Domain Meta Element\' of the referenced node"
-		   });		
-		addAnnotation
-		  (childReferenceEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "not (ownedChild.oclIsUndefined() and referencedChild.oclIsUndefined())",
-			 "description", "Either \'ownedChild\' or \'referencedChild\' NodeMapping must be set"
-		   });		
-		addAnnotation
-		  (childReferenceEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "not childrenFeature.oclIsUndefined() implies childrenFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)",
-			 "description", "\'Children Feature\' must be owned by \'Domain Meta Element\' or its super type of this reference parent Node Mapping"
-		   });		
-		addAnnotation
-		  (childReferenceEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "not containmentFeature.oclIsUndefined() implies containmentFeature.eContainingClass.isSuperTypeOf(parentNode.domainMetaElement)",
-			 "description", "\'Containment Feature\' must be owned by \'Domain Meta Element\' or its super type of this reference parent Node Mapping"
-		   });		
-		addAnnotation
-		  (childReferenceEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "not child.getDomainContext().oclIsUndefined() implies not containmentFeature.oclIsUndefined()",
-			 "description", "ChildReference to NodeMapping with domainElement should define \'containmentFeature\'"
-		   });		
-		addAnnotation
-		  (childReferenceEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in (((child.labelMappings->size() = 1) and child.labelMappings->forAll( soleLabel: LabelMapping | soleLabel.diagramLabel = child.diagramNode)) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))",
-			 "description", "Side-affixed children can not be pure labels"
-		   });		
-		addAnnotation
-		  (childReferenceEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "let child:NodeMapping=(if ownedChild.oclIsUndefined() then referencedChild else ownedChild endif) in ((not compartment.oclIsUndefined()) implies (child.diagramNode.affixedParentSide = gmfgraph::Direction::NONE))",
-			 "description", "Side-affixed children can not be placed in compartments"
-		   });				
-		addAnnotation
-		  (linkMappingEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "domainMetaElement.oclIsUndefined() implies containmentFeature.oclIsUndefined() and sourceMetaFeature.oclIsUndefined()",
-			 "description", "Link mapping without \'Domain Element\' class does not use \'Containment Feature\' and \'Source Feature\'"
-		   });		
-		addAnnotation
-		  (linkMappingEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "not domainMetaElement.oclIsUndefined()  implies containmentFeature.eReferenceType.isSuperTypeOf(domainMetaElement)",
-			 "description", "\'Containment Feature\' must reference the same class or super type of \'Domain Element\' EClass"
-		   });		
-		addAnnotation
-		  (getLinkMapping_SourceMetaFeature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not domainMetaElement.oclIsUndefined() implies sourceMetaFeature.oclIsUndefined() or sourceMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)",
-			 "description", "\'Source Feature\' must be owned by the link \'Domain Element\' or its super type"
-		   });		
-		addAnnotation
-		  (getLinkMapping_LinkMetaFeature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not(domainMetaElement.oclIsUndefined() or linkMetaFeature.oclIsUndefined()) implies linkMetaFeature.eContainingClass.isSuperTypeOf(domainMetaElement)",
-			 "description", "\'Target Feature\' must be owned by the link \'Domain Element\' or its super type"
-		   });			
-		addAnnotation
-		  (getCanvasMapping_DomainMetaElement(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not domainMetaElement.oclIsUndefined() implies not(domainMetaElement.abstract or domainMetaElement.interface)",
-			 "description", "Top-level diagram container must be concrete"
-		   });				
-		addAnnotation
-		  (getFeatureLabelMapping_Features(), 
-		   source, 
-		   new String[] {
-			 "ocl", "features->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))",
-			 "description", "Label attributes must be available in \'Domain Element\' EClass of the labeled mapping entry"
-		   });		
-		addAnnotation
-		  (getFeatureLabelMapping_EditableFeatures(), 
-		   source, 
-		   new String[] {
-			 "ocl", "editableFeatures->forAll(f | f.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement))",
-			 "description", "Label attributes must be available in \'Domain Element\' EClass of the labeled mapping entry"
-		   });						
-		addAnnotation
-		  (getOclChoiceLabelMapping_Feature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "feature.eContainingClass.isSuperTypeOf(mapEntry.domainMetaElement)",
-			 "description", "Label reference must be available in \'Domain Element\' EClass of the labeled mapping entry"
-		   });		
-		addAnnotation
-		  (getOclChoiceLabelMapping_Feature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "feature.oclIsKindOf(ecore::EReference) implies (not(feature.oclAsType(ecore::EReference).containment) and (feature.oclAsType(ecore::EReference).upperBound = 1))",
-			 "description", "Reference feature should not be containment and don\'t be multiple"
-		   });		
-		addAnnotation
-		  (getOclChoiceLabelMapping_Feature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "feature.oclIsKindOf(ecore::EAttribute) implies (itemsExpression <> null)",
-			 "description", "Items expression should be set if feature is an EAttribute"
-		   });										
-		addAnnotation
-		  (linkConstraintsEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "not (sourceEnd.oclIsUndefined() and targetEnd.oclIsUndefined())",
-			 "description", "Either \'sourceEnd\' or \'targetEnd\' constraint must be specified"
-		   });																			
-		addAnnotation
-		  (getFeatureSeqInitializer_ElementClass(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not creatingInitializer.feature.oclIsUndefined() implies creatingInitializer.feature.oclAsType(ecore::EReference).eReferenceType.isSuperTypeOf(elementClass)",
-			 "description", "\'elementClass\' must be the same as or sub-type of the containing \'GenReferenceNewElementSpec\' reference type"
-		   });		
-		addAnnotation
-		  (getFeatureSeqInitializer_ElementClass(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not creatingInitializer.feature.oclIsUndefined() implies not (elementClass.interface or elementClass.abstract)",
-			 "description", "\'elementClass\' must be a concrete EClass which is the same or sub-type of the containing \'GenReferenceNewElementSpec\' reference type"
-		   });			
-		addAnnotation
-		  (getFeatureInitializer_Feature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "feature <> null implies not featureSeqInitializer.initializers->exists(i| i <> self and i.feature = self.feature)",
-			 "description", "The feature is already initialized by another \'FeatureInitializer\' in the sequence"
-		   });		
-		addAnnotation
-		  (getFeatureInitializer_Feature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "feature <> null implies feature.eContainingClass.isSuperTypeOf(featureSeqInitializer.elementClass)",
-			 "description", "The \'feature\' of \'FeatureInitializer\' must be available in \'Meta Class\' of the initialized element"
-		   });		
-		addAnnotation
-		  (getFeatureInitializer_Feature(), 
-		   source, 
-		   new String[] {
-			 "ocl", "feature <> null implies feature.changeable",
-			 "description", "The \'feature\' of \'FeatureInitializer\' must be changeable"
-		   });					
-		addAnnotation
-		  (referenceNewElementSpecEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "feature.many = false implies not (newElementInitializers->size() > 1)",
-			 "description", "FeatureInitializer for single element EReference can\'t contain multiple element initializers"
-		   });		
-		addAnnotation
-		  (referenceNewElementSpecEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "let r: ecore::EReference = feature.oclAsType(ecore::EReference) in feature <> null implies r.containment",
-			 "description", "\'feature\' of \'ReferenceNewElementSpec\' must refer to containment ecore::EReference"
-		   });					
-		addAnnotation
-		  (getAuditContainer_Id(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not parentContainer.oclIsUndefined() implies parentContainer.childContainers->one(i | i.id = self.id)",
-			 "description", "Audit container with the same ID already exists"
-		   });									
-		addAnnotation
-		  (getAuditRule_Id(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not id.oclIsUndefined() implies container.audits->one(i | i.id = self.id)",
-			 "description", "Audit rule with the same ID already exists"
-		   });																						
-		addAnnotation
-		  (getNotationElementTarget_Element(), 
-		   source, 
-		   new String[] {
-			 "ocl", "element.eAllSuperTypes->including(element)->one(ePackage.name = \'notation\' and name = \'View\')",
-			 "description", "\'notation::View\' or its sub-class must be set to NotationElement target"
-		   });		
-		addAnnotation
-		  (metricRuleEClass, 
-		   source, 
-		   new String[] {
-			 "ocl", "not lowLimit.oclIsUndefined() and not highLimit.oclIsUndefined()  implies lowLimit < highLimit",
-			 "description", "Metric value \'lowLimit\' must be smaller then \'highLimit\'"
-		   });			
-		addAnnotation
-		  (getMetricRule_Key(), 
-		   source, 
-		   new String[] {
-			 "ocl", "not key.oclIsUndefined() implies container.metrics->one(i | i.key = self.key)",
-			 "description", "Metric rule with the same \'key\' already exists"
-		   });												
-	}
-
-} //GMFMapPackageImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LabelMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LabelMappingImpl.java
deleted file mode 100644
index d930d0714a4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LabelMappingImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.DiagramLabel;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LabelMappingImpl#getDiagramLabel <em>Diagram Label</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LabelMappingImpl#isReadOnly <em>Read Only</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LabelMappingImpl#getMapEntry <em>Map Entry</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LabelMappingImpl extends EObjectImpl implements LabelMapping {
-	/**
-	 * The cached value of the '{@link #getDiagramLabel() <em>Diagram Label</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagramLabel()
-	 * @generated
-	 * @ordered
-	 */
-	protected DiagramLabel diagramLabel;
-
-	/**
-	 * The default value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean READ_ONLY_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isReadOnly() <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isReadOnly()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean readOnly = READ_ONLY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LabelMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getLabelMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramLabel getDiagramLabel() {
-		if (diagramLabel != null && diagramLabel.eIsProxy()) {
-			InternalEObject oldDiagramLabel = (InternalEObject)diagramLabel;
-			diagramLabel = (DiagramLabel)eResolveProxy(oldDiagramLabel);
-			if (diagramLabel != oldDiagramLabel) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.LABEL_MAPPING__DIAGRAM_LABEL, oldDiagramLabel, diagramLabel));
-			}
-		}
-		return diagramLabel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DiagramLabel basicGetDiagramLabel() {
-		return diagramLabel;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiagramLabel(DiagramLabel newDiagramLabel) {
-		DiagramLabel oldDiagramLabel = diagramLabel;
-		diagramLabel = newDiagramLabel;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LABEL_MAPPING__DIAGRAM_LABEL, oldDiagramLabel, diagramLabel));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isReadOnly() {
-		return readOnly;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setReadOnly(boolean newReadOnly) {
-		boolean oldReadOnly = readOnly;
-		readOnly = newReadOnly;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LABEL_MAPPING__READ_ONLY, oldReadOnly, readOnly));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MappingEntry getMapEntry() {
-		if (eContainerFeatureID() != GMFMapPackage.LABEL_MAPPING__MAP_ENTRY) return null;
-		return (MappingEntry)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.LABEL_MAPPING__MAP_ENTRY:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return eBasicSetContainer(otherEnd, GMFMapPackage.LABEL_MAPPING__MAP_ENTRY, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.LABEL_MAPPING__MAP_ENTRY:
-				return eBasicSetContainer(null, GMFMapPackage.LABEL_MAPPING__MAP_ENTRY, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.LABEL_MAPPING__MAP_ENTRY:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS, MappingEntry.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.LABEL_MAPPING__DIAGRAM_LABEL:
-				if (resolve) return getDiagramLabel();
-				return basicGetDiagramLabel();
-			case GMFMapPackage.LABEL_MAPPING__READ_ONLY:
-				return isReadOnly();
-			case GMFMapPackage.LABEL_MAPPING__MAP_ENTRY:
-				return getMapEntry();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.LABEL_MAPPING__DIAGRAM_LABEL:
-				setDiagramLabel((DiagramLabel)newValue);
-				return;
-			case GMFMapPackage.LABEL_MAPPING__READ_ONLY:
-				setReadOnly((Boolean)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.LABEL_MAPPING__DIAGRAM_LABEL:
-				setDiagramLabel((DiagramLabel)null);
-				return;
-			case GMFMapPackage.LABEL_MAPPING__READ_ONLY:
-				setReadOnly(READ_ONLY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.LABEL_MAPPING__DIAGRAM_LABEL:
-				return diagramLabel != null;
-			case GMFMapPackage.LABEL_MAPPING__READ_ONLY:
-				return readOnly != READ_ONLY_EDEFAULT;
-			case GMFMapPackage.LABEL_MAPPING__MAP_ENTRY:
-				return getMapEntry() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (readOnly: ");
-		result.append(readOnly);
-		result.append(')');
-		return result.toString();
-	}
-
-} //LabelMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LinkConstraintsImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LinkConstraintsImpl.java
deleted file mode 100644
index 12d3a7adbf8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LinkConstraintsImpl.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LinkConstraints;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Link Constraints</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkConstraintsImpl#getLinkMapping <em>Link Mapping</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkConstraintsImpl#getSourceEnd <em>Source End</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkConstraintsImpl#getTargetEnd <em>Target End</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LinkConstraintsImpl extends EObjectImpl implements LinkConstraints {
-	/**
-	 * The cached value of the '{@link #getSourceEnd() <em>Source End</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSourceEnd()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint sourceEnd;
-
-	/**
-	 * The cached value of the '{@link #getTargetEnd() <em>Target End</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTargetEnd()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint targetEnd;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LinkConstraintsImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getLinkConstraints();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LinkMapping getLinkMapping() {
-		if (eContainerFeatureID() != GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING) return null;
-		return (LinkMapping)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getSourceEnd() {
-		return sourceEnd;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSourceEnd(Constraint newSourceEnd, NotificationChain msgs) {
-		Constraint oldSourceEnd = sourceEnd;
-		sourceEnd = newSourceEnd;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END, oldSourceEnd, newSourceEnd);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSourceEnd(Constraint newSourceEnd) {
-		if (newSourceEnd != sourceEnd) {
-			NotificationChain msgs = null;
-			if (sourceEnd != null)
-				msgs = ((InternalEObject)sourceEnd).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END, null, msgs);
-			if (newSourceEnd != null)
-				msgs = ((InternalEObject)newSourceEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END, null, msgs);
-			msgs = basicSetSourceEnd(newSourceEnd, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END, newSourceEnd, newSourceEnd));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getTargetEnd() {
-		return targetEnd;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTargetEnd(Constraint newTargetEnd, NotificationChain msgs) {
-		Constraint oldTargetEnd = targetEnd;
-		targetEnd = newTargetEnd;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_CONSTRAINTS__TARGET_END, oldTargetEnd, newTargetEnd);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTargetEnd(Constraint newTargetEnd) {
-		if (newTargetEnd != targetEnd) {
-			NotificationChain msgs = null;
-			if (targetEnd != null)
-				msgs = ((InternalEObject)targetEnd).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.LINK_CONSTRAINTS__TARGET_END, null, msgs);
-			if (newTargetEnd != null)
-				msgs = ((InternalEObject)newTargetEnd).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.LINK_CONSTRAINTS__TARGET_END, null, msgs);
-			msgs = basicSetTargetEnd(newTargetEnd, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_CONSTRAINTS__TARGET_END, newTargetEnd, newTargetEnd));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return eBasicSetContainer(otherEnd, GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING:
-				return eBasicSetContainer(null, GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING, msgs);
-			case GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END:
-				return basicSetSourceEnd(null, msgs);
-			case GMFMapPackage.LINK_CONSTRAINTS__TARGET_END:
-				return basicSetTargetEnd(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS, LinkMapping.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING:
-				return getLinkMapping();
-			case GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END:
-				return getSourceEnd();
-			case GMFMapPackage.LINK_CONSTRAINTS__TARGET_END:
-				return getTargetEnd();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END:
-				setSourceEnd((Constraint)newValue);
-				return;
-			case GMFMapPackage.LINK_CONSTRAINTS__TARGET_END:
-				setTargetEnd((Constraint)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END:
-				setSourceEnd((Constraint)null);
-				return;
-			case GMFMapPackage.LINK_CONSTRAINTS__TARGET_END:
-				setTargetEnd((Constraint)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING:
-				return getLinkMapping() != null;
-			case GMFMapPackage.LINK_CONSTRAINTS__SOURCE_END:
-				return sourceEnd != null;
-			case GMFMapPackage.LINK_CONSTRAINTS__TARGET_END:
-				return targetEnd != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //LinkConstraintsImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LinkMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LinkMappingImpl.java
deleted file mode 100644
index 6b0f7869950..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/LinkMappingImpl.java
+++ /dev/null
@@ -1,722 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Connection;
-import org.eclipse.papyrus.gmf.mappings.AppearanceSteward;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LinkConstraints;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.MenuOwner;
-import org.eclipse.papyrus.gmf.mappings.NeedsContainment;
-import org.eclipse.papyrus.gmf.mappings.ToolOwner;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.ContextMenu;
-import org.eclipse.papyrus.gmf.tooldef.StyleSelector;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Link Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl#getContainmentFeature <em>Containment Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl#getContextMenu <em>Context Menu</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl#getTool <em>Tool</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl#getAppearanceStyle <em>Appearance Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl#getDiagramLink <em>Diagram Link</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl#getSourceMetaFeature <em>Source Meta Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl#getLinkMetaFeature <em>Link Meta Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.LinkMappingImpl#getCreationConstraints <em>Creation Constraints</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class LinkMappingImpl extends MappingEntryImpl implements LinkMapping {
-	/**
-	 * The cached value of the '{@link #getContainmentFeature() <em>Containment Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContainmentFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EReference containmentFeature;
-
-	/**
-	 * The cached value of the '{@link #getContextMenu() <em>Context Menu</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextMenu()
-	 * @generated
-	 * @ordered
-	 */
-	protected ContextMenu contextMenu;
-
-	/**
-	 * The cached value of the '{@link #getTool() <em>Tool</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTool()
-	 * @generated
-	 * @ordered
-	 */
-	protected AbstractTool tool;
-
-	/**
-	 * The cached value of the '{@link #getAppearanceStyle() <em>Appearance Style</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAppearanceStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected StyleSelector appearanceStyle;
-
-	/**
-	 * The cached value of the '{@link #getDiagramLink() <em>Diagram Link</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagramLink()
-	 * @generated
-	 * @ordered
-	 */
-	protected Connection diagramLink;
-
-	/**
-	 * The cached value of the '{@link #getSourceMetaFeature() <em>Source Meta Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSourceMetaFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature sourceMetaFeature;
-
-	/**
-	 * The cached value of the '{@link #getLinkMetaFeature() <em>Link Meta Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinkMetaFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature linkMetaFeature;
-
-	/**
-	 * The cached value of the '{@link #getCreationConstraints() <em>Creation Constraints</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCreationConstraints()
-	 * @generated
-	 * @ordered
-	 */
-	protected LinkConstraints creationConstraints;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected LinkMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getLinkMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainmentFeature() {
-		if (containmentFeature != null && containmentFeature.eIsProxy()) {
-			InternalEObject oldContainmentFeature = (InternalEObject)containmentFeature;
-			containmentFeature = (EReference)eResolveProxy(oldContainmentFeature);
-			if (containmentFeature != oldContainmentFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.LINK_MAPPING__CONTAINMENT_FEATURE, oldContainmentFeature, containmentFeature));
-			}
-		}
-		return containmentFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference basicGetContainmentFeature() {
-		return containmentFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainmentFeature(EReference newContainmentFeature) {
-		EReference oldContainmentFeature = containmentFeature;
-		containmentFeature = newContainmentFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__CONTAINMENT_FEATURE, oldContainmentFeature, containmentFeature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextMenu getContextMenu() {
-		if (contextMenu != null && contextMenu.eIsProxy()) {
-			InternalEObject oldContextMenu = (InternalEObject)contextMenu;
-			contextMenu = (ContextMenu)eResolveProxy(oldContextMenu);
-			if (contextMenu != oldContextMenu) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.LINK_MAPPING__CONTEXT_MENU, oldContextMenu, contextMenu));
-			}
-		}
-		return contextMenu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextMenu basicGetContextMenu() {
-		return contextMenu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContextMenu(ContextMenu newContextMenu) {
-		ContextMenu oldContextMenu = contextMenu;
-		contextMenu = newContextMenu;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__CONTEXT_MENU, oldContextMenu, contextMenu));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Connection getDiagramLink() {
-		if (diagramLink != null && diagramLink.eIsProxy()) {
-			InternalEObject oldDiagramLink = (InternalEObject)diagramLink;
-			diagramLink = (Connection)eResolveProxy(oldDiagramLink);
-			if (diagramLink != oldDiagramLink) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.LINK_MAPPING__DIAGRAM_LINK, oldDiagramLink, diagramLink));
-			}
-		}
-		return diagramLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Connection basicGetDiagramLink() {
-		return diagramLink;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiagramLink(Connection newDiagramLink) {
-		Connection oldDiagramLink = diagramLink;
-		diagramLink = newDiagramLink;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__DIAGRAM_LINK, oldDiagramLink, diagramLink));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature getSourceMetaFeature() {
-		if (sourceMetaFeature != null && sourceMetaFeature.eIsProxy()) {
-			InternalEObject oldSourceMetaFeature = (InternalEObject)sourceMetaFeature;
-			sourceMetaFeature = (EStructuralFeature)eResolveProxy(oldSourceMetaFeature);
-			if (sourceMetaFeature != oldSourceMetaFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.LINK_MAPPING__SOURCE_META_FEATURE, oldSourceMetaFeature, sourceMetaFeature));
-			}
-		}
-		return sourceMetaFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature basicGetSourceMetaFeature() {
-		return sourceMetaFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSourceMetaFeature(EStructuralFeature newSourceMetaFeature) {
-		EStructuralFeature oldSourceMetaFeature = sourceMetaFeature;
-		sourceMetaFeature = newSourceMetaFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__SOURCE_META_FEATURE, oldSourceMetaFeature, sourceMetaFeature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature getLinkMetaFeature() {
-		if (linkMetaFeature != null && linkMetaFeature.eIsProxy()) {
-			InternalEObject oldLinkMetaFeature = (InternalEObject)linkMetaFeature;
-			linkMetaFeature = (EStructuralFeature)eResolveProxy(oldLinkMetaFeature);
-			if (linkMetaFeature != oldLinkMetaFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.LINK_MAPPING__LINK_META_FEATURE, oldLinkMetaFeature, linkMetaFeature));
-			}
-		}
-		return linkMetaFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature basicGetLinkMetaFeature() {
-		return linkMetaFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLinkMetaFeature(EStructuralFeature newLinkMetaFeature) {
-		EStructuralFeature oldLinkMetaFeature = linkMetaFeature;
-		linkMetaFeature = newLinkMetaFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__LINK_META_FEATURE, oldLinkMetaFeature, linkMetaFeature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public LinkConstraints getCreationConstraints() {
-		return creationConstraints;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetCreationConstraints(LinkConstraints newCreationConstraints, NotificationChain msgs) {
-		LinkConstraints oldCreationConstraints = creationConstraints;
-		creationConstraints = newCreationConstraints;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS, oldCreationConstraints, newCreationConstraints);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCreationConstraints(LinkConstraints newCreationConstraints) {
-		if (newCreationConstraints != creationConstraints) {
-			NotificationChain msgs = null;
-			if (creationConstraints != null)
-				msgs = ((InternalEObject)creationConstraints).eInverseRemove(this, GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING, LinkConstraints.class, msgs);
-			if (newCreationConstraints != null)
-				msgs = ((InternalEObject)newCreationConstraints).eInverseAdd(this, GMFMapPackage.LINK_CONSTRAINTS__LINK_MAPPING, LinkConstraints.class, msgs);
-			msgs = basicSetCreationConstraints(newCreationConstraints, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS, newCreationConstraints, newCreationConstraints));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTool getTool() {
-		if (tool != null && tool.eIsProxy()) {
-			InternalEObject oldTool = (InternalEObject)tool;
-			tool = (AbstractTool)eResolveProxy(oldTool);
-			if (tool != oldTool) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.LINK_MAPPING__TOOL, oldTool, tool));
-			}
-		}
-		return tool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTool basicGetTool() {
-		return tool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTool(AbstractTool newTool) {
-		AbstractTool oldTool = tool;
-		tool = newTool;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__TOOL, oldTool, tool));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StyleSelector getAppearanceStyle() {
-		if (appearanceStyle != null && appearanceStyle.eIsProxy()) {
-			InternalEObject oldAppearanceStyle = (InternalEObject)appearanceStyle;
-			appearanceStyle = (StyleSelector)eResolveProxy(oldAppearanceStyle);
-			if (appearanceStyle != oldAppearanceStyle) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.LINK_MAPPING__APPEARANCE_STYLE, oldAppearanceStyle, appearanceStyle));
-			}
-		}
-		return appearanceStyle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StyleSelector basicGetAppearanceStyle() {
-		return appearanceStyle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAppearanceStyle(StyleSelector newAppearanceStyle) {
-		StyleSelector oldAppearanceStyle = appearanceStyle;
-		appearanceStyle = newAppearanceStyle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.LINK_MAPPING__APPEARANCE_STYLE, oldAppearanceStyle, appearanceStyle));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * This method was created to simplify transtofmation code.
-	 * @return getDomainMetaElement() if specified, and getLinkMetaFeature().getEContainingClass()  
-	 * if link meta feature was specified. <code>null</code> otherwise.
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public EClass getDomainContext() {
-		if (getDomainMetaElement() != null) {
-			return getDomainMetaElement();
-		}
-		if (getLinkMetaFeature() != null) {
-			return getLinkMetaFeature().getEContainingClass();
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS:
-				if (creationConstraints != null)
-					msgs = ((InternalEObject)creationConstraints).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS, null, msgs);
-				return basicSetCreationConstraints((LinkConstraints)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS:
-				return basicSetCreationConstraints(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_MAPPING__CONTAINMENT_FEATURE:
-				if (resolve) return getContainmentFeature();
-				return basicGetContainmentFeature();
-			case GMFMapPackage.LINK_MAPPING__CONTEXT_MENU:
-				if (resolve) return getContextMenu();
-				return basicGetContextMenu();
-			case GMFMapPackage.LINK_MAPPING__TOOL:
-				if (resolve) return getTool();
-				return basicGetTool();
-			case GMFMapPackage.LINK_MAPPING__APPEARANCE_STYLE:
-				if (resolve) return getAppearanceStyle();
-				return basicGetAppearanceStyle();
-			case GMFMapPackage.LINK_MAPPING__DIAGRAM_LINK:
-				if (resolve) return getDiagramLink();
-				return basicGetDiagramLink();
-			case GMFMapPackage.LINK_MAPPING__SOURCE_META_FEATURE:
-				if (resolve) return getSourceMetaFeature();
-				return basicGetSourceMetaFeature();
-			case GMFMapPackage.LINK_MAPPING__LINK_META_FEATURE:
-				if (resolve) return getLinkMetaFeature();
-				return basicGetLinkMetaFeature();
-			case GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS:
-				return getCreationConstraints();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_MAPPING__CONTAINMENT_FEATURE:
-				setContainmentFeature((EReference)newValue);
-				return;
-			case GMFMapPackage.LINK_MAPPING__CONTEXT_MENU:
-				setContextMenu((ContextMenu)newValue);
-				return;
-			case GMFMapPackage.LINK_MAPPING__TOOL:
-				setTool((AbstractTool)newValue);
-				return;
-			case GMFMapPackage.LINK_MAPPING__APPEARANCE_STYLE:
-				setAppearanceStyle((StyleSelector)newValue);
-				return;
-			case GMFMapPackage.LINK_MAPPING__DIAGRAM_LINK:
-				setDiagramLink((Connection)newValue);
-				return;
-			case GMFMapPackage.LINK_MAPPING__SOURCE_META_FEATURE:
-				setSourceMetaFeature((EStructuralFeature)newValue);
-				return;
-			case GMFMapPackage.LINK_MAPPING__LINK_META_FEATURE:
-				setLinkMetaFeature((EStructuralFeature)newValue);
-				return;
-			case GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS:
-				setCreationConstraints((LinkConstraints)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_MAPPING__CONTAINMENT_FEATURE:
-				setContainmentFeature((EReference)null);
-				return;
-			case GMFMapPackage.LINK_MAPPING__CONTEXT_MENU:
-				setContextMenu((ContextMenu)null);
-				return;
-			case GMFMapPackage.LINK_MAPPING__TOOL:
-				setTool((AbstractTool)null);
-				return;
-			case GMFMapPackage.LINK_MAPPING__APPEARANCE_STYLE:
-				setAppearanceStyle((StyleSelector)null);
-				return;
-			case GMFMapPackage.LINK_MAPPING__DIAGRAM_LINK:
-				setDiagramLink((Connection)null);
-				return;
-			case GMFMapPackage.LINK_MAPPING__SOURCE_META_FEATURE:
-				setSourceMetaFeature((EStructuralFeature)null);
-				return;
-			case GMFMapPackage.LINK_MAPPING__LINK_META_FEATURE:
-				setLinkMetaFeature((EStructuralFeature)null);
-				return;
-			case GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS:
-				setCreationConstraints((LinkConstraints)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.LINK_MAPPING__CONTAINMENT_FEATURE:
-				return containmentFeature != null;
-			case GMFMapPackage.LINK_MAPPING__CONTEXT_MENU:
-				return contextMenu != null;
-			case GMFMapPackage.LINK_MAPPING__TOOL:
-				return tool != null;
-			case GMFMapPackage.LINK_MAPPING__APPEARANCE_STYLE:
-				return appearanceStyle != null;
-			case GMFMapPackage.LINK_MAPPING__DIAGRAM_LINK:
-				return diagramLink != null;
-			case GMFMapPackage.LINK_MAPPING__SOURCE_META_FEATURE:
-				return sourceMetaFeature != null;
-			case GMFMapPackage.LINK_MAPPING__LINK_META_FEATURE:
-				return linkMetaFeature != null;
-			case GMFMapPackage.LINK_MAPPING__CREATION_CONSTRAINTS:
-				return creationConstraints != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == NeedsContainment.class) {
-			switch (derivedFeatureID) {
-				case GMFMapPackage.LINK_MAPPING__CONTAINMENT_FEATURE: return GMFMapPackage.NEEDS_CONTAINMENT__CONTAINMENT_FEATURE;
-				default: return -1;
-			}
-		}
-		if (baseClass == MenuOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFMapPackage.LINK_MAPPING__CONTEXT_MENU: return GMFMapPackage.MENU_OWNER__CONTEXT_MENU;
-				default: return -1;
-			}
-		}
-		if (baseClass == ToolOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFMapPackage.LINK_MAPPING__TOOL: return GMFMapPackage.TOOL_OWNER__TOOL;
-				default: return -1;
-			}
-		}
-		if (baseClass == AppearanceSteward.class) {
-			switch (derivedFeatureID) {
-				case GMFMapPackage.LINK_MAPPING__APPEARANCE_STYLE: return GMFMapPackage.APPEARANCE_STEWARD__APPEARANCE_STYLE;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == NeedsContainment.class) {
-			switch (baseFeatureID) {
-				case GMFMapPackage.NEEDS_CONTAINMENT__CONTAINMENT_FEATURE: return GMFMapPackage.LINK_MAPPING__CONTAINMENT_FEATURE;
-				default: return -1;
-			}
-		}
-		if (baseClass == MenuOwner.class) {
-			switch (baseFeatureID) {
-				case GMFMapPackage.MENU_OWNER__CONTEXT_MENU: return GMFMapPackage.LINK_MAPPING__CONTEXT_MENU;
-				default: return -1;
-			}
-		}
-		if (baseClass == ToolOwner.class) {
-			switch (baseFeatureID) {
-				case GMFMapPackage.TOOL_OWNER__TOOL: return GMFMapPackage.LINK_MAPPING__TOOL;
-				default: return -1;
-			}
-		}
-		if (baseClass == AppearanceSteward.class) {
-			switch (baseFeatureID) {
-				case GMFMapPackage.APPEARANCE_STEWARD__APPEARANCE_STYLE: return GMFMapPackage.LINK_MAPPING__APPEARANCE_STYLE;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-} //LinkMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MappingEntryImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MappingEntryImpl.java
deleted file mode 100644
index ad88ed2d5b4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MappingEntryImpl.java
+++ /dev/null
@@ -1,458 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.EObjectResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.ElementInitializer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.VisualEffectMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Entry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingEntryImpl#getDomainMetaElement <em>Domain Meta Element</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingEntryImpl#getDomainSpecialization <em>Domain Specialization</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingEntryImpl#getDomainInitializer <em>Domain Initializer</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingEntryImpl#getLabelMappings <em>Label Mappings</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingEntryImpl#getRelatedDiagrams <em>Related Diagrams</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingEntryImpl#getVisualEffects <em>Visual Effects</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MappingEntryImpl extends EObjectImpl implements MappingEntry {
-	/**
-	 * The cached value of the '{@link #getDomainMetaElement() <em>Domain Meta Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDomainMetaElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClass domainMetaElement;
-
-	/**
-	 * The cached value of the '{@link #getDomainSpecialization() <em>Domain Specialization</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDomainSpecialization()
-	 * @generated
-	 * @ordered
-	 */
-	protected Constraint domainSpecialization;
-
-	/**
-	 * The cached value of the '{@link #getDomainInitializer() <em>Domain Initializer</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDomainInitializer()
-	 * @generated
-	 * @ordered
-	 */
-	protected ElementInitializer domainInitializer;
-
-	/**
-	 * The cached value of the '{@link #getLabelMappings() <em>Label Mappings</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLabelMappings()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<LabelMapping> labelMappings;
-
-	/**
-	 * The cached value of the '{@link #getRelatedDiagrams() <em>Related Diagrams</em>}' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRelatedDiagrams()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<CanvasMapping> relatedDiagrams;
-
-	/**
-	 * The cached value of the '{@link #getVisualEffects() <em>Visual Effects</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getVisualEffects()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<VisualEffectMapping> visualEffects;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MappingEntryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getMappingEntry();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDomainMetaElement() {
-		if (domainMetaElement != null && domainMetaElement.eIsProxy()) {
-			InternalEObject oldDomainMetaElement = (InternalEObject)domainMetaElement;
-			domainMetaElement = (EClass)eResolveProxy(oldDomainMetaElement);
-			if (domainMetaElement != oldDomainMetaElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.MAPPING_ENTRY__DOMAIN_META_ELEMENT, oldDomainMetaElement, domainMetaElement));
-			}
-		}
-		return domainMetaElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass basicGetDomainMetaElement() {
-		return domainMetaElement;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDomainMetaElement(EClass newDomainMetaElement) {
-		EClass oldDomainMetaElement = domainMetaElement;
-		domainMetaElement = newDomainMetaElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING_ENTRY__DOMAIN_META_ELEMENT, oldDomainMetaElement, domainMetaElement));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Constraint getDomainSpecialization() {
-		return domainSpecialization;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDomainSpecialization(Constraint newDomainSpecialization, NotificationChain msgs) {
-		Constraint oldDomainSpecialization = domainSpecialization;
-		domainSpecialization = newDomainSpecialization;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION, oldDomainSpecialization, newDomainSpecialization);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDomainSpecialization(Constraint newDomainSpecialization) {
-		if (newDomainSpecialization != domainSpecialization) {
-			NotificationChain msgs = null;
-			if (domainSpecialization != null)
-				msgs = ((InternalEObject)domainSpecialization).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION, null, msgs);
-			if (newDomainSpecialization != null)
-				msgs = ((InternalEObject)newDomainSpecialization).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION, null, msgs);
-			msgs = basicSetDomainSpecialization(newDomainSpecialization, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION, newDomainSpecialization, newDomainSpecialization));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ElementInitializer getDomainInitializer() {
-		return domainInitializer;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDomainInitializer(ElementInitializer newDomainInitializer, NotificationChain msgs) {
-		ElementInitializer oldDomainInitializer = domainInitializer;
-		domainInitializer = newDomainInitializer;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER, oldDomainInitializer, newDomainInitializer);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDomainInitializer(ElementInitializer newDomainInitializer) {
-		if (newDomainInitializer != domainInitializer) {
-			NotificationChain msgs = null;
-			if (domainInitializer != null)
-				msgs = ((InternalEObject)domainInitializer).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER, null, msgs);
-			if (newDomainInitializer != null)
-				msgs = ((InternalEObject)newDomainInitializer).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER, null, msgs);
-			msgs = basicSetDomainInitializer(newDomainInitializer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER, newDomainInitializer, newDomainInitializer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<LabelMapping> getLabelMappings() {
-		if (labelMappings == null) {
-			labelMappings = new EObjectContainmentWithInverseEList<LabelMapping>(LabelMapping.class, this, GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS, GMFMapPackage.LABEL_MAPPING__MAP_ENTRY);
-		}
-		return labelMappings;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<CanvasMapping> getRelatedDiagrams() {
-		if (relatedDiagrams == null) {
-			relatedDiagrams = new EObjectResolvingEList<CanvasMapping>(CanvasMapping.class, this, GMFMapPackage.MAPPING_ENTRY__RELATED_DIAGRAMS);
-		}
-		return relatedDiagrams;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<VisualEffectMapping> getVisualEffects() {
-		if (visualEffects == null) {
-			visualEffects = new EObjectContainmentWithInverseEList<VisualEffectMapping>(VisualEffectMapping.class, this, GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY);
-		}
-		return visualEffects;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public abstract EClass getDomainContext();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getLabelMappings()).basicAdd(otherEnd, msgs);
-			case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getVisualEffects()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION:
-				return basicSetDomainSpecialization(null, msgs);
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER:
-				return basicSetDomainInitializer(null, msgs);
-			case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
-				return ((InternalEList<?>)getLabelMappings()).basicRemove(otherEnd, msgs);
-			case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
-				return ((InternalEList<?>)getVisualEffects()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_META_ELEMENT:
-				if (resolve) return getDomainMetaElement();
-				return basicGetDomainMetaElement();
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION:
-				return getDomainSpecialization();
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER:
-				return getDomainInitializer();
-			case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
-				return getLabelMappings();
-			case GMFMapPackage.MAPPING_ENTRY__RELATED_DIAGRAMS:
-				return getRelatedDiagrams();
-			case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
-				return getVisualEffects();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_META_ELEMENT:
-				setDomainMetaElement((EClass)newValue);
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION:
-				setDomainSpecialization((Constraint)newValue);
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER:
-				setDomainInitializer((ElementInitializer)newValue);
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
-				getLabelMappings().clear();
-				getLabelMappings().addAll((Collection<? extends LabelMapping>)newValue);
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__RELATED_DIAGRAMS:
-				getRelatedDiagrams().clear();
-				getRelatedDiagrams().addAll((Collection<? extends CanvasMapping>)newValue);
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
-				getVisualEffects().clear();
-				getVisualEffects().addAll((Collection<? extends VisualEffectMapping>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_META_ELEMENT:
-				setDomainMetaElement((EClass)null);
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION:
-				setDomainSpecialization((Constraint)null);
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER:
-				setDomainInitializer((ElementInitializer)null);
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
-				getLabelMappings().clear();
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__RELATED_DIAGRAMS:
-				getRelatedDiagrams().clear();
-				return;
-			case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
-				getVisualEffects().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_META_ELEMENT:
-				return domainMetaElement != null;
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_SPECIALIZATION:
-				return domainSpecialization != null;
-			case GMFMapPackage.MAPPING_ENTRY__DOMAIN_INITIALIZER:
-				return domainInitializer != null;
-			case GMFMapPackage.MAPPING_ENTRY__LABEL_MAPPINGS:
-				return labelMappings != null && !labelMappings.isEmpty();
-			case GMFMapPackage.MAPPING_ENTRY__RELATED_DIAGRAMS:
-				return relatedDiagrams != null && !relatedDiagrams.isEmpty();
-			case GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS:
-				return visualEffects != null && !visualEffects.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MappingEntryImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MappingImpl.java
deleted file mode 100644
index 0e677eb3398..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MappingImpl.java
+++ /dev/null
@@ -1,442 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-import org.eclipse.papyrus.gmf.tooldef.StyleSelector;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingImpl#getNodes <em>Nodes</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingImpl#getLinks <em>Links</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingImpl#getDiagram <em>Diagram</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingImpl#getAppearanceStyles <em>Appearance Styles</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingImpl#getAudits <em>Audits</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MappingImpl#getMetrics <em>Metrics</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MappingImpl extends EObjectImpl implements Mapping {
-	/**
-	 * The cached value of the '{@link #getNodes() <em>Nodes</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNodes()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<TopNodeReference> nodes;
-
-	/**
-	 * The cached value of the '{@link #getLinks() <em>Links</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLinks()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<LinkMapping> links;
-
-	/**
-	 * The cached value of the '{@link #getDiagram() <em>Diagram</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagram()
-	 * @generated
-	 * @ordered
-	 */
-	protected CanvasMapping diagram;
-
-	/**
-	 * The cached value of the '{@link #getAppearanceStyles() <em>Appearance Styles</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAppearanceStyles()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<StyleSelector> appearanceStyles;
-
-	/**
-	 * The cached value of the '{@link #getAudits() <em>Audits</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAudits()
-	 * @generated
-	 * @ordered
-	 */
-	protected AuditContainer audits;
-
-	/**
-	 * The cached value of the '{@link #getMetrics() <em>Metrics</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMetrics()
-	 * @generated
-	 * @ordered
-	 */
-	protected MetricContainer metrics;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<TopNodeReference> getNodes() {
-		if (nodes == null) {
-			nodes = new EObjectContainmentEList<TopNodeReference>(TopNodeReference.class, this, GMFMapPackage.MAPPING__NODES);
-		}
-		return nodes;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<LinkMapping> getLinks() {
-		if (links == null) {
-			links = new EObjectContainmentEList<LinkMapping>(LinkMapping.class, this, GMFMapPackage.MAPPING__LINKS);
-		}
-		return links;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CanvasMapping getDiagram() {
-		return diagram;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetDiagram(CanvasMapping newDiagram, NotificationChain msgs) {
-		CanvasMapping oldDiagram = diagram;
-		diagram = newDiagram;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING__DIAGRAM, oldDiagram, newDiagram);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiagram(CanvasMapping newDiagram) {
-		if (newDiagram != diagram) {
-			NotificationChain msgs = null;
-			if (diagram != null)
-				msgs = ((InternalEObject)diagram).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING__DIAGRAM, null, msgs);
-			if (newDiagram != null)
-				msgs = ((InternalEObject)newDiagram).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING__DIAGRAM, null, msgs);
-			msgs = basicSetDiagram(newDiagram, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING__DIAGRAM, newDiagram, newDiagram));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<StyleSelector> getAppearanceStyles() {
-		if (appearanceStyles == null) {
-			appearanceStyles = new EObjectContainmentEList<StyleSelector>(StyleSelector.class, this, GMFMapPackage.MAPPING__APPEARANCE_STYLES);
-		}
-		return appearanceStyles;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AuditContainer getAudits() {
-		return audits;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetAudits(AuditContainer newAudits, NotificationChain msgs) {
-		AuditContainer oldAudits = audits;
-		audits = newAudits;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING__AUDITS, oldAudits, newAudits);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAudits(AuditContainer newAudits) {
-		if (newAudits != audits) {
-			NotificationChain msgs = null;
-			if (audits != null)
-				msgs = ((InternalEObject)audits).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING__AUDITS, null, msgs);
-			if (newAudits != null)
-				msgs = ((InternalEObject)newAudits).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING__AUDITS, null, msgs);
-			msgs = basicSetAudits(newAudits, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING__AUDITS, newAudits, newAudits));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MetricContainer getMetrics() {
-		return metrics;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetMetrics(MetricContainer newMetrics, NotificationChain msgs) {
-		MetricContainer oldMetrics = metrics;
-		metrics = newMetrics;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING__METRICS, oldMetrics, newMetrics);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setMetrics(MetricContainer newMetrics) {
-		if (newMetrics != metrics) {
-			NotificationChain msgs = null;
-			if (metrics != null)
-				msgs = ((InternalEObject)metrics).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING__METRICS, null, msgs);
-			if (newMetrics != null)
-				msgs = ((InternalEObject)newMetrics).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.MAPPING__METRICS, null, msgs);
-			msgs = basicSetMetrics(newMetrics, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.MAPPING__METRICS, newMetrics, newMetrics));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING__NODES:
-				return ((InternalEList<?>)getNodes()).basicRemove(otherEnd, msgs);
-			case GMFMapPackage.MAPPING__LINKS:
-				return ((InternalEList<?>)getLinks()).basicRemove(otherEnd, msgs);
-			case GMFMapPackage.MAPPING__DIAGRAM:
-				return basicSetDiagram(null, msgs);
-			case GMFMapPackage.MAPPING__APPEARANCE_STYLES:
-				return ((InternalEList<?>)getAppearanceStyles()).basicRemove(otherEnd, msgs);
-			case GMFMapPackage.MAPPING__AUDITS:
-				return basicSetAudits(null, msgs);
-			case GMFMapPackage.MAPPING__METRICS:
-				return basicSetMetrics(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING__NODES:
-				return getNodes();
-			case GMFMapPackage.MAPPING__LINKS:
-				return getLinks();
-			case GMFMapPackage.MAPPING__DIAGRAM:
-				return getDiagram();
-			case GMFMapPackage.MAPPING__APPEARANCE_STYLES:
-				return getAppearanceStyles();
-			case GMFMapPackage.MAPPING__AUDITS:
-				return getAudits();
-			case GMFMapPackage.MAPPING__METRICS:
-				return getMetrics();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING__NODES:
-				getNodes().clear();
-				getNodes().addAll((Collection<? extends TopNodeReference>)newValue);
-				return;
-			case GMFMapPackage.MAPPING__LINKS:
-				getLinks().clear();
-				getLinks().addAll((Collection<? extends LinkMapping>)newValue);
-				return;
-			case GMFMapPackage.MAPPING__DIAGRAM:
-				setDiagram((CanvasMapping)newValue);
-				return;
-			case GMFMapPackage.MAPPING__APPEARANCE_STYLES:
-				getAppearanceStyles().clear();
-				getAppearanceStyles().addAll((Collection<? extends StyleSelector>)newValue);
-				return;
-			case GMFMapPackage.MAPPING__AUDITS:
-				setAudits((AuditContainer)newValue);
-				return;
-			case GMFMapPackage.MAPPING__METRICS:
-				setMetrics((MetricContainer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING__NODES:
-				getNodes().clear();
-				return;
-			case GMFMapPackage.MAPPING__LINKS:
-				getLinks().clear();
-				return;
-			case GMFMapPackage.MAPPING__DIAGRAM:
-				setDiagram((CanvasMapping)null);
-				return;
-			case GMFMapPackage.MAPPING__APPEARANCE_STYLES:
-				getAppearanceStyles().clear();
-				return;
-			case GMFMapPackage.MAPPING__AUDITS:
-				setAudits((AuditContainer)null);
-				return;
-			case GMFMapPackage.MAPPING__METRICS:
-				setMetrics((MetricContainer)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.MAPPING__NODES:
-				return nodes != null && !nodes.isEmpty();
-			case GMFMapPackage.MAPPING__LINKS:
-				return links != null && !links.isEmpty();
-			case GMFMapPackage.MAPPING__DIAGRAM:
-				return diagram != null;
-			case GMFMapPackage.MAPPING__APPEARANCE_STYLES:
-				return appearanceStyles != null && !appearanceStyles.isEmpty();
-			case GMFMapPackage.MAPPING__AUDITS:
-				return audits != null;
-			case GMFMapPackage.MAPPING__METRICS:
-				return metrics != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MetricContainerImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MetricContainerImpl.java
deleted file mode 100644
index 853f7a9483c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MetricContainerImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Metric Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricContainerImpl#getMetrics <em>Metrics</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MetricContainerImpl extends EObjectImpl implements MetricContainer {
-	/**
-	 * The cached value of the '{@link #getMetrics() <em>Metrics</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getMetrics()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MetricRule> metrics;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MetricContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getMetricContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<MetricRule> getMetrics() {
-		if (metrics == null) {
-			metrics = new EObjectContainmentWithInverseEList<MetricRule>(MetricRule.class, this, GMFMapPackage.METRIC_CONTAINER__METRICS, GMFMapPackage.METRIC_RULE__CONTAINER);
-		}
-		return metrics;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_CONTAINER__METRICS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getMetrics()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_CONTAINER__METRICS:
-				return ((InternalEList<?>)getMetrics()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_CONTAINER__METRICS:
-				return getMetrics();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_CONTAINER__METRICS:
-				getMetrics().clear();
-				getMetrics().addAll((Collection<? extends MetricRule>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_CONTAINER__METRICS:
-				getMetrics().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_CONTAINER__METRICS:
-				return metrics != null && !metrics.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MetricContainerImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MetricRuleImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MetricRuleImpl.java
deleted file mode 100644
index 37294daee56..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/MetricRuleImpl.java
+++ /dev/null
@@ -1,628 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.Measurable;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Metric Rule</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl#getDescription <em>Description</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl#getKey <em>Key</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl#getRule <em>Rule</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl#getLowLimit <em>Low Limit</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl#getHighLimit <em>High Limit</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.MetricRuleImpl#getContainer <em>Container</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MetricRuleImpl extends EObjectImpl implements MetricRule {
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String KEY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getKey() <em>Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String key = KEY_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getRule() <em>Rule</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRule()
-	 * @generated
-	 * @ordered
-	 */
-	protected ValueExpression rule;
-
-	/**
-	 * The cached value of the '{@link #getTarget() <em>Target</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTarget()
-	 * @generated
-	 * @ordered
-	 */
-	protected Measurable target;
-
-	/**
-	 * The default value of the '{@link #getLowLimit() <em>Low Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLowLimit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double LOW_LIMIT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getLowLimit() <em>Low Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLowLimit()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double lowLimit = LOW_LIMIT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHighLimit() <em>High Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHighLimit()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Double HIGH_LIMIT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHighLimit() <em>High Limit</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHighLimit()
-	 * @generated
-	 * @ordered
-	 */
-	protected Double highLimit = HIGH_LIMIT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MetricRuleImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getMetricRule();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getKey() {
-		return key;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKey(String newKey) {
-		String oldKey = key;
-		key = newKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__KEY, oldKey, key));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueExpression getRule() {
-		return rule;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetRule(ValueExpression newRule, NotificationChain msgs) {
-		ValueExpression oldRule = rule;
-		rule = newRule;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__RULE, oldRule, newRule);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRule(ValueExpression newRule) {
-		if (newRule != rule) {
-			NotificationChain msgs = null;
-			if (rule != null)
-				msgs = ((InternalEObject)rule).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.METRIC_RULE__RULE, null, msgs);
-			if (newRule != null)
-				msgs = ((InternalEObject)newRule).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.METRIC_RULE__RULE, null, msgs);
-			msgs = basicSetRule(newRule, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__RULE, newRule, newRule));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Measurable getTarget() {
-		return target;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetTarget(Measurable newTarget, NotificationChain msgs) {
-		Measurable oldTarget = target;
-		target = newTarget;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__TARGET, oldTarget, newTarget);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTarget(Measurable newTarget) {
-		if (newTarget != target) {
-			NotificationChain msgs = null;
-			if (target != null)
-				msgs = ((InternalEObject)target).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.METRIC_RULE__TARGET, null, msgs);
-			if (newTarget != null)
-				msgs = ((InternalEObject)newTarget).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.METRIC_RULE__TARGET, null, msgs);
-			msgs = basicSetTarget(newTarget, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__TARGET, newTarget, newTarget));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getLowLimit() {
-		return lowLimit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLowLimit(Double newLowLimit) {
-		Double oldLowLimit = lowLimit;
-		lowLimit = newLowLimit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__LOW_LIMIT, oldLowLimit, lowLimit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Double getHighLimit() {
-		return highLimit;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHighLimit(Double newHighLimit) {
-		Double oldHighLimit = highLimit;
-		highLimit = newHighLimit;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__HIGH_LIMIT, oldHighLimit, highLimit));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MetricContainer getContainer() {
-		if (eContainerFeatureID() != GMFMapPackage.METRIC_RULE__CONTAINER) return null;
-		return (MetricContainer)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetContainer(MetricContainer newContainer, NotificationChain msgs) {
-		msgs = eBasicSetContainer((InternalEObject)newContainer, GMFMapPackage.METRIC_RULE__CONTAINER, msgs);
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainer(MetricContainer newContainer) {
-		if (newContainer != eInternalContainer() || (eContainerFeatureID() != GMFMapPackage.METRIC_RULE__CONTAINER && newContainer != null)) {
-			if (EcoreUtil.isAncestor(this, newContainer))
-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
-			NotificationChain msgs = null;
-			if (eInternalContainer() != null)
-				msgs = eBasicRemoveFromContainer(msgs);
-			if (newContainer != null)
-				msgs = ((InternalEObject)newContainer).eInverseAdd(this, GMFMapPackage.METRIC_CONTAINER__METRICS, MetricContainer.class, msgs);
-			msgs = basicSetContainer(newContainer, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.METRIC_RULE__CONTAINER, newContainer, newContainer));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_RULE__CONTAINER:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return basicSetContainer((MetricContainer)otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_RULE__RULE:
-				return basicSetRule(null, msgs);
-			case GMFMapPackage.METRIC_RULE__TARGET:
-				return basicSetTarget(null, msgs);
-			case GMFMapPackage.METRIC_RULE__CONTAINER:
-				return basicSetContainer(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.METRIC_RULE__CONTAINER:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.METRIC_CONTAINER__METRICS, MetricContainer.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_RULE__NAME:
-				return getName();
-			case GMFMapPackage.METRIC_RULE__DESCRIPTION:
-				return getDescription();
-			case GMFMapPackage.METRIC_RULE__KEY:
-				return getKey();
-			case GMFMapPackage.METRIC_RULE__RULE:
-				return getRule();
-			case GMFMapPackage.METRIC_RULE__TARGET:
-				return getTarget();
-			case GMFMapPackage.METRIC_RULE__LOW_LIMIT:
-				return getLowLimit();
-			case GMFMapPackage.METRIC_RULE__HIGH_LIMIT:
-				return getHighLimit();
-			case GMFMapPackage.METRIC_RULE__CONTAINER:
-				return getContainer();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_RULE__NAME:
-				setName((String)newValue);
-				return;
-			case GMFMapPackage.METRIC_RULE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-			case GMFMapPackage.METRIC_RULE__KEY:
-				setKey((String)newValue);
-				return;
-			case GMFMapPackage.METRIC_RULE__RULE:
-				setRule((ValueExpression)newValue);
-				return;
-			case GMFMapPackage.METRIC_RULE__TARGET:
-				setTarget((Measurable)newValue);
-				return;
-			case GMFMapPackage.METRIC_RULE__LOW_LIMIT:
-				setLowLimit((Double)newValue);
-				return;
-			case GMFMapPackage.METRIC_RULE__HIGH_LIMIT:
-				setHighLimit((Double)newValue);
-				return;
-			case GMFMapPackage.METRIC_RULE__CONTAINER:
-				setContainer((MetricContainer)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_RULE__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case GMFMapPackage.METRIC_RULE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-			case GMFMapPackage.METRIC_RULE__KEY:
-				setKey(KEY_EDEFAULT);
-				return;
-			case GMFMapPackage.METRIC_RULE__RULE:
-				setRule((ValueExpression)null);
-				return;
-			case GMFMapPackage.METRIC_RULE__TARGET:
-				setTarget((Measurable)null);
-				return;
-			case GMFMapPackage.METRIC_RULE__LOW_LIMIT:
-				setLowLimit(LOW_LIMIT_EDEFAULT);
-				return;
-			case GMFMapPackage.METRIC_RULE__HIGH_LIMIT:
-				setHighLimit(HIGH_LIMIT_EDEFAULT);
-				return;
-			case GMFMapPackage.METRIC_RULE__CONTAINER:
-				setContainer((MetricContainer)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.METRIC_RULE__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case GMFMapPackage.METRIC_RULE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-			case GMFMapPackage.METRIC_RULE__KEY:
-				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
-			case GMFMapPackage.METRIC_RULE__RULE:
-				return rule != null;
-			case GMFMapPackage.METRIC_RULE__TARGET:
-				return target != null;
-			case GMFMapPackage.METRIC_RULE__LOW_LIMIT:
-				return LOW_LIMIT_EDEFAULT == null ? lowLimit != null : !LOW_LIMIT_EDEFAULT.equals(lowLimit);
-			case GMFMapPackage.METRIC_RULE__HIGH_LIMIT:
-				return HIGH_LIMIT_EDEFAULT == null ? highLimit != null : !HIGH_LIMIT_EDEFAULT.equals(highLimit);
-			case GMFMapPackage.METRIC_RULE__CONTAINER:
-				return getContainer() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(", description: ");
-		result.append(description);
-		result.append(", key: ");
-		result.append(key);
-		result.append(", lowLimit: ");
-		result.append(lowLimit);
-		result.append(", highLimit: ");
-		result.append(highLimit);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MetricRuleImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NodeMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NodeMappingImpl.java
deleted file mode 100644
index b861d4158fc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NodeMappingImpl.java
+++ /dev/null
@@ -1,532 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.gmfgraph.Node;
-import org.eclipse.papyrus.gmf.mappings.AppearanceSteward;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MenuOwner;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.ToolOwner;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.ContextMenu;
-import org.eclipse.papyrus.gmf.tooldef.StyleSelector;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Node Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeMappingImpl#getContextMenu <em>Context Menu</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeMappingImpl#getTool <em>Tool</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeMappingImpl#getAppearanceStyle <em>Appearance Style</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeMappingImpl#getDiagramNode <em>Diagram Node</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeMappingImpl#getChildren <em>Children</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeMappingImpl#getCompartments <em>Compartments</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NodeMappingImpl extends MappingEntryImpl implements NodeMapping {
-	/**
-	 * The cached value of the '{@link #getContextMenu() <em>Context Menu</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContextMenu()
-	 * @generated
-	 * @ordered
-	 */
-	protected ContextMenu contextMenu;
-
-	/**
-	 * The cached value of the '{@link #getTool() <em>Tool</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTool()
-	 * @generated
-	 * @ordered
-	 */
-	protected AbstractTool tool;
-
-	/**
-	 * The cached value of the '{@link #getAppearanceStyle() <em>Appearance Style</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAppearanceStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected StyleSelector appearanceStyle;
-
-	/**
-	 * The cached value of the '{@link #getDiagramNode() <em>Diagram Node</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagramNode()
-	 * @generated
-	 * @ordered
-	 */
-	protected Node diagramNode;
-
-	/**
-	 * The cached value of the '{@link #getChildren() <em>Children</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildren()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ChildReference> children;
-
-	/**
-	 * The cached value of the '{@link #getCompartments() <em>Compartments</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getCompartments()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<CompartmentMapping> compartments;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NodeMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getNodeMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextMenu getContextMenu() {
-		if (contextMenu != null && contextMenu.eIsProxy()) {
-			InternalEObject oldContextMenu = (InternalEObject)contextMenu;
-			contextMenu = (ContextMenu)eResolveProxy(oldContextMenu);
-			if (contextMenu != oldContextMenu) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.NODE_MAPPING__CONTEXT_MENU, oldContextMenu, contextMenu));
-			}
-		}
-		return contextMenu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextMenu basicGetContextMenu() {
-		return contextMenu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContextMenu(ContextMenu newContextMenu) {
-		ContextMenu oldContextMenu = contextMenu;
-		contextMenu = newContextMenu;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.NODE_MAPPING__CONTEXT_MENU, oldContextMenu, contextMenu));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTool getTool() {
-		if (tool != null && tool.eIsProxy()) {
-			InternalEObject oldTool = (InternalEObject)tool;
-			tool = (AbstractTool)eResolveProxy(oldTool);
-			if (tool != oldTool) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.NODE_MAPPING__TOOL, oldTool, tool));
-			}
-		}
-		return tool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTool basicGetTool() {
-		return tool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTool(AbstractTool newTool) {
-		AbstractTool oldTool = tool;
-		tool = newTool;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.NODE_MAPPING__TOOL, oldTool, tool));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StyleSelector getAppearanceStyle() {
-		if (appearanceStyle != null && appearanceStyle.eIsProxy()) {
-			InternalEObject oldAppearanceStyle = (InternalEObject)appearanceStyle;
-			appearanceStyle = (StyleSelector)eResolveProxy(oldAppearanceStyle);
-			if (appearanceStyle != oldAppearanceStyle) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.NODE_MAPPING__APPEARANCE_STYLE, oldAppearanceStyle, appearanceStyle));
-			}
-		}
-		return appearanceStyle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StyleSelector basicGetAppearanceStyle() {
-		return appearanceStyle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAppearanceStyle(StyleSelector newAppearanceStyle) {
-		StyleSelector oldAppearanceStyle = appearanceStyle;
-		appearanceStyle = newAppearanceStyle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.NODE_MAPPING__APPEARANCE_STYLE, oldAppearanceStyle, appearanceStyle));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Node getDiagramNode() {
-		if (diagramNode != null && diagramNode.eIsProxy()) {
-			InternalEObject oldDiagramNode = (InternalEObject)diagramNode;
-			diagramNode = (Node)eResolveProxy(oldDiagramNode);
-			if (diagramNode != oldDiagramNode) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.NODE_MAPPING__DIAGRAM_NODE, oldDiagramNode, diagramNode));
-			}
-		}
-		return diagramNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Node basicGetDiagramNode() {
-		return diagramNode;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiagramNode(Node newDiagramNode) {
-		Node oldDiagramNode = diagramNode;
-		diagramNode = newDiagramNode;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.NODE_MAPPING__DIAGRAM_NODE, oldDiagramNode, diagramNode));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ChildReference> getChildren() {
-		if (children == null) {
-			children = new EObjectContainmentWithInverseEList<ChildReference>(ChildReference.class, this, GMFMapPackage.NODE_MAPPING__CHILDREN, GMFMapPackage.CHILD_REFERENCE__PARENT_NODE);
-		}
-		return children;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<CompartmentMapping> getCompartments() {
-		if (compartments == null) {
-			compartments = new EObjectContainmentWithInverseEList<CompartmentMapping>(CompartmentMapping.class, this, GMFMapPackage.NODE_MAPPING__COMPARTMENTS, GMFMapPackage.COMPARTMENT_MAPPING__PARENT_NODE);
-		}
-		return compartments;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_MAPPING__CHILDREN:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getChildren()).basicAdd(otherEnd, msgs);
-			case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getCompartments()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_MAPPING__CHILDREN:
-				return ((InternalEList<?>)getChildren()).basicRemove(otherEnd, msgs);
-			case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
-				return ((InternalEList<?>)getCompartments()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_MAPPING__CONTEXT_MENU:
-				if (resolve) return getContextMenu();
-				return basicGetContextMenu();
-			case GMFMapPackage.NODE_MAPPING__TOOL:
-				if (resolve) return getTool();
-				return basicGetTool();
-			case GMFMapPackage.NODE_MAPPING__APPEARANCE_STYLE:
-				if (resolve) return getAppearanceStyle();
-				return basicGetAppearanceStyle();
-			case GMFMapPackage.NODE_MAPPING__DIAGRAM_NODE:
-				if (resolve) return getDiagramNode();
-				return basicGetDiagramNode();
-			case GMFMapPackage.NODE_MAPPING__CHILDREN:
-				return getChildren();
-			case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
-				return getCompartments();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_MAPPING__CONTEXT_MENU:
-				setContextMenu((ContextMenu)newValue);
-				return;
-			case GMFMapPackage.NODE_MAPPING__TOOL:
-				setTool((AbstractTool)newValue);
-				return;
-			case GMFMapPackage.NODE_MAPPING__APPEARANCE_STYLE:
-				setAppearanceStyle((StyleSelector)newValue);
-				return;
-			case GMFMapPackage.NODE_MAPPING__DIAGRAM_NODE:
-				setDiagramNode((Node)newValue);
-				return;
-			case GMFMapPackage.NODE_MAPPING__CHILDREN:
-				getChildren().clear();
-				getChildren().addAll((Collection<? extends ChildReference>)newValue);
-				return;
-			case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
-				getCompartments().clear();
-				getCompartments().addAll((Collection<? extends CompartmentMapping>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_MAPPING__CONTEXT_MENU:
-				setContextMenu((ContextMenu)null);
-				return;
-			case GMFMapPackage.NODE_MAPPING__TOOL:
-				setTool((AbstractTool)null);
-				return;
-			case GMFMapPackage.NODE_MAPPING__APPEARANCE_STYLE:
-				setAppearanceStyle((StyleSelector)null);
-				return;
-			case GMFMapPackage.NODE_MAPPING__DIAGRAM_NODE:
-				setDiagramNode((Node)null);
-				return;
-			case GMFMapPackage.NODE_MAPPING__CHILDREN:
-				getChildren().clear();
-				return;
-			case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
-				getCompartments().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_MAPPING__CONTEXT_MENU:
-				return contextMenu != null;
-			case GMFMapPackage.NODE_MAPPING__TOOL:
-				return tool != null;
-			case GMFMapPackage.NODE_MAPPING__APPEARANCE_STYLE:
-				return appearanceStyle != null;
-			case GMFMapPackage.NODE_MAPPING__DIAGRAM_NODE:
-				return diagramNode != null;
-			case GMFMapPackage.NODE_MAPPING__CHILDREN:
-				return children != null && !children.isEmpty();
-			case GMFMapPackage.NODE_MAPPING__COMPARTMENTS:
-				return compartments != null && !compartments.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == MenuOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFMapPackage.NODE_MAPPING__CONTEXT_MENU: return GMFMapPackage.MENU_OWNER__CONTEXT_MENU;
-				default: return -1;
-			}
-		}
-		if (baseClass == ToolOwner.class) {
-			switch (derivedFeatureID) {
-				case GMFMapPackage.NODE_MAPPING__TOOL: return GMFMapPackage.TOOL_OWNER__TOOL;
-				default: return -1;
-			}
-		}
-		if (baseClass == AppearanceSteward.class) {
-			switch (derivedFeatureID) {
-				case GMFMapPackage.NODE_MAPPING__APPEARANCE_STYLE: return GMFMapPackage.APPEARANCE_STEWARD__APPEARANCE_STYLE;
-				default: return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == MenuOwner.class) {
-			switch (baseFeatureID) {
-				case GMFMapPackage.MENU_OWNER__CONTEXT_MENU: return GMFMapPackage.NODE_MAPPING__CONTEXT_MENU;
-				default: return -1;
-			}
-		}
-		if (baseClass == ToolOwner.class) {
-			switch (baseFeatureID) {
-				case GMFMapPackage.TOOL_OWNER__TOOL: return GMFMapPackage.NODE_MAPPING__TOOL;
-				default: return -1;
-			}
-		}
-		if (baseClass == AppearanceSteward.class) {
-			switch (baseFeatureID) {
-				case GMFMapPackage.APPEARANCE_STEWARD__APPEARANCE_STYLE: return GMFMapPackage.NODE_MAPPING__APPEARANCE_STYLE;
-				default: return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * @return getDomainMetaElement()
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public EClass getDomainContext() {
-		return getDomainMetaElement();
-	}
-} //NodeMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NodeReferenceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NodeReferenceImpl.java
deleted file mode 100644
index 588c89763bf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NodeReferenceImpl.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Node Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeReferenceImpl#getContainmentFeature <em>Containment Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeReferenceImpl#getChildrenFeature <em>Children Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NodeReferenceImpl#getChild <em>Child</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class NodeReferenceImpl extends EObjectImpl implements NodeReference {
-	/**
-	 * The cached value of the '{@link #getContainmentFeature() <em>Containment Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContainmentFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EReference containmentFeature;
-
-	/**
-	 * The cached value of the '{@link #getChildrenFeature() <em>Children Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getChildrenFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EReference childrenFeature;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NodeReferenceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getNodeReference();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContainmentFeature() {
-		if (containmentFeature != null && containmentFeature.eIsProxy()) {
-			InternalEObject oldContainmentFeature = (InternalEObject)containmentFeature;
-			containmentFeature = (EReference)eResolveProxy(oldContainmentFeature);
-			if (containmentFeature != oldContainmentFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.NODE_REFERENCE__CONTAINMENT_FEATURE, oldContainmentFeature, containmentFeature));
-			}
-		}
-		return containmentFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference basicGetContainmentFeature() {
-		return containmentFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContainmentFeature(EReference newContainmentFeature) {
-		EReference oldContainmentFeature = containmentFeature;
-		containmentFeature = newContainmentFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.NODE_REFERENCE__CONTAINMENT_FEATURE, oldContainmentFeature, containmentFeature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getChildrenFeature() {
-		if (childrenFeature != null && childrenFeature.eIsProxy()) {
-			InternalEObject oldChildrenFeature = (InternalEObject)childrenFeature;
-			childrenFeature = (EReference)eResolveProxy(oldChildrenFeature);
-			if (childrenFeature != oldChildrenFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.NODE_REFERENCE__CHILDREN_FEATURE, oldChildrenFeature, childrenFeature));
-			}
-		}
-		return childrenFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference basicGetChildrenFeature() {
-		return childrenFeature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setChildrenFeature(EReference newChildrenFeature) {
-		EReference oldChildrenFeature = childrenFeature;
-		childrenFeature = newChildrenFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.NODE_REFERENCE__CHILDREN_FEATURE, oldChildrenFeature, childrenFeature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public abstract NodeMapping getChild();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public abstract boolean isSetChild();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_REFERENCE__CONTAINMENT_FEATURE:
-				if (resolve) return getContainmentFeature();
-				return basicGetContainmentFeature();
-			case GMFMapPackage.NODE_REFERENCE__CHILDREN_FEATURE:
-				if (resolve) return getChildrenFeature();
-				return basicGetChildrenFeature();
-			case GMFMapPackage.NODE_REFERENCE__CHILD:
-				return getChild();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_REFERENCE__CONTAINMENT_FEATURE:
-				setContainmentFeature((EReference)newValue);
-				return;
-			case GMFMapPackage.NODE_REFERENCE__CHILDREN_FEATURE:
-				setChildrenFeature((EReference)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_REFERENCE__CONTAINMENT_FEATURE:
-				setContainmentFeature((EReference)null);
-				return;
-			case GMFMapPackage.NODE_REFERENCE__CHILDREN_FEATURE:
-				setChildrenFeature((EReference)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.NODE_REFERENCE__CONTAINMENT_FEATURE:
-				return containmentFeature != null;
-			case GMFMapPackage.NODE_REFERENCE__CHILDREN_FEATURE:
-				return childrenFeature != null;
-			case GMFMapPackage.NODE_REFERENCE__CHILD:
-				return isSetChild();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //NodeReferenceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NotationElementTargetImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NotationElementTargetImpl.java
deleted file mode 100644
index 2a2f6fa3e69..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/NotationElementTargetImpl.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NotationElementTarget;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Notation Element Target</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.NotationElementTargetImpl#getElement <em>Element</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NotationElementTargetImpl extends EObjectImpl implements NotationElementTarget {
-	/**
-	 * The cached value of the '{@link #getElement() <em>Element</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getElement()
-	 * @generated
-	 * @ordered
-	 */
-	protected EClass element;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NotationElementTargetImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getNotationElementTarget();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getElement() {
-		if (element != null && element.eIsProxy()) {
-			InternalEObject oldElement = (InternalEObject)element;
-			element = (EClass)eResolveProxy(oldElement);
-			if (element != oldElement) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.NOTATION_ELEMENT_TARGET__ELEMENT, oldElement, element));
-			}
-		}
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass basicGetElement() {
-		return element;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setElement(EClass newElement) {
-		EClass oldElement = element;
-		element = newElement;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.NOTATION_ELEMENT_TARGET__ELEMENT, oldElement, element));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.NOTATION_ELEMENT_TARGET__ELEMENT:
-				if (resolve) return getElement();
-				return basicGetElement();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.NOTATION_ELEMENT_TARGET__ELEMENT:
-				setElement((EClass)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.NOTATION_ELEMENT_TARGET__ELEMENT:
-				setElement((EClass)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.NOTATION_ELEMENT_TARGET__ELEMENT:
-				return element != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //NotationElementTargetImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/OclChoiceLabelMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/OclChoiceLabelMappingImpl.java
deleted file mode 100644
index 11d4c894d02..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/OclChoiceLabelMappingImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Ocl Choice Label Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.OclChoiceLabelMappingImpl#getFeature <em>Feature</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.OclChoiceLabelMappingImpl#getItemsExpression <em>Items Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.OclChoiceLabelMappingImpl#getShowExpression <em>Show Expression</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OclChoiceLabelMappingImpl extends LabelMappingImpl implements OclChoiceLabelMapping {
-	/**
-	 * The cached value of the '{@link #getFeature() <em>Feature</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getFeature()
-	 * @generated
-	 * @ordered
-	 */
-	protected EStructuralFeature feature;
-
-	/**
-	 * The cached value of the '{@link #getItemsExpression() <em>Items Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getItemsExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected ValueExpression itemsExpression;
-
-	/**
-	 * The cached value of the '{@link #getShowExpression() <em>Show Expression</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getShowExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected ValueExpression showExpression;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected OclChoiceLabelMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getOclChoiceLabelMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature getFeature() {
-		if (feature != null && feature.eIsProxy()) {
-			InternalEObject oldFeature = (InternalEObject)feature;
-			feature = (EStructuralFeature)eResolveProxy(oldFeature);
-			if (feature != oldFeature) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__FEATURE, oldFeature, feature));
-			}
-		}
-		return feature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EStructuralFeature basicGetFeature() {
-		return feature;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setFeature(EStructuralFeature newFeature) {
-		EStructuralFeature oldFeature = feature;
-		feature = newFeature;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__FEATURE, oldFeature, feature));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueExpression getItemsExpression() {
-		return itemsExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetItemsExpression(ValueExpression newItemsExpression, NotificationChain msgs) {
-		ValueExpression oldItemsExpression = itemsExpression;
-		itemsExpression = newItemsExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION, oldItemsExpression, newItemsExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setItemsExpression(ValueExpression newItemsExpression) {
-		if (newItemsExpression != itemsExpression) {
-			NotificationChain msgs = null;
-			if (itemsExpression != null)
-				msgs = ((InternalEObject)itemsExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION, null, msgs);
-			if (newItemsExpression != null)
-				msgs = ((InternalEObject)newItemsExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION, null, msgs);
-			msgs = basicSetItemsExpression(newItemsExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION, newItemsExpression, newItemsExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ValueExpression getShowExpression() {
-		return showExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetShowExpression(ValueExpression newShowExpression, NotificationChain msgs) {
-		ValueExpression oldShowExpression = showExpression;
-		showExpression = newShowExpression;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION, oldShowExpression, newShowExpression);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setShowExpression(ValueExpression newShowExpression) {
-		if (newShowExpression != showExpression) {
-			NotificationChain msgs = null;
-			if (showExpression != null)
-				msgs = ((InternalEObject)showExpression).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION, null, msgs);
-			if (newShowExpression != null)
-				msgs = ((InternalEObject)newShowExpression).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION, null, msgs);
-			msgs = basicSetShowExpression(newShowExpression, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION, newShowExpression, newShowExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION:
-				return basicSetItemsExpression(null, msgs);
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION:
-				return basicSetShowExpression(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__FEATURE:
-				if (resolve) return getFeature();
-				return basicGetFeature();
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION:
-				return getItemsExpression();
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION:
-				return getShowExpression();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__FEATURE:
-				setFeature((EStructuralFeature)newValue);
-				return;
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION:
-				setItemsExpression((ValueExpression)newValue);
-				return;
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION:
-				setShowExpression((ValueExpression)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__FEATURE:
-				setFeature((EStructuralFeature)null);
-				return;
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION:
-				setItemsExpression((ValueExpression)null);
-				return;
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION:
-				setShowExpression((ValueExpression)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__FEATURE:
-				return feature != null;
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__ITEMS_EXPRESSION:
-				return itemsExpression != null;
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING__SHOW_EXPRESSION:
-				return showExpression != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //OclChoiceLabelMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ReferenceNewElementSpecImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ReferenceNewElementSpecImpl.java
deleted file mode 100644
index 035c79a7b38..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ReferenceNewElementSpecImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ReferenceNewElementSpecImpl.java,v 1.5 2008/04/17 11:58:49 atikhomirov Exp $
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Reference New Element Spec</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ReferenceNewElementSpecImpl#getNewElementInitializers <em>New Element Initializers</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ReferenceNewElementSpecImpl extends FeatureInitializerImpl implements ReferenceNewElementSpec {
-	/**
-	 * The cached value of the '{@link #getNewElementInitializers() <em>New Element Initializers</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNewElementInitializers()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<FeatureSeqInitializer> newElementInitializers;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ReferenceNewElementSpecImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getReferenceNewElementSpec();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<FeatureSeqInitializer> getNewElementInitializers() {
-		if (newElementInitializers == null) {
-			newElementInitializers = new EObjectContainmentWithInverseEList<FeatureSeqInitializer>(FeatureSeqInitializer.class, this, GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS, GMFMapPackage.FEATURE_SEQ_INITIALIZER__CREATING_INITIALIZER);
-		}
-		return newElementInitializers;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS:
-				return ((InternalEList<InternalEObject>)(InternalEList<?>)getNewElementInitializers()).basicAdd(otherEnd, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS:
-				return ((InternalEList<?>)getNewElementInitializers()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS:
-				return getNewElementInitializers();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-		@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS:
-				getNewElementInitializers().clear();
-				getNewElementInitializers().addAll((Collection<? extends FeatureSeqInitializer>)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS:
-				getNewElementInitializers().clear();
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC__NEW_ELEMENT_INITIALIZERS:
-				return newElementInitializers != null && !newElementInitializers.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ReferenceNewElementSpecImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/TopNodeReferenceImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/TopNodeReferenceImpl.java
deleted file mode 100644
index 13a81c45d00..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/TopNodeReferenceImpl.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Top Node Reference</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.TopNodeReferenceImpl#getOwnedChild <em>Owned Child</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TopNodeReferenceImpl extends NodeReferenceImpl implements TopNodeReference {
-	/**
-	 * The cached value of the '{@link #getOwnedChild() <em>Owned Child</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOwnedChild()
-	 * @generated
-	 * @ordered
-	 */
-	protected NodeMapping ownedChild;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TopNodeReferenceImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getTopNodeReference();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NodeMapping getOwnedChild() {
-		return ownedChild;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetOwnedChild(NodeMapping newOwnedChild, NotificationChain msgs) {
-		NodeMapping oldOwnedChild = ownedChild;
-		ownedChild = newOwnedChild;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD, oldOwnedChild, newOwnedChild);
-			if (msgs == null) msgs = notification; else msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOwnedChild(NodeMapping newOwnedChild) {
-		if (newOwnedChild != ownedChild) {
-			NotificationChain msgs = null;
-			if (ownedChild != null)
-				msgs = ((InternalEObject)ownedChild).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD, null, msgs);
-			if (newOwnedChild != null)
-				msgs = ((InternalEObject)newOwnedChild).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD, null, msgs);
-			msgs = basicSetOwnedChild(newOwnedChild, msgs);
-			if (msgs != null) msgs.dispatch();
-		}
-		else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD, newOwnedChild, newOwnedChild));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD:
-				return basicSetOwnedChild(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD:
-				return getOwnedChild();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD:
-				setOwnedChild((NodeMapping)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD:
-				setOwnedChild((NodeMapping)null);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.TOP_NODE_REFERENCE__OWNED_CHILD:
-				return ownedChild != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	public NodeMapping getChild() {
-		assert getOwnedChild() != null;
-		return getOwnedChild();
-	}
-
-	public boolean isSetChild() {
-		return getOwnedChild() != null;
-	}
-} //TopNodeReferenceImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ValueExpressionImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ValueExpressionImpl.java
deleted file mode 100644
index 2722b7b2716..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/ValueExpressionImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.Language;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Value Expression</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ValueExpressionImpl#getBody <em>Body</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ValueExpressionImpl#getLanguage <em>Language</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.ValueExpressionImpl#getLangName <em>Lang Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ValueExpressionImpl extends EObjectImpl implements ValueExpression {
-	/**
-	 * The default value of the '{@link #getBody() <em>Body</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBody()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BODY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBody() <em>Body</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBody()
-	 * @generated
-	 * @ordered
-	 */
-	protected String body = BODY_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLanguage() <em>Language</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLanguage()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Language LANGUAGE_EDEFAULT = Language.OCL_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getLanguage() <em>Language</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLanguage()
-	 * @generated
-	 * @ordered
-	 */
-	protected Language language = LANGUAGE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getLangName() <em>Lang Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLangName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String LANG_NAME_EDEFAULT = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ValueExpressionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getValueExpression();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBody() {
-		return body;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBody(String newBody) {
-		String oldBody = body;
-		body = newBody;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.VALUE_EXPRESSION__BODY, oldBody, body));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Language getLanguage() {
-		return language;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLanguage(Language newLanguage) {
-		Language oldLanguage = language;
-		language = newLanguage == null ? LANGUAGE_EDEFAULT : newLanguage;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.VALUE_EXPRESSION__LANGUAGE, oldLanguage, language));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public String getLangName() {
-		Language langEnum = getLanguage();
-		return (langEnum != null) ? langEnum.getName() : ""; //$NON-NLS-1$
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.VALUE_EXPRESSION__BODY:
-				return getBody();
-			case GMFMapPackage.VALUE_EXPRESSION__LANGUAGE:
-				return getLanguage();
-			case GMFMapPackage.VALUE_EXPRESSION__LANG_NAME:
-				return getLangName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.VALUE_EXPRESSION__BODY:
-				setBody((String)newValue);
-				return;
-			case GMFMapPackage.VALUE_EXPRESSION__LANGUAGE:
-				setLanguage((Language)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.VALUE_EXPRESSION__BODY:
-				setBody(BODY_EDEFAULT);
-				return;
-			case GMFMapPackage.VALUE_EXPRESSION__LANGUAGE:
-				setLanguage(LANGUAGE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.VALUE_EXPRESSION__BODY:
-				return BODY_EDEFAULT == null ? body != null : !BODY_EDEFAULT.equals(body);
-			case GMFMapPackage.VALUE_EXPRESSION__LANGUAGE:
-				return language != LANGUAGE_EDEFAULT;
-			case GMFMapPackage.VALUE_EXPRESSION__LANG_NAME:
-				return LANG_NAME_EDEFAULT == null ? getLangName() != null : !LANG_NAME_EDEFAULT.equals(getLangName());
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (body: ");
-		result.append(body);
-		result.append(", language: ");
-		result.append(language);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ValueExpressionImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/VisualEffectMappingImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/VisualEffectMappingImpl.java
deleted file mode 100644
index ddcb31561b4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/impl/VisualEffectMappingImpl.java
+++ /dev/null
@@ -1,301 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.gmfgraph.Pin;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.VisualEffectMapping;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Visual Effect Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.VisualEffectMappingImpl#getDiagramPin <em>Diagram Pin</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.VisualEffectMappingImpl#getOclExpression <em>Ocl Expression</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.mappings.impl.VisualEffectMappingImpl#getParentMapEntry <em>Parent Map Entry</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class VisualEffectMappingImpl extends EObjectImpl implements VisualEffectMapping {
-	/**
-	 * The cached value of the '{@link #getDiagramPin() <em>Diagram Pin</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDiagramPin()
-	 * @generated
-	 * @ordered
-	 */
-	protected Pin diagramPin;
-
-	/**
-	 * The default value of the '{@link #getOclExpression() <em>Ocl Expression</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOclExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String OCL_EXPRESSION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getOclExpression() <em>Ocl Expression</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getOclExpression()
-	 * @generated
-	 * @ordered
-	 */
-	protected String oclExpression = OCL_EXPRESSION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected VisualEffectMappingImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFMapPackage.eINSTANCE.getVisualEffectMapping();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Pin getDiagramPin() {
-		if (diagramPin != null && diagramPin.eIsProxy()) {
-			InternalEObject oldDiagramPin = (InternalEObject)diagramPin;
-			diagramPin = (Pin)eResolveProxy(oldDiagramPin);
-			if (diagramPin != oldDiagramPin) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFMapPackage.VISUAL_EFFECT_MAPPING__DIAGRAM_PIN, oldDiagramPin, diagramPin));
-			}
-		}
-		return diagramPin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Pin basicGetDiagramPin() {
-		return diagramPin;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDiagramPin(Pin newDiagramPin) {
-		Pin oldDiagramPin = diagramPin;
-		diagramPin = newDiagramPin;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.VISUAL_EFFECT_MAPPING__DIAGRAM_PIN, oldDiagramPin, diagramPin));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getOclExpression() {
-		return oclExpression;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setOclExpression(String newOclExpression) {
-		String oldOclExpression = oclExpression;
-		oclExpression = newOclExpression;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFMapPackage.VISUAL_EFFECT_MAPPING__OCL_EXPRESSION, oldOclExpression, oclExpression));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MappingEntry getParentMapEntry() {
-		if (eContainerFeatureID() != GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY) return null;
-		return (MappingEntry)eContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
-				if (eInternalContainer() != null)
-					msgs = eBasicRemoveFromContainer(msgs);
-				return eBasicSetContainer(otherEnd, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY, msgs);
-		}
-		return super.eInverseAdd(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
-				return eBasicSetContainer(null, GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {
-		switch (eContainerFeatureID()) {
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
-				return eInternalContainer().eInverseRemove(this, GMFMapPackage.MAPPING_ENTRY__VISUAL_EFFECTS, MappingEntry.class, msgs);
-		}
-		return super.eBasicRemoveFromContainerFeature(msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__DIAGRAM_PIN:
-				if (resolve) return getDiagramPin();
-				return basicGetDiagramPin();
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__OCL_EXPRESSION:
-				return getOclExpression();
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
-				return getParentMapEntry();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__DIAGRAM_PIN:
-				setDiagramPin((Pin)newValue);
-				return;
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__OCL_EXPRESSION:
-				setOclExpression((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__DIAGRAM_PIN:
-				setDiagramPin((Pin)null);
-				return;
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__OCL_EXPRESSION:
-				setOclExpression(OCL_EXPRESSION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__DIAGRAM_PIN:
-				return diagramPin != null;
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__OCL_EXPRESSION:
-				return OCL_EXPRESSION_EDEFAULT == null ? oclExpression != null : !OCL_EXPRESSION_EDEFAULT.equals(oclExpression);
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING__PARENT_MAP_ENTRY:
-				return getParentMapEntry() != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (oclExpression: ");
-		result.append(oclExpression);
-		result.append(')');
-		return result.toString();
-	}
-
-} //VisualEffectMappingImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/util/GMFMapAdapterFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/util/GMFMapAdapterFactory.java
deleted file mode 100644
index f5e46520650..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/util/GMFMapAdapterFactory.java
+++ /dev/null
@@ -1,858 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.mappings.AppearanceSteward;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.AuditRule;
-import org.eclipse.papyrus.gmf.mappings.Auditable;
-import org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.DesignLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.DiagramElementTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainElementTarget;
-import org.eclipse.papyrus.gmf.mappings.ElementInitializer;
-import org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureValueSpec;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.LinkConstraints;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.Measurable;
-import org.eclipse.papyrus.gmf.mappings.MenuOwner;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-import org.eclipse.papyrus.gmf.mappings.NeedsContainment;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.NotationElementTarget;
-import org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec;
-import org.eclipse.papyrus.gmf.mappings.RuleBase;
-import org.eclipse.papyrus.gmf.mappings.ToolOwner;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-import org.eclipse.papyrus.gmf.mappings.VisualEffectMapping;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage
- * @generated
- */
-public class GMFMapAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static GMFMapPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = GMFMapPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GMFMapSwitch<Adapter> modelSwitch =
-		new GMFMapSwitch<Adapter>() {
-			@Override
-			public Adapter caseMapping(Mapping object) {
-				return createMappingAdapter();
-			}
-			@Override
-			public Adapter caseMappingEntry(MappingEntry object) {
-				return createMappingEntryAdapter();
-			}
-			@Override
-			public Adapter caseNeedsContainment(NeedsContainment object) {
-				return createNeedsContainmentAdapter();
-			}
-			@Override
-			public Adapter caseNodeReference(NodeReference object) {
-				return createNodeReferenceAdapter();
-			}
-			@Override
-			public Adapter caseChildReference(ChildReference object) {
-				return createChildReferenceAdapter();
-			}
-			@Override
-			public Adapter caseTopNodeReference(TopNodeReference object) {
-				return createTopNodeReferenceAdapter();
-			}
-			@Override
-			public Adapter caseNodeMapping(NodeMapping object) {
-				return createNodeMappingAdapter();
-			}
-			@Override
-			public Adapter caseCompartmentMapping(CompartmentMapping object) {
-				return createCompartmentMappingAdapter();
-			}
-			@Override
-			public Adapter caseLinkMapping(LinkMapping object) {
-				return createLinkMappingAdapter();
-			}
-			@Override
-			public Adapter caseCanvasMapping(CanvasMapping object) {
-				return createCanvasMappingAdapter();
-			}
-			@Override
-			public Adapter caseLabelMapping(LabelMapping object) {
-				return createLabelMappingAdapter();
-			}
-			@Override
-			public Adapter caseFeatureLabelMapping(FeatureLabelMapping object) {
-				return createFeatureLabelMappingAdapter();
-			}
-			@Override
-			public Adapter caseOclChoiceLabelMapping(OclChoiceLabelMapping object) {
-				return createOclChoiceLabelMappingAdapter();
-			}
-			@Override
-			public Adapter caseDesignLabelMapping(DesignLabelMapping object) {
-				return createDesignLabelMappingAdapter();
-			}
-			@Override
-			public Adapter caseExpressionLabelMapping(ExpressionLabelMapping object) {
-				return createExpressionLabelMappingAdapter();
-			}
-			@Override
-			public Adapter caseConstraint(Constraint object) {
-				return createConstraintAdapter();
-			}
-			@Override
-			public Adapter caseLinkConstraints(LinkConstraints object) {
-				return createLinkConstraintsAdapter();
-			}
-			@Override
-			public Adapter caseValueExpression(ValueExpression object) {
-				return createValueExpressionAdapter();
-			}
-			@Override
-			public Adapter caseElementInitializer(ElementInitializer object) {
-				return createElementInitializerAdapter();
-			}
-			@Override
-			public Adapter caseFeatureSeqInitializer(FeatureSeqInitializer object) {
-				return createFeatureSeqInitializerAdapter();
-			}
-			@Override
-			public Adapter caseFeatureInitializer(FeatureInitializer object) {
-				return createFeatureInitializerAdapter();
-			}
-			@Override
-			public Adapter caseFeatureValueSpec(FeatureValueSpec object) {
-				return createFeatureValueSpecAdapter();
-			}
-			@Override
-			public Adapter caseReferenceNewElementSpec(ReferenceNewElementSpec object) {
-				return createReferenceNewElementSpecAdapter();
-			}
-			@Override
-			public Adapter caseMenuOwner(MenuOwner object) {
-				return createMenuOwnerAdapter();
-			}
-			@Override
-			public Adapter caseToolOwner(ToolOwner object) {
-				return createToolOwnerAdapter();
-			}
-			@Override
-			public Adapter caseAppearanceSteward(AppearanceSteward object) {
-				return createAppearanceStewardAdapter();
-			}
-			@Override
-			public Adapter caseAuditContainer(AuditContainer object) {
-				return createAuditContainerAdapter();
-			}
-			@Override
-			public Adapter caseRuleBase(RuleBase object) {
-				return createRuleBaseAdapter();
-			}
-			@Override
-			public Adapter caseAuditRule(AuditRule object) {
-				return createAuditRuleAdapter();
-			}
-			@Override
-			public Adapter caseDomainElementTarget(DomainElementTarget object) {
-				return createDomainElementTargetAdapter();
-			}
-			@Override
-			public Adapter caseDomainAttributeTarget(DomainAttributeTarget object) {
-				return createDomainAttributeTargetAdapter();
-			}
-			@Override
-			public Adapter caseDiagramElementTarget(DiagramElementTarget object) {
-				return createDiagramElementTargetAdapter();
-			}
-			@Override
-			public Adapter caseNotationElementTarget(NotationElementTarget object) {
-				return createNotationElementTargetAdapter();
-			}
-			@Override
-			public Adapter caseMetricContainer(MetricContainer object) {
-				return createMetricContainerAdapter();
-			}
-			@Override
-			public Adapter caseMetricRule(MetricRule object) {
-				return createMetricRuleAdapter();
-			}
-			@Override
-			public Adapter caseAuditedMetricTarget(AuditedMetricTarget object) {
-				return createAuditedMetricTargetAdapter();
-			}
-			@Override
-			public Adapter caseAuditable(Auditable object) {
-				return createAuditableAdapter();
-			}
-			@Override
-			public Adapter caseMeasurable(Measurable object) {
-				return createMeasurableAdapter();
-			}
-			@Override
-			public Adapter caseVisualEffectMapping(VisualEffectMapping object) {
-				return createVisualEffectMappingAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.MappingEntry <em>Mapping Entry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.MappingEntry
-	 * @generated
-	 */
-	public Adapter createMappingEntryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.NeedsContainment <em>Needs Containment</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.NeedsContainment
-	 * @generated
-	 */
-	public Adapter createNeedsContainmentAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.NodeReference <em>Node Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeReference
-	 * @generated
-	 */
-	public Adapter createNodeReferenceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.ChildReference <em>Child Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.ChildReference
-	 * @generated
-	 */
-	public Adapter createChildReferenceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.TopNodeReference <em>Top Node Reference</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.TopNodeReference
-	 * @generated
-	 */
-	public Adapter createTopNodeReferenceAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.NodeMapping <em>Node Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.NodeMapping
-	 * @generated
-	 */
-	public Adapter createNodeMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.CompartmentMapping <em>Compartment Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.CompartmentMapping
-	 * @generated
-	 */
-	public Adapter createCompartmentMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.LinkMapping <em>Link Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkMapping
-	 * @generated
-	 */
-	public Adapter createLinkMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.CanvasMapping <em>Canvas Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.CanvasMapping
-	 * @generated
-	 */
-	public Adapter createCanvasMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.LabelMapping <em>Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.LabelMapping
-	 * @generated
-	 */
-	public Adapter createLabelMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping <em>Feature Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping
-	 * @generated
-	 */
-	public Adapter createFeatureLabelMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping <em>Ocl Choice Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping
-	 * @generated
-	 */
-	public Adapter createOclChoiceLabelMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.DesignLabelMapping <em>Design Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.DesignLabelMapping
-	 * @generated
-	 */
-	public Adapter createDesignLabelMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping <em>Expression Label Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping
-	 * @generated
-	 */
-	public Adapter createExpressionLabelMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.Mapping <em>Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.Mapping
-	 * @generated
-	 */
-	public Adapter createMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.Constraint <em>Constraint</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.Constraint
-	 * @generated
-	 */
-	public Adapter createConstraintAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.LinkConstraints <em>Link Constraints</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.LinkConstraints
-	 * @generated
-	 */
-	public Adapter createLinkConstraintsAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.ValueExpression <em>Value Expression</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.ValueExpression
-	 * @generated
-	 */
-	public Adapter createValueExpressionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.ElementInitializer <em>Element Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.ElementInitializer
-	 * @generated
-	 */
-	public Adapter createElementInitializerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer <em>Feature Seq Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer
-	 * @generated
-	 */
-	public Adapter createFeatureSeqInitializerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.FeatureInitializer <em>Feature Initializer</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureInitializer
-	 * @generated
-	 */
-	public Adapter createFeatureInitializerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.FeatureValueSpec <em>Feature Value Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.FeatureValueSpec
-	 * @generated
-	 */
-	public Adapter createFeatureValueSpecAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec <em>Reference New Element Spec</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec
-	 * @generated
-	 */
-	public Adapter createReferenceNewElementSpecAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.MenuOwner <em>Menu Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.MenuOwner
-	 * @generated
-	 */
-	public Adapter createMenuOwnerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.ToolOwner <em>Tool Owner</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.ToolOwner
-	 * @generated
-	 */
-	public Adapter createToolOwnerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.AppearanceSteward <em>Appearance Steward</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.AppearanceSteward
-	 * @generated
-	 */
-	public Adapter createAppearanceStewardAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.AuditContainer <em>Audit Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditContainer
-	 * @generated
-	 */
-	public Adapter createAuditContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.AuditRule <em>Audit Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditRule
-	 * @generated
-	 */
-	public Adapter createAuditRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.RuleBase <em>Rule Base</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.RuleBase
-	 * @generated
-	 */
-	public Adapter createRuleBaseAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.DomainElementTarget <em>Domain Element Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.DomainElementTarget
-	 * @generated
-	 */
-	public Adapter createDomainElementTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget <em>Domain Attribute Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget
-	 * @generated
-	 */
-	public Adapter createDomainAttributeTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.DiagramElementTarget <em>Diagram Element Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.DiagramElementTarget
-	 * @generated
-	 */
-	public Adapter createDiagramElementTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.NotationElementTarget <em>Notation Element Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.NotationElementTarget
-	 * @generated
-	 */
-	public Adapter createNotationElementTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.MetricContainer <em>Metric Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricContainer
-	 * @generated
-	 */
-	public Adapter createMetricContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.MetricRule <em>Metric Rule</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.MetricRule
-	 * @generated
-	 */
-	public Adapter createMetricRuleAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget <em>Audited Metric Target</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget
-	 * @generated
-	 */
-	public Adapter createAuditedMetricTargetAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.Auditable <em>Auditable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.Auditable
-	 * @generated
-	 */
-	public Adapter createAuditableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.Measurable <em>Measurable</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.Measurable
-	 * @generated
-	 */
-	public Adapter createMeasurableAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.mappings.VisualEffectMapping <em>Visual Effect Mapping</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.mappings.VisualEffectMapping
-	 * @generated
-	 */
-	public Adapter createVisualEffectMappingAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //GMFMapAdapterFactory
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/util/GMFMapSwitch.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/util/GMFMapSwitch.java
deleted file mode 100644
index 1568b60c0ea..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.map/src/org/eclipse/papyrus/gmf/mappings/util/GMFMapSwitch.java
+++ /dev/null
@@ -1,995 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.mappings.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.gmf.mappings.AppearanceSteward;
-import org.eclipse.papyrus.gmf.mappings.AuditContainer;
-import org.eclipse.papyrus.gmf.mappings.AuditRule;
-import org.eclipse.papyrus.gmf.mappings.Auditable;
-import org.eclipse.papyrus.gmf.mappings.AuditedMetricTarget;
-import org.eclipse.papyrus.gmf.mappings.CanvasMapping;
-import org.eclipse.papyrus.gmf.mappings.ChildReference;
-import org.eclipse.papyrus.gmf.mappings.CompartmentMapping;
-import org.eclipse.papyrus.gmf.mappings.Constraint;
-import org.eclipse.papyrus.gmf.mappings.DesignLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.DiagramElementTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainAttributeTarget;
-import org.eclipse.papyrus.gmf.mappings.DomainElementTarget;
-import org.eclipse.papyrus.gmf.mappings.ElementInitializer;
-import org.eclipse.papyrus.gmf.mappings.ExpressionLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.FeatureSeqInitializer;
-import org.eclipse.papyrus.gmf.mappings.FeatureValueSpec;
-import org.eclipse.papyrus.gmf.mappings.GMFMapPackage;
-import org.eclipse.papyrus.gmf.mappings.LabelMapping;
-import org.eclipse.papyrus.gmf.mappings.LinkConstraints;
-import org.eclipse.papyrus.gmf.mappings.LinkMapping;
-import org.eclipse.papyrus.gmf.mappings.Mapping;
-import org.eclipse.papyrus.gmf.mappings.MappingEntry;
-import org.eclipse.papyrus.gmf.mappings.Measurable;
-import org.eclipse.papyrus.gmf.mappings.MenuOwner;
-import org.eclipse.papyrus.gmf.mappings.MetricContainer;
-import org.eclipse.papyrus.gmf.mappings.MetricRule;
-import org.eclipse.papyrus.gmf.mappings.NeedsContainment;
-import org.eclipse.papyrus.gmf.mappings.NodeMapping;
-import org.eclipse.papyrus.gmf.mappings.NodeReference;
-import org.eclipse.papyrus.gmf.mappings.NotationElementTarget;
-import org.eclipse.papyrus.gmf.mappings.OclChoiceLabelMapping;
-import org.eclipse.papyrus.gmf.mappings.ReferenceNewElementSpec;
-import org.eclipse.papyrus.gmf.mappings.RuleBase;
-import org.eclipse.papyrus.gmf.mappings.ToolOwner;
-import org.eclipse.papyrus.gmf.mappings.TopNodeReference;
-import org.eclipse.papyrus.gmf.mappings.ValueExpression;
-import org.eclipse.papyrus.gmf.mappings.VisualEffectMapping;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.mappings.GMFMapPackage
- * @generated
- */
-public class GMFMapSwitch<T> extends Switch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static GMFMapPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFMapSwitch() {
-		if (modelPackage == null) {
-			modelPackage = GMFMapPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case GMFMapPackage.MAPPING: {
-				Mapping mapping = (Mapping)theEObject;
-				T result = caseMapping(mapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.MAPPING_ENTRY: {
-				MappingEntry mappingEntry = (MappingEntry)theEObject;
-				T result = caseMappingEntry(mappingEntry);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.NEEDS_CONTAINMENT: {
-				NeedsContainment needsContainment = (NeedsContainment)theEObject;
-				T result = caseNeedsContainment(needsContainment);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.NODE_REFERENCE: {
-				NodeReference nodeReference = (NodeReference)theEObject;
-				T result = caseNodeReference(nodeReference);
-				if (result == null) result = caseNeedsContainment(nodeReference);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.CHILD_REFERENCE: {
-				ChildReference childReference = (ChildReference)theEObject;
-				T result = caseChildReference(childReference);
-				if (result == null) result = caseNodeReference(childReference);
-				if (result == null) result = caseNeedsContainment(childReference);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.TOP_NODE_REFERENCE: {
-				TopNodeReference topNodeReference = (TopNodeReference)theEObject;
-				T result = caseTopNodeReference(topNodeReference);
-				if (result == null) result = caseNodeReference(topNodeReference);
-				if (result == null) result = caseNeedsContainment(topNodeReference);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.NODE_MAPPING: {
-				NodeMapping nodeMapping = (NodeMapping)theEObject;
-				T result = caseNodeMapping(nodeMapping);
-				if (result == null) result = caseMappingEntry(nodeMapping);
-				if (result == null) result = caseMenuOwner(nodeMapping);
-				if (result == null) result = caseToolOwner(nodeMapping);
-				if (result == null) result = caseAppearanceSteward(nodeMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.COMPARTMENT_MAPPING: {
-				CompartmentMapping compartmentMapping = (CompartmentMapping)theEObject;
-				T result = caseCompartmentMapping(compartmentMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.LINK_MAPPING: {
-				LinkMapping linkMapping = (LinkMapping)theEObject;
-				T result = caseLinkMapping(linkMapping);
-				if (result == null) result = caseMappingEntry(linkMapping);
-				if (result == null) result = caseNeedsContainment(linkMapping);
-				if (result == null) result = caseMenuOwner(linkMapping);
-				if (result == null) result = caseToolOwner(linkMapping);
-				if (result == null) result = caseAppearanceSteward(linkMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.CANVAS_MAPPING: {
-				CanvasMapping canvasMapping = (CanvasMapping)theEObject;
-				T result = caseCanvasMapping(canvasMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.LABEL_MAPPING: {
-				LabelMapping labelMapping = (LabelMapping)theEObject;
-				T result = caseLabelMapping(labelMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.FEATURE_LABEL_MAPPING: {
-				FeatureLabelMapping featureLabelMapping = (FeatureLabelMapping)theEObject;
-				T result = caseFeatureLabelMapping(featureLabelMapping);
-				if (result == null) result = caseLabelMapping(featureLabelMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.OCL_CHOICE_LABEL_MAPPING: {
-				OclChoiceLabelMapping oclChoiceLabelMapping = (OclChoiceLabelMapping)theEObject;
-				T result = caseOclChoiceLabelMapping(oclChoiceLabelMapping);
-				if (result == null) result = caseLabelMapping(oclChoiceLabelMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.DESIGN_LABEL_MAPPING: {
-				DesignLabelMapping designLabelMapping = (DesignLabelMapping)theEObject;
-				T result = caseDesignLabelMapping(designLabelMapping);
-				if (result == null) result = caseLabelMapping(designLabelMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.EXPRESSION_LABEL_MAPPING: {
-				ExpressionLabelMapping expressionLabelMapping = (ExpressionLabelMapping)theEObject;
-				T result = caseExpressionLabelMapping(expressionLabelMapping);
-				if (result == null) result = caseLabelMapping(expressionLabelMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.CONSTRAINT: {
-				Constraint constraint = (Constraint)theEObject;
-				T result = caseConstraint(constraint);
-				if (result == null) result = caseValueExpression(constraint);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.LINK_CONSTRAINTS: {
-				LinkConstraints linkConstraints = (LinkConstraints)theEObject;
-				T result = caseLinkConstraints(linkConstraints);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.VALUE_EXPRESSION: {
-				ValueExpression valueExpression = (ValueExpression)theEObject;
-				T result = caseValueExpression(valueExpression);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.ELEMENT_INITIALIZER: {
-				ElementInitializer elementInitializer = (ElementInitializer)theEObject;
-				T result = caseElementInitializer(elementInitializer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.FEATURE_SEQ_INITIALIZER: {
-				FeatureSeqInitializer featureSeqInitializer = (FeatureSeqInitializer)theEObject;
-				T result = caseFeatureSeqInitializer(featureSeqInitializer);
-				if (result == null) result = caseElementInitializer(featureSeqInitializer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.FEATURE_INITIALIZER: {
-				FeatureInitializer featureInitializer = (FeatureInitializer)theEObject;
-				T result = caseFeatureInitializer(featureInitializer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.FEATURE_VALUE_SPEC: {
-				FeatureValueSpec featureValueSpec = (FeatureValueSpec)theEObject;
-				T result = caseFeatureValueSpec(featureValueSpec);
-				if (result == null) result = caseFeatureInitializer(featureValueSpec);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.REFERENCE_NEW_ELEMENT_SPEC: {
-				ReferenceNewElementSpec referenceNewElementSpec = (ReferenceNewElementSpec)theEObject;
-				T result = caseReferenceNewElementSpec(referenceNewElementSpec);
-				if (result == null) result = caseFeatureInitializer(referenceNewElementSpec);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.MENU_OWNER: {
-				MenuOwner menuOwner = (MenuOwner)theEObject;
-				T result = caseMenuOwner(menuOwner);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.TOOL_OWNER: {
-				ToolOwner toolOwner = (ToolOwner)theEObject;
-				T result = caseToolOwner(toolOwner);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.APPEARANCE_STEWARD: {
-				AppearanceSteward appearanceSteward = (AppearanceSteward)theEObject;
-				T result = caseAppearanceSteward(appearanceSteward);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.AUDIT_CONTAINER: {
-				AuditContainer auditContainer = (AuditContainer)theEObject;
-				T result = caseAuditContainer(auditContainer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.RULE_BASE: {
-				RuleBase ruleBase = (RuleBase)theEObject;
-				T result = caseRuleBase(ruleBase);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.AUDIT_RULE: {
-				AuditRule auditRule = (AuditRule)theEObject;
-				T result = caseAuditRule(auditRule);
-				if (result == null) result = caseRuleBase(auditRule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.DOMAIN_ELEMENT_TARGET: {
-				DomainElementTarget domainElementTarget = (DomainElementTarget)theEObject;
-				T result = caseDomainElementTarget(domainElementTarget);
-				if (result == null) result = caseAuditable(domainElementTarget);
-				if (result == null) result = caseMeasurable(domainElementTarget);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.DOMAIN_ATTRIBUTE_TARGET: {
-				DomainAttributeTarget domainAttributeTarget = (DomainAttributeTarget)theEObject;
-				T result = caseDomainAttributeTarget(domainAttributeTarget);
-				if (result == null) result = caseAuditable(domainAttributeTarget);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.DIAGRAM_ELEMENT_TARGET: {
-				DiagramElementTarget diagramElementTarget = (DiagramElementTarget)theEObject;
-				T result = caseDiagramElementTarget(diagramElementTarget);
-				if (result == null) result = caseAuditable(diagramElementTarget);
-				if (result == null) result = caseMeasurable(diagramElementTarget);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.NOTATION_ELEMENT_TARGET: {
-				NotationElementTarget notationElementTarget = (NotationElementTarget)theEObject;
-				T result = caseNotationElementTarget(notationElementTarget);
-				if (result == null) result = caseAuditable(notationElementTarget);
-				if (result == null) result = caseMeasurable(notationElementTarget);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.METRIC_CONTAINER: {
-				MetricContainer metricContainer = (MetricContainer)theEObject;
-				T result = caseMetricContainer(metricContainer);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.METRIC_RULE: {
-				MetricRule metricRule = (MetricRule)theEObject;
-				T result = caseMetricRule(metricRule);
-				if (result == null) result = caseRuleBase(metricRule);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.AUDITED_METRIC_TARGET: {
-				AuditedMetricTarget auditedMetricTarget = (AuditedMetricTarget)theEObject;
-				T result = caseAuditedMetricTarget(auditedMetricTarget);
-				if (result == null) result = caseAuditable(auditedMetricTarget);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.AUDITABLE: {
-				Auditable auditable = (Auditable)theEObject;
-				T result = caseAuditable(auditable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.MEASURABLE: {
-				Measurable measurable = (Measurable)theEObject;
-				T result = caseMeasurable(measurable);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case GMFMapPackage.VISUAL_EFFECT_MAPPING: {
-				VisualEffectMapping visualEffectMapping = (VisualEffectMapping)theEObject;
-				T result = caseVisualEffectMapping(visualEffectMapping);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Mapping Entry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Mapping Entry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMappingEntry(MappingEntry object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Needs Containment</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Needs Containment</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseNeedsContainment(NeedsContainment object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Node Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Node Reference</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseNodeReference(NodeReference object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Child Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Child Reference</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseChildReference(ChildReference object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Top Node Reference</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Top Node Reference</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTopNodeReference(TopNodeReference object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Node Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Node Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseNodeMapping(NodeMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Compartment Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Compartment Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCompartmentMapping(CompartmentMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Link Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Link Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLinkMapping(LinkMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Canvas Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Canvas Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCanvasMapping(CanvasMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Label Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLabelMapping(LabelMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Feature Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Feature Label Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFeatureLabelMapping(FeatureLabelMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Ocl Choice Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Ocl Choice Label Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseOclChoiceLabelMapping(OclChoiceLabelMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Design Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Design Label Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDesignLabelMapping(DesignLabelMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Expression Label Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Expression Label Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseExpressionLabelMapping(ExpressionLabelMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMapping(Mapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Constraint</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseConstraint(Constraint object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Link Constraints</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Link Constraints</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseLinkConstraints(LinkConstraints object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Value Expression</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Value Expression</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseValueExpression(ValueExpression object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Element Initializer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Element Initializer</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseElementInitializer(ElementInitializer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Feature Seq Initializer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Feature Seq Initializer</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFeatureSeqInitializer(FeatureSeqInitializer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Feature Initializer</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Feature Initializer</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFeatureInitializer(FeatureInitializer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Feature Value Spec</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Feature Value Spec</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFeatureValueSpec(FeatureValueSpec object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Reference New Element Spec</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Reference New Element Spec</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseReferenceNewElementSpec(ReferenceNewElementSpec object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Menu Owner</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Menu Owner</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMenuOwner(MenuOwner object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Tool Owner</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Tool Owner</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseToolOwner(ToolOwner object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Appearance Steward</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Appearance Steward</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAppearanceSteward(AppearanceSteward object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Audit Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Audit Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAuditContainer(AuditContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Audit Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Audit Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAuditRule(AuditRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Rule Base</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Rule Base</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseRuleBase(RuleBase object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Domain Element Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Domain Element Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDomainElementTarget(DomainElementTarget object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Domain Attribute Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Domain Attribute Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDomainAttributeTarget(DomainAttributeTarget object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Diagram Element Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Diagram Element Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDiagramElementTarget(DiagramElementTarget object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Notation Element Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Notation Element Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseNotationElementTarget(NotationElementTarget object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Metric Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Metric Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMetricContainer(MetricContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Metric Rule</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Metric Rule</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMetricRule(MetricRule object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Audited Metric Target</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Audited Metric Target</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAuditedMetricTarget(AuditedMetricTarget object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Auditable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Auditable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAuditable(Auditable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Measurable</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Measurable</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMeasurable(Measurable object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Visual Effect Mapping</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Visual Effect Mapping</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseVisualEffectMapping(VisualEffectMapping object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //GMFMapSwitch
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.project
deleted file mode 100644
index 86918c5a156..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.tooldef.edit</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/META-INF/MANIFEST.MF
deleted file mode 100644
index 01edbd3afb8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.tooldef.edit; singleton:=true
-Bundle-Version: 2.3.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.papyrus.gmf.tooldef.provider.GMFToolEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.papyrus.gmf.tooldef.presentation,
- org.eclipse.papyrus.gmf.tooldef.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.tooldef;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
- org.eclipse.ui.ide;bundle-version="[3.3.0,4.0.0)";visibility:=reexport
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/build.properties
deleted file mode 100644
index 5eccdd20ee8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/build.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#    Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-
-bin.includes = .,\
-               icons/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_largeIcon_BundleImage.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_largeIcon_BundleImage.gif
deleted file mode 100644
index 497cf8697ce..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_largeIcon_BundleImage.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_largeIcon_DefaultImage.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_largeIcon_DefaultImage.gif
deleted file mode 100644
index 8e2a3260f9c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_largeIcon_DefaultImage.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_smallIcon_BundleImage.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_smallIcon_BundleImage.gif
deleted file mode 100644
index 497cf8697ce..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_smallIcon_BundleImage.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_smallIcon_DefaultImage.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_smallIcon_DefaultImage.gif
deleted file mode 100644
index 8e2a3260f9c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateAbstractTool_smallIcon_DefaultImage.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateContributionItem_icon_BundleImage.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateContributionItem_icon_BundleImage.gif
deleted file mode 100644
index f0846fb5af6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateContributionItem_icon_BundleImage.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateContributionItem_icon_DefaultImage.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateContributionItem_icon_DefaultImage.gif
deleted file mode 100644
index 7cd7a6b8695..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateContributionItem_icon_DefaultImage.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_ItemRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_ItemRef.gif
deleted file mode 100644
index 8966d117090..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_ItemRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_MenuAction.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_MenuAction.gif
deleted file mode 100644
index 834778fb99e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_MenuAction.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PopupMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PopupMenu.gif
deleted file mode 100644
index 9e275c64b94..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PopupMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PredefinedItem.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PredefinedItem.gif
deleted file mode 100644
index 7936184f76e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PredefinedItem.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PredefinedMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PredefinedMenu.gif
deleted file mode 100644
index bd2a29ab6f1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_PredefinedMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_Separator.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_Separator.gif
deleted file mode 100644
index f73697b64c8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateMenu_items_Separator.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_CreationTool.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_CreationTool.gif
deleted file mode 100644
index a382f74844b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_CreationTool.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_GenericTool.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_GenericTool.gif
deleted file mode 100644
index 9cc534c3422..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_GenericTool.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_Palette.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_Palette.gif
deleted file mode 100644
index d68f55cf8fb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_Palette.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_PaletteSeparator.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_PaletteSeparator.gif
deleted file mode 100644
index 13d1a04bac4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_PaletteSeparator.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_StandardTool.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_StandardTool.gif
deleted file mode 100644
index 13d1a04bac4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_StandardTool.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_ToolGroup.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_ToolGroup.gif
deleted file mode 100644
index cdab252ab4a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolContainer_tools_ToolGroup.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_ContextMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_ContextMenu.gif
deleted file mode 100644
index 8fe680b4db8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_ContextMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_MainMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_MainMenu.gif
deleted file mode 100644
index 7936184f76e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_MainMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_PopupMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_PopupMenu.gif
deleted file mode 100644
index 9e275c64b94..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_PopupMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_PredefinedMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_PredefinedMenu.gif
deleted file mode 100644
index bd2a29ab6f1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_PredefinedMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_Toolbar.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_Toolbar.gif
deleted file mode 100644
index 535fb3989a5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_allMenus_Toolbar.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_palette_Palette.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_palette_Palette.gif
deleted file mode 100644
index 0289a2ad631..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_palette_Palette.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_sharedActions_MenuAction.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_sharedActions_MenuAction.gif
deleted file mode 100644
index 834778fb99e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/ctool16/CreateToolRegistry_sharedActions_MenuAction.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/BundleImage.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/BundleImage.gif
deleted file mode 100644
index 83afb9b3c9a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/BundleImage.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ContextMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ContextMenu.gif
deleted file mode 100644
index 83afb9b3c9a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ContextMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/CreationTool.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/CreationTool.gif
deleted file mode 100644
index 05dc74ad5da..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/CreationTool.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/DefaultImage.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/DefaultImage.gif
deleted file mode 100644
index 7bac4fd3808..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/DefaultImage.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GMFToolModelFile.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GMFToolModelFile.gif
deleted file mode 100644
index 074518f0f1c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GMFToolModelFile.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GenericStyleSelector.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GenericStyleSelector.gif
deleted file mode 100644
index e4bc22dd17e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GenericStyleSelector.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GenericTool.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GenericTool.gif
deleted file mode 100644
index a3908bcf7b4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/GenericTool.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ItemRef.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ItemRef.gif
deleted file mode 100644
index c00aedf4135..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ItemRef.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/MainMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/MainMenu.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/MainMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/MenuAction.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/MenuAction.gif
deleted file mode 100644
index e4bc22dd17e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/MenuAction.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Palette.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Palette.gif
deleted file mode 100644
index 1eb8057c047..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Palette.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PaletteSeparator.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PaletteSeparator.gif
deleted file mode 100644
index 4365960a04b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PaletteSeparator.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PopupMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PopupMenu.gif
deleted file mode 100644
index 7c2aaac84ee..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PopupMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PredefinedItem.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PredefinedItem.gif
deleted file mode 100644
index 7b7c428c715..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PredefinedItem.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PredefinedMenu.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PredefinedMenu.gif
deleted file mode 100644
index c414fe9f728..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/PredefinedMenu.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Separator.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Separator.gif
deleted file mode 100644
index 420eee17752..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Separator.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/StandardTool.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/StandardTool.gif
deleted file mode 100644
index 4365960a04b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/StandardTool.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ToolGroup.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ToolGroup.gif
deleted file mode 100644
index ed874747401..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ToolGroup.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ToolRegistry.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ToolRegistry.gif
deleted file mode 100644
index c00aedf4135..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/ToolRegistry.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Toolbar.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Toolbar.gif
deleted file mode 100644
index 498364f1c1a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/obj16/Toolbar.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/wizban/NewGMFTool.gif b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/wizban/NewGMFTool.gif
deleted file mode 100644
index 92c8b752980..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/icons/full/wizban/NewGMFTool.gif
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/plugin.properties
deleted file mode 100644
index 158efef686c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/plugin.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#    Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-pluginName = Papyrus GMF Tooling Edit Model
-providerName = Eclipse Modeling Project
-
-#####################################################
-# Properties in this section SHOULD NOT be translated
-#####################################################
-_UI_GMFToolEditorFilenameDefaultBase = My
-_UI_GMFToolEditorFilenameExtension = gmftool
-
-_UI_XMLEncodingChoices = UTF-8 ASCII UTF-16 UTF-16BE UTF-16LE ISO-8859-1
-################
-# End of section
-################
-
-#############################################################
-# Properties in this section ARE REALLY NEED to be translated
-#############################################################
-_UI_CreateChild_text = {0}
-_UI_CreateChild_text2 = {1} {0}
-_UI_CreateChild_text3 = {1}
-_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
-_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
-_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
-
-_UI_PropertyDescriptor_description = The {0} of the {1}
-
-_UI_GMFToolEditor_menu = &GMFTool Editor
-
-_UI_CreateChild_menu_item = &New Child
-_UI_CreateSibling_menu_item = N&ew Sibling
-
-_UI_ShowPropertiesView_menu_item = Show &Properties View
-_UI_RefreshViewer_menu_item = &Refresh
-
-_UI_SelectionPage_label = Selection
-_UI_ParentPage_label = Parent
-_UI_ListPage_label = List
-_UI_TreePage_label = Tree
-_UI_TablePage_label = Table
-_UI_TreeWithColumnsPage_label = Tree with Columns
-_UI_ObjectColumn_label = Object
-_UI_SelfColumn_label = Self
-
-_UI_NoObjectSelected = Selected Nothing
-_UI_SingleObjectSelected = Selected Object: {0}
-_UI_MultiObjectSelected = Selected {0} Objects
-
-_UI_OpenEditorError_label = Open Editor
-
-_UI_GMFToolModelWizard_label = GMFTool Model
-_UI_GMFToolModelWizard_description = Create a new GMFTool model
-
-_UI_GMFToolEditor_label = GMFTool Model Editor
-
-_UI_Wizard_label = New
-
-_WARN_FilenameExtension = The file name must end in ".{0}"
-
-_UI_ModelObject = Model Object
-_UI_XMLEncoding = XML Encoding
-_UI_Wizard_initial_object_description = Select a model object to create
-
-_UI_FileConflict_label = File Conflict
-_WARN_FileConflict = There are unsaved changes that conflict with changes made outside the editor.  Do you wish to discard this editor's changes?
-
-_UI_CreateModelError_message = Problems encountered in file "{0}"
-
-################
-# End of section
-################
-
-######################################################################################
-# Properties in this section MAY be translated, although they are quite ok in English.
-# Mostly there are names of classes and features that are often referenced to by
-# their English names
-######################################################################################
-pluginName = Papyrus GMF Tooling Edit Support
-providerName = Eclipse Modeling Project
-
-_UI_ToolRegistry_type = Tool Registry
-_UI_AbstractTool_type = Abstract Tool
-_UI_ToolContainer_type = Tool Container
-_UI_PaletteSeparator_type = Palette Separator
-_UI_ToolGroup_type = Tool Group
-_UI_Palette_type = Palette
-_UI_StandardTool_type = Standard Tool
-_UI_CreationTool_type = Creation Tool
-_UI_GenericTool_type = Generic Tool
-_UI_ItemBase_type = Item Base
-_UI_Menu_type = Menu
-_UI_Separator_type = Separator
-_UI_PredefinedItem_type = Predefined Item
-_UI_PredefinedMenu_type = Predefined Menu
-_UI_ContributionItem_type = Contribution Item
-_UI_MenuAction_type = Menu Action
-_UI_ItemRef_type = Item Ref
-_UI_ContextMenu_type = Context Menu
-_UI_PopupMenu_type = Popup Menu
-_UI_MainMenu_type = Main Menu
-_UI_Toolbar_type = Toolbar
-_UI_Image_type = Image
-_UI_DefaultImage_type = Default Image
-_UI_BundleImage_type = Bundle Image
-_UI_StyleSelector_type = Style Selector
-_UI_GenericStyleSelector_type = Generic Style Selector
-_UI_Unknown_type = Object
-
_UI_Unknown_datatype= Value
-
_UI_ToolRegistry_sharedActions_feature = Shared Actions
-_UI_ToolRegistry_allMenus_feature = All Menus
-_UI_ToolRegistry_palette_feature = Palette
-_UI_AbstractTool_smallIcon_feature = Small Icon
-_UI_AbstractTool_largeIcon_feature = Large Icon
-_UI_AbstractTool_title_feature = Title
-_UI_AbstractTool_description_feature = Description
-_UI_ToolContainer_tools_feature = Tools
-_UI_ToolGroup_collapsible_feature = Collapsible
-_UI_ToolGroup_active_feature = Active
-_UI_ToolGroup_stack_feature = Stack
-_UI_Palette_default_feature = Default
-_UI_StandardTool_toolKind_feature = Tool Kind
-_UI_GenericTool_toolClass_feature = Tool Class
-_UI_Menu_items_feature = Items
-_UI_Separator_name_feature = Name
-_UI_PredefinedItem_identifier_feature = Identifier
-_UI_ContributionItem_icon_feature = Icon
-_UI_ContributionItem_title_feature = Title
-_UI_MenuAction_kind_feature = Kind
-_UI_MenuAction_hotKey_feature = Hot Key
-_UI_ItemRef_item_feature = Item
-_UI_ContextMenu_default_feature = Default
-_UI_PopupMenu_iD_feature = ID
-_UI_MainMenu_title_feature = Title
-_UI_BundleImage_path_feature = Path
-_UI_BundleImage_bundle_feature = Bundle
-_UI_GenericStyleSelector_values_feature = Values
-_UI_Unknown_feature = Unspecified
-
_UI_StandardToolKind_SELECT_literal = SELECT
-_UI_StandardToolKind_SELECT_PAN_literal = SELECT_PAN
-_UI_StandardToolKind_MARQUEE_literal = MARQUEE
-_UI_StandardToolKind_ZOOM_PAN_literal = ZOOM_PAN
-_UI_StandardToolKind_ZOOM_IN_literal = ZOOM_IN
-_UI_StandardToolKind_ZOOM_OUT_literal = ZOOM_OUT
-
-_UI_ActionKind_CREATE_literal = CREATE
-_UI_ActionKind_PROPCHANGE_literal = PROPCHANGE
-_UI_ActionKind_MODIFY_literal = MODIFY
-_UI_ActionKind_PROCESS_literal = PROCESS
-_UI_ActionKind_CUSTOM_literal = CUSTOM
-
-_UI_AppearanceStyle_Font_literal = Font
-_UI_AppearanceStyle_Fill_literal = Fill
-_UI_AppearanceStyle_Line_literal = Line
-
-#_UI_Wizard_category= 
-
-# ====================================================================
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/plugin.xml
deleted file mode 100644
index ff7c96aadac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/plugin.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id$
--->
-
-<plugin>
-
-  <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
-    <factory 
-       uri = "http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition" 
-       class = "org.eclipse.papyrus.gmf.tooldef.provider.GMFToolItemProviderAdapterFactory"
-       supportedTypes = 
-         "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
-          org.eclipse.emf.edit.provider.IStructuredItemContentProvider
-          org.eclipse.emf.edit.provider.ITreeItemContentProvider
-          org.eclipse.emf.edit.provider.IItemLabelProvider
-          org.eclipse.emf.edit.provider.IItemPropertySource" />
-  </extension>
-  
-
-  <extension
-    point = "org.eclipse.ui.newWizards">
-    <wizard
-      id = "org.eclipse.papyrus.gmf.tooldef.presentation.GMFToolModelWizardID"
-      name = "%_UI_GMFToolModelWizard_label"
-      class = "org.eclipse.papyrus.gmf.tooldef.presentation.GMFToolModelWizard"
-      category = "org.eclipse.gmf.tooling.wizardCategory/org.eclipse.gmf.tooling.wizardsDefault"
-      icon = "icons/full/obj16/GMFToolModelFile.gif">
-      <description>%_UI_GMFToolModelWizard_description</description>
-      <selection class = "org.eclipse.core.resources.IResource" />
-    </wizard>
-  </extension>
-
-  <extension point = "org.eclipse.ui.editors">
-    <editor
-        id = "org.eclipse.papyrus.gmf.tooldef.presentation.GMFToolEditorID"
-        name = "%_UI_GMFToolEditor_label"
-        icon = "icons/full/obj16/GMFToolModelFile.gif"
-        extensions = "gmftool"
-        class = "org.eclipse.papyrus.gmf.tooldef.presentation.GMFToolEditor" 
-        contributorClass="org.eclipse.papyrus.gmf.tooldef.presentation.GMFToolActionBarContributor" >
-    </editor>
-  </extension>    
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/pom.xml
deleted file mode 100644
index 4385551c5de..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.tooldef.edit</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolActionBarContributor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolActionBarContributor.java
deleted file mode 100644
index 154e8da89d3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolActionBarContributor.java
+++ /dev/null
@@ -1,429 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.presentation;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.ui.action.ControlAction;
-import org.eclipse.emf.edit.ui.action.CreateChildAction;
-import org.eclipse.emf.edit.ui.action.CreateSiblingAction;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.action.LoadResourceAction;
-import org.eclipse.emf.edit.ui.action.ValidateAction;
-import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.ActionContributionItem;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.IContributionManager;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.action.SubContributionItem;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.gmf.tooldef.provider.GMFToolEditPlugin;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PartInitException;
-
-/**
- * This is the action bar contributor for the GMFTool model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFToolActionBarContributor extends EditingDomainActionBarContributor implements ISelectionChangedListener {
-	/**
-	 * This keeps track of the active editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IEditorPart activeEditorPart;
-
-	/**
-	 * This keeps track of the current selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelectionProvider selectionProvider;
-
-	/**
-	 * This action opens the Properties view.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IAction showPropertiesViewAction = new Action(GMFToolEditPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) {
-		@Override
-		public void run() {
-			try {
-				getPage().showView("org.eclipse.ui.views.PropertySheet");
-			} catch (PartInitException exception) {
-				GMFToolEditPlugin.INSTANCE.log(exception);
-			}
-		}
-	};
-
-	/**
-	 * This action refreshes the viewer of the current editor if the editor
-	 * implements {@link org.eclipse.emf.common.ui.viewer.IViewerProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IAction refreshViewerAction = new Action(GMFToolEditPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
-		@Override
-		public boolean isEnabled() {
-			return activeEditorPart instanceof IViewerProvider;
-		}
-
-		@Override
-		public void run() {
-			if (activeEditorPart instanceof IViewerProvider) {
-				Viewer viewer = ((IViewerProvider) activeEditorPart).getViewer();
-				if (viewer != null) {
-					viewer.refresh();
-				}
-			}
-		}
-	};
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateChildAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> createChildActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateChild actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IMenuManager createChildMenuManager;
-
-	/**
-	 * This will contain one {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} corresponding to each descriptor
-	 * generated for the current selection by the item provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> createSiblingActions;
-
-	/**
-	 * This is the menu manager into which menu contribution items should be added for CreateSibling actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IMenuManager createSiblingMenuManager;
-
-	/**
-	 * This creates an instance of the contributor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolActionBarContributor() {
-		super(ADDITIONS_LAST_STYLE);
-		loadResourceAction = new LoadResourceAction();
-		validateAction = new ValidateAction();
-		controlAction = new ControlAction();
-	}
-
-	/**
-	 * This adds Separators for editor additions to the tool bar.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void contributeToToolBar(IToolBarManager toolBarManager) {
-		toolBarManager.add(new Separator("gmftool-settings"));
-		toolBarManager.add(new Separator("gmftool-additions"));
-	}
-
-	/**
-	 * This adds to the menu bar a menu and some separators for editor additions,
-	 * as well as the sub-menus for object creation items.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void contributeToMenu(IMenuManager menuManager) {
-		super.contributeToMenu(menuManager);
-
-		IMenuManager submenuManager = new MenuManager(GMFToolEditPlugin.INSTANCE.getString("_UI_GMFToolEditor_menu"), "org.eclipse.papyrus.gmf.tooldefMenuID");
-		menuManager.insertAfter("additions", submenuManager);
-		submenuManager.add(new Separator("settings"));
-		submenuManager.add(new Separator("actions"));
-		submenuManager.add(new Separator("additions"));
-		submenuManager.add(new Separator("additions-end"));
-
-		// Prepare for CreateChild item addition or removal.
-		//
-		createChildMenuManager = new MenuManager(GMFToolEditPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		submenuManager.insertBefore("additions", createChildMenuManager);
-
-		// Prepare for CreateSibling item addition or removal.
-		//
-		createSiblingMenuManager = new MenuManager(GMFToolEditPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		submenuManager.insertBefore("additions", createSiblingMenuManager);
-
-		// Force an update because Eclipse hides empty menus now.
-		//
-		submenuManager.addMenuListener(new IMenuListener() {
-			public void menuAboutToShow(IMenuManager menuManager) {
-				menuManager.updateAll(true);
-			}
-		});
-
-		addGlobalActions(submenuManager);
-	}
-
-	/**
-	 * When the active editor changes, this remembers the change and registers with it as a selection provider.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setActiveEditor(IEditorPart part) {
-		super.setActiveEditor(part);
-		activeEditorPart = part;
-
-		// Switch to the new selection provider.
-		//
-		if (selectionProvider != null) {
-			selectionProvider.removeSelectionChangedListener(this);
-		}
-		if (part == null) {
-			selectionProvider = null;
-		} else {
-			selectionProvider = part.getSite().getSelectionProvider();
-			selectionProvider.addSelectionChangedListener(this);
-
-			// Fake a selection changed event to update the menus.
-			//
-			if (selectionProvider.getSelection() != null) {
-				selectionChanged(new SelectionChangedEvent(selectionProvider, selectionProvider.getSelection()));
-			}
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionChangedListener},
-	 * handling {@link org.eclipse.jface.viewers.SelectionChangedEvent}s by querying for the children and siblings
-	 * that can be added to the selected object and updating the menus accordingly.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void selectionChanged(SelectionChangedEvent event) {
-		// Remove any menu items for old selection.
-		//
-		if (createChildMenuManager != null) {
-			depopulateManager(createChildMenuManager, createChildActions);
-		}
-		if (createSiblingMenuManager != null) {
-			depopulateManager(createSiblingMenuManager, createSiblingActions);
-		}
-
-		// Query the new selection for appropriate new child/sibling descriptors
-		//
-		Collection<?> newChildDescriptors = null;
-		Collection<?> newSiblingDescriptors = null;
-
-		ISelection selection = event.getSelection();
-		if (selection instanceof IStructuredSelection && ((IStructuredSelection) selection).size() == 1) {
-			Object object = ((IStructuredSelection) selection).getFirstElement();
-
-			EditingDomain domain = ((IEditingDomainProvider) activeEditorPart).getEditingDomain();
-
-			newChildDescriptors = domain.getNewChildDescriptors(object, null);
-			newSiblingDescriptors = domain.getNewChildDescriptors(null, object);
-		}
-
-		// Generate actions for selection; populate and redraw the menus.
-		//
-		createChildActions = generateCreateChildActions(newChildDescriptors, selection);
-		createSiblingActions = generateCreateSiblingActions(newSiblingDescriptors, selection);
-
-		if (createChildMenuManager != null) {
-			populateManager(createChildMenuManager, createChildActions, null);
-			createChildMenuManager.update(true);
-		}
-		if (createSiblingMenuManager != null) {
-			populateManager(createSiblingMenuManager, createSiblingActions, null);
-			createSiblingMenuManager.update(true);
-		}
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateChildAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateChildAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This generates a {@link org.eclipse.emf.edit.ui.action.CreateSiblingAction} for each object in <code>descriptors</code>,
-	 * and returns the collection of these actions.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
-		Collection<IAction> actions = new ArrayList<IAction>();
-		if (descriptors != null) {
-			for (Object descriptor : descriptors) {
-				actions.add(new CreateSiblingAction(activeEditorPart, selection, descriptor));
-			}
-		}
-		return actions;
-	}
-
-	/**
-	 * This populates the specified <code>manager</code> with {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection,
-	 * by inserting them before the specified contribution item <code>contributionID</code>.
-	 * If <code>contributionID</code> is <code>null</code>, they are simply added.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void populateManager(IContributionManager manager, Collection<? extends IAction> actions, String contributionID) {
-		if (actions != null) {
-			for (IAction action : actions) {
-				if (contributionID != null) {
-					manager.insertBefore(contributionID, action);
-				} else {
-					manager.add(action);
-				}
-			}
-		}
-	}
-
-	/**
-	 * This removes from the specified <code>manager</code> all {@link org.eclipse.jface.action.ActionContributionItem}s
-	 * based on the {@link org.eclipse.jface.action.IAction}s contained in the <code>actions</code> collection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void depopulateManager(IContributionManager manager, Collection<? extends IAction> actions) {
-		if (actions != null) {
-			IContributionItem[] items = manager.getItems();
-			for (int i = 0; i < items.length; i++) {
-				// Look into SubContributionItems
-				//
-				IContributionItem contributionItem = items[i];
-				while (contributionItem instanceof SubContributionItem) {
-					contributionItem = ((SubContributionItem) contributionItem).getInnerItem();
-				}
-
-				// Delete the ActionContributionItems with matching action.
-				//
-				if (contributionItem instanceof ActionContributionItem) {
-					IAction action = ((ActionContributionItem) contributionItem).getAction();
-					if (actions.contains(action)) {
-						manager.remove(contributionItem);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This populates the pop-up menu before it appears.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void menuAboutToShow(IMenuManager menuManager) {
-		super.menuAboutToShow(menuManager);
-		MenuManager submenuManager = null;
-
-		submenuManager = new MenuManager(GMFToolEditPlugin.INSTANCE.getString("_UI_CreateChild_menu_item"));
-		populateManager(submenuManager, createChildActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-
-		submenuManager = new MenuManager(GMFToolEditPlugin.INSTANCE.getString("_UI_CreateSibling_menu_item"));
-		populateManager(submenuManager, createSiblingActions, null);
-		menuManager.insertBefore("edit", submenuManager);
-	}
-
-	/**
-	 * This inserts global actions before the "additions-end" separator.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void addGlobalActions(IMenuManager menuManager) {
-		menuManager.insertAfter("additions-end", new Separator("ui-actions"));
-		menuManager.insertAfter("ui-actions", showPropertiesViewAction);
-
-		refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
-		menuManager.insertAfter("ui-actions", refreshViewerAction);
-
-		super.addGlobalActions(menuManager);
-	}
-
-	/**
-	 * This ensures that a delete action will clean up all references to deleted objects.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected boolean removeAllReferencesOnDelete() {
-		return true;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolEditor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolEditor.java
deleted file mode 100644
index 010502052a3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolEditor.java
+++ /dev/null
@@ -1,1477 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.presentation;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.EventObject;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IStorage;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.command.BasicCommandStack;
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.command.CommandStackListener;
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.ui.MarkerHelper;
-import org.eclipse.emf.common.ui.ViewerPane;
-import org.eclipse.emf.common.ui.editor.ProblemEditorPart;
-import org.eclipse.emf.common.ui.viewer.IViewerProvider;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EValidator;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.edit.domain.IEditingDomainProvider;
-import org.eclipse.emf.edit.provider.AdapterFactoryItemDelegator;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
-import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.emf.edit.ui.action.EditingDomainActionBarContributor;
-import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
-import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
-import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
-import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
-import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
-import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;
-import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;
-import org.eclipse.jface.action.IMenuListener;
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.jface.action.IStatusLineManager;
-import org.eclipse.jface.action.IToolBarManager;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.action.Separator;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.ISelectionProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.StructuredViewer;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.papyrus.gmf.tooldef.provider.GMFToolEditPlugin;
-import org.eclipse.papyrus.gmf.tooldef.provider.GMFToolItemProviderAdapterFactory;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CTabFolder;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.events.ControlAdapter;
-import org.eclipse.swt.events.ControlEvent;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.IActionBars;
-import org.eclipse.ui.IEditorInput;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.IEditorSite;
-import org.eclipse.ui.IFileEditorInput;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IStorageEditorInput;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.SaveAsDialog;
-import org.eclipse.ui.ide.IGotoMarker;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.MultiPageEditorPart;
-import org.eclipse.ui.views.contentoutline.ContentOutline;
-import org.eclipse.ui.views.contentoutline.ContentOutlinePage;
-import org.eclipse.ui.views.contentoutline.IContentOutlinePage;
-import org.eclipse.ui.views.properties.IPropertySheetPage;
-import org.eclipse.ui.views.properties.PropertySheet;
-import org.eclipse.ui.views.properties.PropertySheetPage;
-
-/**
- * This is an example of a GMFTool model editor.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFToolEditor extends MultiPageEditorPart implements IEditingDomainProvider, ISelectionProvider, IMenuListener, IViewerProvider, IGotoMarker {
-	/**
-	 * This keeps track of the editing domain that is used to track all changes to the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AdapterFactoryEditingDomain editingDomain;
-
-	/**
-	 * This is the one adapter factory used for providing views of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory adapterFactory;
-
-	/**
-	 * This is the content outline page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IContentOutlinePage contentOutlinePage;
-
-	/**
-	 * This is a kludge...
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IStatusLineManager contentOutlineStatusLineManager;
-
-	/**
-	 * This is the content outline page's viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TreeViewer contentOutlineViewer;
-
-	/**
-	 * This is the property sheet page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PropertySheetPage propertySheetPage;
-
-	/**
-	 * This is the viewer that shadows the selection in the content outline.
-	 * The parent relation must be correctly defined for this to work.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TreeViewer selectionViewer;
-
-	/**
-	 * This keeps track of the active viewer pane, in the book.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ViewerPane currentViewerPane;
-
-	/**
-	 * This keeps track of the active content viewer, which may be either one of the viewers in the pages or the content outline viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Viewer currentViewer;
-
-	/**
-	 * This listens to which ever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelectionChangedListener selectionChangedListener;
-
-	/**
-	 * This keeps track of all the {@link org.eclipse.jface.viewers.ISelectionChangedListener}s that are listening to this editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<ISelectionChangedListener> selectionChangedListeners = new ArrayList<ISelectionChangedListener>();
-
-	/**
-	 * This keeps track of the selection of the editor as a whole.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ISelection editorSelection = StructuredSelection.EMPTY;
-
-	/**
-	 * The MarkerHelper is responsible for creating workspace resource markers presented
-	 * in Eclipse's Problems View.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MarkerHelper markerHelper = new EditUIMarkerHelper();
-
-	/**
-	 * This listens for when the outline becomes active
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IPartListener partListener = new IPartListener() {
-		public void partActivated(IWorkbenchPart p) {
-			if (p instanceof ContentOutline) {
-				if (((ContentOutline) p).getCurrentPage() == contentOutlinePage) {
-					getActionBarContributor().setActiveEditor(GMFToolEditor.this);
-
-					setCurrentViewer(contentOutlineViewer);
-				}
-			} else if (p instanceof PropertySheet) {
-				if (((PropertySheet) p).getCurrentPage() == propertySheetPage) {
-					getActionBarContributor().setActiveEditor(GMFToolEditor.this);
-					handleActivate();
-				}
-			} else if (p == GMFToolEditor.this) {
-				handleActivate();
-			}
-		}
-
-		public void partBroughtToTop(IWorkbenchPart p) {
-			// Ignore.
-		}
-
-		public void partClosed(IWorkbenchPart p) {
-			// Ignore.
-		}
-
-		public void partDeactivated(IWorkbenchPart p) {
-			// Ignore.
-		}
-
-		public void partOpened(IWorkbenchPart p) {
-			// Ignore.
-		}
-	};
-
-	/**
-	 * Resources that have been removed since last activation.
-	 * @generated
-	 */
-	protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been changed since last activation.
-	 * @generated
-	 */
-	protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-	/**
-	 * Resources that have been saved.
-	 * @generated
-	 */
-	protected Collection<Resource> savedResources = new ArrayList<Resource>();
-
-	/**
-	 * Map to store the diagnostic associated with a resource.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Map<Resource, Diagnostic> resourceToDiagnosticMap = new LinkedHashMap<Resource, Diagnostic>();
-
-	/**
-	 * Controls whether the problem indication should be updated.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean updateProblemIndication = true;
-
-	/**
-	 * Adapter used to update the problem indication when resources are demanded loaded.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EContentAdapter problemIndicationAdapter = new EContentAdapter() {
-		@Override
-		public void notifyChanged(Notification notification) {
-			if (notification.getNotifier() instanceof Resource) {
-				switch (notification.getFeatureID(Resource.class)) {
-				case Resource.RESOURCE__IS_LOADED:
-				case Resource.RESOURCE__ERRORS:
-				case Resource.RESOURCE__WARNINGS: {
-					Resource resource = (Resource) notification.getNotifier();
-					Diagnostic diagnostic = analyzeResourceProblems(resource, null);
-					if (diagnostic.getSeverity() != Diagnostic.OK) {
-						resourceToDiagnosticMap.put(resource, diagnostic);
-					} else {
-						resourceToDiagnosticMap.remove(resource);
-					}
-
-					if (updateProblemIndication) {
-						getSite().getShell().getDisplay().asyncExec(new Runnable() {
-							public void run() {
-								updateProblemIndication();
-							}
-						});
-					}
-					break;
-				}
-				}
-			} else {
-				super.notifyChanged(notification);
-			}
-		}
-
-		@Override
-		protected void setTarget(Resource target) {
-			basicSetTarget(target);
-		}
-
-		@Override
-		protected void unsetTarget(Resource target) {
-			basicUnsetTarget(target);
-		}
-	};
-
-	/**
-	 * This listens for workspace changes.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IResourceChangeListener resourceChangeListener = new IResourceChangeListener() {
-		public void resourceChanged(IResourceChangeEvent event) {
-			// Only listening to these.
-			// if (event.getType() == IResourceDelta.POST_CHANGE)
-			{
-				IResourceDelta delta = event.getDelta();
-				try {
-					class ResourceDeltaVisitor implements IResourceDeltaVisitor {
-						protected ResourceSet resourceSet = editingDomain.getResourceSet();
-
-						protected Collection<Resource> changedResources = new ArrayList<Resource>();
-
-						protected Collection<Resource> removedResources = new ArrayList<Resource>();
-
-						public boolean visit(IResourceDelta delta) {
-							if (delta.getFlags() != IResourceDelta.MARKERS && delta.getResource().getType() == IResource.FILE) {
-								if ((delta.getKind() & (IResourceDelta.CHANGED | IResourceDelta.REMOVED)) != 0) {
-									Resource resource = resourceSet.getResource(URI.createURI(delta.getFullPath().toString()), false);
-									if (resource != null) {
-										if ((delta.getKind() & IResourceDelta.REMOVED) != 0) {
-											removedResources.add(resource);
-										} else if (!savedResources.remove(resource)) {
-											changedResources.add(resource);
-										}
-									}
-								}
-							}
-
-							return true;
-						}
-
-						public Collection<Resource> getChangedResources() {
-							return changedResources;
-						}
-
-						public Collection<Resource> getRemovedResources() {
-							return removedResources;
-						}
-					}
-
-					ResourceDeltaVisitor visitor = new ResourceDeltaVisitor();
-					delta.accept(visitor);
-
-					if (!visitor.getRemovedResources().isEmpty()) {
-						removedResources.addAll(visitor.getRemovedResources());
-						if (!isDirty()) {
-							getSite().getShell().getDisplay().asyncExec(new Runnable() {
-								public void run() {
-									getSite().getPage().closeEditor(GMFToolEditor.this, false);
-								}
-							});
-						}
-					}
-
-					if (!visitor.getChangedResources().isEmpty()) {
-						changedResources.addAll(visitor.getChangedResources());
-						if (getSite().getPage().getActiveEditor() == GMFToolEditor.this) {
-							getSite().getShell().getDisplay().asyncExec(new Runnable() {
-								public void run() {
-									handleActivate();
-								}
-							});
-						}
-					}
-				} catch (CoreException exception) {
-					GMFToolEditPlugin.INSTANCE.log(exception);
-				}
-			}
-		}
-	};
-
-	/**
-	 * Handles activation of the editor or it's associated views.
-	 * @generated
-	 */
-	protected void handleActivate() {
-		// Recompute the read only state.
-		//
-		if (editingDomain.getResourceToReadOnlyMap() != null) {
-			editingDomain.getResourceToReadOnlyMap().clear();
-
-			// Refresh any actions that may become enabled or disabled.
-			//
-			setSelection(getSelection());
-		}
-
-		if (!removedResources.isEmpty()) {
-			if (handleDirtyConflict()) {
-				getSite().getPage().closeEditor(GMFToolEditor.this, false);
-			} else {
-				removedResources.clear();
-				changedResources.clear();
-				savedResources.clear();
-			}
-		} else if (!changedResources.isEmpty()) {
-			changedResources.removeAll(savedResources);
-			handleChangedResources();
-			changedResources.clear();
-			savedResources.clear();
-		}
-	}
-
-	/**
-	 * Handles what to do with changed resources on activation.
-	 * @generated
-	 */
-	protected void handleChangedResources() {
-		if (!changedResources.isEmpty() && (!isDirty() || handleDirtyConflict())) {
-			editingDomain.getCommandStack().flush();
-
-			updateProblemIndication = false;
-			for (Resource resource : changedResources) {
-				if (resource.isLoaded()) {
-					resource.unload();
-					try {
-						resource.load(Collections.EMPTY_MAP);
-					} catch (IOException exception) {
-						if (!resourceToDiagnosticMap.containsKey(resource)) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-					}
-				}
-			}
-			updateProblemIndication = true;
-			updateProblemIndication();
-		}
-	}
-
-	/**
-	 * Updates the problems indication with the information described in the specified diagnostic.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void updateProblemIndication() {
-		if (updateProblemIndication) {
-			BasicDiagnostic diagnostic = new BasicDiagnostic(Diagnostic.OK, "org.eclipse.papyrus.gmf.tooldef.edit", 0, null, new Object[] { editingDomain.getResourceSet() });
-			for (Diagnostic childDiagnostic : resourceToDiagnosticMap.values()) {
-				if (childDiagnostic.getSeverity() != Diagnostic.OK) {
-					diagnostic.add(childDiagnostic);
-				}
-			}
-
-			int lastEditorPage = getPageCount() - 1;
-			if (lastEditorPage >= 0 && getEditor(lastEditorPage) instanceof ProblemEditorPart) {
-				((ProblemEditorPart) getEditor(lastEditorPage)).setDiagnostic(diagnostic);
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					setActivePage(lastEditorPage);
-				}
-			} else if (diagnostic.getSeverity() != Diagnostic.OK) {
-				ProblemEditorPart problemEditorPart = new ProblemEditorPart();
-				problemEditorPart.setDiagnostic(diagnostic);
-				problemEditorPart.setMarkerHelper(markerHelper);
-				try {
-					addPage(++lastEditorPage, problemEditorPart, getEditorInput());
-					setPageText(lastEditorPage, problemEditorPart.getPartName());
-					setActivePage(lastEditorPage);
-					showTabs();
-				} catch (PartInitException exception) {
-					GMFToolEditPlugin.INSTANCE.log(exception);
-				}
-			}
-
-			if (markerHelper.hasMarkers(editingDomain.getResourceSet())) {
-				markerHelper.deleteMarkers(editingDomain.getResourceSet());
-				if (diagnostic.getSeverity() != Diagnostic.OK) {
-					try {
-						markerHelper.createMarkers(diagnostic);
-					} catch (CoreException exception) {
-						GMFToolEditPlugin.INSTANCE.log(exception);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * Shows a dialog that asks if conflicting changes should be discarded.
-	 * @generated
-	 */
-	protected boolean handleDirtyConflict() {
-		return MessageDialog.openQuestion(getSite().getShell(), getString("_UI_FileConflict_label"), getString("_WARN_FileConflict"));
-	}
-
-	/**
-	 * This creates a model editor.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolEditor() {
-		super();
-
-		// Create an adapter factory that yields item providers.
-		//
-		List<AdapterFactory> factories = new ArrayList<AdapterFactory>();
-		factories.add(new ResourceItemProviderAdapterFactory());
-		factories.add(new GMFToolItemProviderAdapterFactory());
-		factories.add(new ReflectiveItemProviderAdapterFactory());
-
-		adapterFactory = new ComposedAdapterFactory(factories);
-
-		// Create the command stack that will notify this editor as commands are executed.
-		//
-		BasicCommandStack commandStack = new BasicCommandStack();
-
-		// Add a listener to set the most recent command's affected objects to be the selection of the viewer with focus.
-		//
-		commandStack.addCommandStackListener(new CommandStackListener() {
-			public void commandStackChanged(final EventObject event) {
-				getContainer().getDisplay().asyncExec(new Runnable() {
-					public void run() {
-						firePropertyChange(IEditorPart.PROP_DIRTY);
-
-						// Try to select the affected objects.
-						//
-						Command mostRecentCommand = ((CommandStack) event.getSource()).getMostRecentCommand();
-						if (mostRecentCommand != null) {
-							setSelectionToViewer(mostRecentCommand.getAffectedObjects());
-						}
-						if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {
-							propertySheetPage.refresh();
-						}
-					}
-				});
-			}
-		});
-
-		// Create the editing domain with a special command stack.
-		//
-		editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, new HashMap<Resource, Boolean>());
-	}
-
-	/**
-	 * This is here for the listener to be able to call it.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void firePropertyChange(int action) {
-		super.firePropertyChange(action);
-	}
-
-	/**
-	 * This sets the selection into whichever viewer is active.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSelectionToViewer(Collection<?> collection) {
-		final Collection<?> theSelection = collection;
-		// Make sure it's okay.
-		//
-		if (theSelection != null && !theSelection.isEmpty()) {
-			// I don't know if this should be run this deferred
-			// because we might have to give the editor a chance to process the viewer update events
-			// and hence to update the views first.
-			//
-			//
-			Runnable runnable = new Runnable() {
-				public void run() {
-					// Try to select the items in the current content viewer of the editor.
-					//
-					if (currentViewer != null) {
-						currentViewer.setSelection(new StructuredSelection(theSelection.toArray()), true);
-					}
-				}
-			};
-			runnable.run();
-		}
-	}
-
-	/**
-	 * This returns the editing domain as required by the {@link IEditingDomainProvider} interface.
-	 * This is important for implementing the static methods of {@link AdapterFactoryEditingDomain}
-	 * and for supporting {@link org.eclipse.emf.edit.ui.action.CommandAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EditingDomain getEditingDomain() {
-		return editingDomain;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public class ReverseAdapterFactoryContentProvider extends AdapterFactoryContentProvider {
-		public ReverseAdapterFactoryContentProvider(AdapterFactory adapterFactory) {
-			super(adapterFactory);
-		}
-
-		public Object[] getElements(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		public Object[] getChildren(Object object) {
-			Object parent = super.getParent(object);
-			return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
-		}
-
-		public boolean hasChildren(Object object) {
-			Object parent = super.getParent(object);
-			return parent != null;
-		}
-
-		public Object getParent(Object object) {
-			return null;
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrentViewerPane(ViewerPane viewerPane) {
-		if (currentViewerPane != viewerPane) {
-			if (currentViewerPane != null) {
-				currentViewerPane.showFocus(false);
-			}
-			currentViewerPane = viewerPane;
-		}
-		setCurrentViewer(currentViewerPane.getViewer());
-	}
-
-	/**
-	 * This makes sure that one content viewer, either for the current page or the outline view, if it has focus,
-	 * is the current one.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCurrentViewer(Viewer viewer) {
-		// If it is changing...
-		//
-		if (currentViewer != viewer) {
-			if (selectionChangedListener == null) {
-				// Create the listener on demand.
-				//
-				selectionChangedListener = new ISelectionChangedListener() {
-					// This just notifies those things that are affected by the section.
-					//
-					public void selectionChanged(SelectionChangedEvent selectionChangedEvent) {
-						setSelection(selectionChangedEvent.getSelection());
-					}
-				};
-			}
-
-			// Stop listening to the old one.
-			//
-			if (currentViewer != null) {
-				currentViewer.removeSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Start listening to the new one.
-			//
-			if (viewer != null) {
-				viewer.addSelectionChangedListener(selectionChangedListener);
-			}
-
-			// Remember it.
-			//
-			currentViewer = viewer;
-
-			// Set the editors selection based on the current viewer's selection.
-			//
-			setSelection(currentViewer == null ? StructuredSelection.EMPTY : currentViewer.getSelection());
-		}
-	}
-
-	/**
-	 * This returns the viewer as required by the {@link IViewerProvider} interface.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Viewer getViewer() {
-		return currentViewer;
-	}
-
-	/**
-	 * This creates a context menu for the viewer and adds a listener as well registering the menu for extension.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createContextMenuFor(StructuredViewer viewer) {
-		MenuManager contextMenu = new MenuManager("#PopUp");
-		contextMenu.add(new Separator("additions"));
-		contextMenu.setRemoveAllWhenShown(true);
-		contextMenu.addMenuListener(this);
-		Menu menu = contextMenu.createContextMenu(viewer.getControl());
-		viewer.getControl().setMenu(menu);
-		getSite().registerContextMenu(contextMenu, viewer);
-
-		int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
-		Transfer[] transfers = new Transfer[] { LocalTransfer.getInstance() };
-		viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
-		viewer.addDropSupport(dndOperations, transfers, new EditingDomainViewerDropAdapter(editingDomain, viewer));
-	}
-
-	public void createModel() {
-		if (getEditorInput() instanceof IFileEditorInput) {
-			createModelGen();
-		} else {
-			Exception exception = null;
-			Resource resource = null;
-			IStorageEditorInput storageEditorInput = (IStorageEditorInput) getEditorInput();
-			try {
-				IStorage storage = storageEditorInput.getStorage();
-				resource = editingDomain.createResource("*.gmftool");
-				resource.setURI(URI.createURI(storage.getFullPath().toString()));
-				resource.load(storage.getContents(), null);
-			} catch (Exception e) {
-				exception = e;
-			}
-
-			Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-			if (diagnostic.getSeverity() != Diagnostic.OK) {
-				resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-			}
-			editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-		}
-	}
-
-	/**
-	 * This is the method called to load a resource into the editing domain's resource set based on the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createModelGen() {
-		// Assumes that the input is a file object.
-		//
-		IFileEditorInput modelFile = (IFileEditorInput) getEditorInput();
-		URI resourceURI = URI.createPlatformResourceURI(modelFile.getFile().getFullPath().toString(), true);
-		Exception exception = null;
-		Resource resource = null;
-		try {
-			// Load the resource through the editing domain.
-			//
-			resource = editingDomain.getResourceSet().getResource(resourceURI, true);
-		} catch (Exception e) {
-			exception = e;
-			resource = editingDomain.getResourceSet().getResource(resourceURI, false);
-		}
-
-		Diagnostic diagnostic = analyzeResourceProblems(resource, exception);
-		if (diagnostic.getSeverity() != Diagnostic.OK) {
-			resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-		}
-		editingDomain.getResourceSet().eAdapters().add(problemIndicationAdapter);
-	}
-
-	/**
-	 * Returns a dignostic describing the errors and warnings listed in the resource
-	 * and the specified exception (if any).
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Diagnostic analyzeResourceProblems(Resource resource, Exception exception) {
-		if (!resource.getErrors().isEmpty() || !resource.getWarnings().isEmpty()) {
-			BasicDiagnostic basicDiagnostic = new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.gmf.tooldef.edit", 0, getString("_UI_CreateModelError_message", resource.getURI()),
-					new Object[] { exception == null ? (Object) resource : exception });
-			basicDiagnostic.merge(EcoreUtil.computeDiagnostic(resource, true));
-			return basicDiagnostic;
-		} else if (exception != null) {
-			return new BasicDiagnostic(Diagnostic.ERROR, "org.eclipse.papyrus.gmf.tooldef.edit", 0, getString("_UI_CreateModelError_message", resource.getURI()), new Object[] { exception });
-		} else {
-			return Diagnostic.OK_INSTANCE;
-		}
-	}
-
-	/**
-	 * This is the method used by the framework to install your own controls.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void createPages() {
-		// Creates the model from the editor input
-		//
-		createModel();
-
-		// Only creates the other pages if there is something that can be edited
-		//
-		if (!getEditingDomain().getResourceSet().getResources().isEmpty() && !(getEditingDomain().getResourceSet().getResources().get(0)).getContents().isEmpty()) {
-			// Create a page for the selection tree view.
-			//
-			{
-				ViewerPane viewerPane = new ViewerPane(getSite().getPage(), GMFToolEditor.this) {
-					@Override
-					public Viewer createViewer(Composite composite) {
-						Tree tree = new Tree(composite, SWT.MULTI);
-						TreeViewer newTreeViewer = new TreeViewer(tree);
-						return newTreeViewer;
-					}
-
-					@Override
-					public void requestActivation() {
-						super.requestActivation();
-						setCurrentViewerPane(this);
-					}
-				};
-				viewerPane.createControl(getContainer());
-
-				selectionViewer = (TreeViewer) viewerPane.getViewer();
-				selectionViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-
-				selectionViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-				selectionViewer.setInput(editingDomain.getResourceSet());
-				selectionViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-				viewerPane.setTitle(editingDomain.getResourceSet());
-
-				new AdapterFactoryTreeEditor(selectionViewer.getTree(), adapterFactory);
-
-				createContextMenuFor(selectionViewer);
-				int pageIndex = addPage(viewerPane.getControl());
-				setPageText(pageIndex, getString("_UI_SelectionPage_label"));
-			}
-
-			
-			setActivePage(0);
-		}
-
-		// Ensures that this editor will only display the page's tab
-		// area if there are more than one page
-		//
-		getContainer().addControlListener(new ControlAdapter() {
-			boolean guard = false;
-
-			@Override
-			public void controlResized(ControlEvent event) {
-				if (!guard) {
-					guard = true;
-					hideTabs();
-					guard = false;
-				}
-			}
-		});
-
-		updateProblemIndication();
-	}
-
-	/**
-	 * If there is just one page in the multi-page editor part,
-	 * this hides the single tab at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void hideTabs() {
-		if (getPageCount() <= 1) {
-			setPageText(0, "");
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder) getContainer()).setTabHeight(1);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y + 6);
-			}
-		}
-	}
-
-	/**
-	 * If there is more than one page in the multi-page editor part,
-	 * this shows the tabs at the bottom.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void showTabs() {
-		if (getPageCount() > 1) {
-			setPageText(0, getString("_UI_SelectionPage_label"));
-			if (getContainer() instanceof CTabFolder) {
-				((CTabFolder) getContainer()).setTabHeight(SWT.DEFAULT);
-				Point point = getContainer().getSize();
-				getContainer().setSize(point.x, point.y - 6);
-			}
-		}
-	}
-
-	/**
-	 * This is used to track the active viewer.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void pageChange(int pageIndex) {
-		super.pageChange(pageIndex);
-
-		if (contentOutlinePage != null) {
-			handleContentOutlineSelection(contentOutlinePage.getSelection());
-		}
-	}
-
-	/**
-	 * This is how the framework determines which interfaces we implement.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public Object getAdapter(Class key) {
-		if (key.equals(IContentOutlinePage.class)) {
-			return showOutlineView() ? getContentOutlinePage() : null;
-		} else if (key.equals(IPropertySheetPage.class)) {
-			return getPropertySheetPage();
-		} else if (key.equals(IGotoMarker.class)) {
-			return this;
-		} else {
-			return super.getAdapter(key);
-		}
-	}
-
-	/**
-	 * This accesses a cached version of the content outliner.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IContentOutlinePage getContentOutlinePage() {
-		if (contentOutlinePage == null) {
-			// The content outline is just a tree.
-			//
-			class MyContentOutlinePage extends ContentOutlinePage {
-				@Override
-				public void createControl(Composite parent) {
-					super.createControl(parent);
-					contentOutlineViewer = getTreeViewer();
-					contentOutlineViewer.addSelectionChangedListener(this);
-
-					// Set up the tree viewer.
-					//
-					contentOutlineViewer.setContentProvider(new AdapterFactoryContentProvider(adapterFactory));
-					contentOutlineViewer.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));
-					contentOutlineViewer.setInput(editingDomain.getResourceSet());
-
-					// Make sure our popups work.
-					//
-					createContextMenuFor(contentOutlineViewer);
-
-					if (!editingDomain.getResourceSet().getResources().isEmpty()) {
-						// Select the root object in the view.
-						//
-						contentOutlineViewer.setSelection(new StructuredSelection(editingDomain.getResourceSet().getResources().get(0)), true);
-					}
-				}
-
-				@Override
-				public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
-					super.makeContributions(menuManager, toolBarManager, statusLineManager);
-					contentOutlineStatusLineManager = statusLineManager;
-				}
-
-				@Override
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			}
-
-			contentOutlinePage = new MyContentOutlinePage();
-
-			// Listen to selection so that we can handle it is a special way.
-			//
-			contentOutlinePage.addSelectionChangedListener(new ISelectionChangedListener() {
-				// This ensures that we handle selections correctly.
-				//
-				public void selectionChanged(SelectionChangedEvent event) {
-					handleContentOutlineSelection(event.getSelection());
-				}
-			});
-		}
-
-		return contentOutlinePage;
-	}
-
-	/**
-	 * This accesses a cached version of the property sheet.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IPropertySheetPage getPropertySheetPage() {
-		if (propertySheetPage == null) {
-			propertySheetPage = new ExtendedPropertySheetPage(editingDomain) {
-				@Override
-				public void setSelectionToViewer(List<?> selection) {
-					GMFToolEditor.this.setSelectionToViewer(selection);
-					GMFToolEditor.this.setFocus();
-				}
-
-				@Override
-				public void setActionBars(IActionBars actionBars) {
-					super.setActionBars(actionBars);
-					getActionBarContributor().shareGlobalActions(this, actionBars);
-				}
-			};
-			propertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));
-		}
-
-		return propertySheetPage;
-	}
-
-	/**
-	 * This deals with how we want selection in the outliner to affect the other views.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void handleContentOutlineSelection(ISelection selection) {
-		if (currentViewerPane != null && !selection.isEmpty() && selection instanceof IStructuredSelection) {
-			Iterator<?> selectedElements = ((IStructuredSelection) selection).iterator();
-			if (selectedElements.hasNext()) {
-				// Get the first selected element.
-				//
-				Object selectedElement = selectedElements.next();
-
-				// If it's the selection viewer, then we want it to select the same selection as this selection.
-				//
-				if (currentViewerPane.getViewer() == selectionViewer) {
-					ArrayList<Object> selectionList = new ArrayList<Object>();
-					selectionList.add(selectedElement);
-					while (selectedElements.hasNext()) {
-						selectionList.add(selectedElements.next());
-					}
-
-					// Set the selection to the widget.
-					//
-					selectionViewer.setSelection(new StructuredSelection(selectionList));
-				} else {
-					// Set the input to the widget.
-					//
-					if (currentViewerPane.getViewer().getInput() != selectedElement) {
-						currentViewerPane.getViewer().setInput(selectedElement);
-						currentViewerPane.setTitle(selectedElement);
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply tests the command stack.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isDirty() {
-		return ((BasicCommandStack) editingDomain.getCommandStack()).isSaveNeeded();
-	}
-
-	/**
-	 * This is for implementing {@link IEditorPart} and simply saves the model file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void doSave(IProgressMonitor progressMonitor) {
-		// Do the work within an operation because this is a long running activity that modifies the workbench.
-		//
-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-			// This is the method that gets invoked when the operation runs.
-			//
-			@Override
-			public void execute(IProgressMonitor monitor) {
-				// Save the resources to the file system.
-				//
-				boolean first = true;
-				for (Resource resource : editingDomain.getResourceSet().getResources()) {
-					if ((first || !resource.getContents().isEmpty() || isPersisted(resource)) && !editingDomain.isReadOnly(resource)) {
-						try {
-							savedResources.add(resource);
-							resource.save(Collections.EMPTY_MAP);
-						} catch (Exception exception) {
-							resourceToDiagnosticMap.put(resource, analyzeResourceProblems(resource, exception));
-						}
-						first = false;
-					}
-				}
-			}
-		};
-
-		updateProblemIndication = false;
-		try {
-			// This runs the options, and shows progress.
-			//
-			new ProgressMonitorDialog(getSite().getShell()).run(true, false, operation);
-
-			// Refresh the necessary state.
-			//
-			((BasicCommandStack) editingDomain.getCommandStack()).saveIsDone();
-			firePropertyChange(IEditorPart.PROP_DIRTY);
-		} catch (Exception exception) {
-			// Something went wrong that shouldn't.
-			//
-			GMFToolEditPlugin.INSTANCE.log(exception);
-		}
-		updateProblemIndication = true;
-		updateProblemIndication();
-	}
-
-	/**
-	 * This returns wether something has been persisted to the URI of the specified resource.
-	 * The implementation uses the URI converter from the editor's resource set to try to open an input stream. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean isPersisted(Resource resource) {
-		boolean result = false;
-		try {
-			InputStream stream = editingDomain.getResourceSet().getURIConverter().createInputStream(resource.getURI());
-			if (stream != null) {
-				result = true;
-				stream.close();
-			}
-		} catch (IOException e) {
-			// Ignore
-		}
-		return result;
-	}
-
-	/**
-	 * This always returns true because it is not currently supported.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isSaveAsAllowed() {
-		return true;
-	}
-
-	/**
-	 * This also changes the editor's input.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void doSaveAs() {
-		SaveAsDialog saveAsDialog = new SaveAsDialog(getSite().getShell());
-		saveAsDialog.open();
-		IPath path = saveAsDialog.getResult();
-		if (path != null) {
-			IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(path);
-			if (file != null) {
-				doSaveAs(URI.createPlatformResourceURI(file.getFullPath().toString(), true), new FileEditorInput(file));
-			}
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void doSaveAs(URI uri, IEditorInput editorInput) {
-		(editingDomain.getResourceSet().getResources().get(0)).setURI(uri);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		IProgressMonitor progressMonitor = getActionBars().getStatusLineManager() != null ? getActionBars().getStatusLineManager().getProgressMonitor() : new NullProgressMonitor();
-		doSave(progressMonitor);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void gotoMarker(IMarker marker) {
-		try {
-			if (marker.getType().equals(EValidator.MARKER)) {
-				String uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);
-				if (uriAttribute != null) {
-					URI uri = URI.createURI(uriAttribute);
-					EObject eObject = editingDomain.getResourceSet().getEObject(uri, true);
-					if (eObject != null) {
-						setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));
-					}
-				}
-			}
-		} catch (CoreException exception) {
-			GMFToolEditPlugin.INSTANCE.log(exception);
-		}
-	}
-
-	/**
-	 * This is called during startup.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void init(IEditorSite site, IEditorInput editorInput) {
-		setSite(site);
-		setInputWithNotify(editorInput);
-		setPartName(editorInput.getName());
-		site.setSelectionProvider(this);
-		site.getPage().addPartListener(partListener);
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(resourceChangeListener, IResourceChangeEvent.POST_CHANGE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void setFocus() {
-		if (currentViewerPane != null) {
-			currentViewerPane.setFocus();
-		} else {
-			getControl(getActivePage()).setFocus();
-		}
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.add(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeSelectionChangedListener(ISelectionChangedListener listener) {
-		selectionChangedListeners.remove(listener);
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to return this editor's overall selection.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ISelection getSelection() {
-		return editorSelection;
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.viewers.ISelectionProvider} to set this editor's overall selection.
-	 * Calling this result will notify the listeners.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSelection(ISelection selection) {
-		editorSelection = selection;
-
-		for (ISelectionChangedListener listener : selectionChangedListeners) {
-			listener.selectionChanged(new SelectionChangedEvent(this, selection));
-		}
-		setStatusLineManager(selection);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStatusLineManager(ISelection selection) {
-		IStatusLineManager statusLineManager = currentViewer != null && currentViewer == contentOutlineViewer ? contentOutlineStatusLineManager : getActionBars().getStatusLineManager();
-
-		if (statusLineManager != null) {
-			if (selection instanceof IStructuredSelection) {
-				Collection<?> collection = ((IStructuredSelection) selection).toList();
-				switch (collection.size()) {
-				case 0: {
-					statusLineManager.setMessage(getString("_UI_NoObjectSelected"));
-					break;
-				}
-				case 1: {
-					String text = new AdapterFactoryItemDelegator(adapterFactory).getText(collection.iterator().next());
-					statusLineManager.setMessage(getString("_UI_SingleObjectSelected", text));
-					break;
-				}
-				default: {
-					statusLineManager.setMessage(getString("_UI_MultiObjectSelected", Integer.toString(collection.size())));
-					break;
-				}
-				}
-			} else {
-				statusLineManager.setMessage("");
-			}
-		}
-	}
-
-	/**
-	 * This looks up a string in the plugin's plugin.properties file.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static String getString(String key) {
-		return GMFToolEditPlugin.INSTANCE.getString(key);
-	}
-
-	/**
-	 * This looks up a string in plugin.properties, making a substitution.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static String getString(String key, Object s1) {
-		return GMFToolEditPlugin.INSTANCE.getString(key, new Object[] { s1 });
-	}
-
-	/**
-	 * This implements {@link org.eclipse.jface.action.IMenuListener} to help fill the context menus with contributions from the Edit menu.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void menuAboutToShow(IMenuManager menuManager) {
-		((IMenuListener) getEditorSite().getActionBarContributor()).menuAboutToShow(menuManager);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EditingDomainActionBarContributor getActionBarContributor() {
-		return (EditingDomainActionBarContributor) getEditorSite().getActionBarContributor();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IActionBars getActionBars() {
-		return getActionBarContributor().getActionBars();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AdapterFactory getAdapterFactory() {
-		return adapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void dispose() {
-		updateProblemIndication = false;
-
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(resourceChangeListener);
-
-		getSite().getPage().removePartListener(partListener);
-
-		adapterFactory.dispose();
-
-		if (getActionBarContributor().getActiveEditor() == this) {
-			getActionBarContributor().setActiveEditor(null);
-		}
-
-		if (propertySheetPage != null) {
-			propertySheetPage.dispose();
-		}
-
-		if (contentOutlinePage != null) {
-			contentOutlinePage.dispose();
-		}
-
-		super.dispose();
-	}
-
-	/**
-	 * Returns whether the outline view should be presented to the user.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected boolean showOutlineView() {
-		return true;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolModelWizard.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolModelWizard.java
deleted file mode 100644
index 55b91517c60..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/presentation/GMFToolModelWizard.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.presentation;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.ContentHandler;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.XMLResource;
-import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.provider.GMFToolEditPlugin;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.actions.WorkspaceModifyOperation;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.part.FileEditorInput;
-import org.eclipse.ui.part.ISetSelectionTarget;
-
-/**
- * This is a simple wizard for creating a new model file.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated NOT
- */
-public class GMFToolModelWizard extends Wizard implements INewWizard {
-
-	/**
-	 * This is the file creation page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GMFToolModelWizardNewFileCreationPage newFileCreationPage;
-
-	/**
-	 * Remember the selection during initialization for populating the default container.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IStructuredSelection selection;
-
-	/**
-	 * Remember the workbench during initialization.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IWorkbench workbench;
-
-	/**
-	 * This just records the information.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-		this.workbench = workbench;
-		this.selection = selection;
-		setWindowTitle(GMFToolEditPlugin.INSTANCE.getString("_UI_Wizard_label"));
-		setDefaultPageImageDescriptor(ExtendedImageRegistry.INSTANCE.getImageDescriptor(GMFToolEditPlugin.INSTANCE.getImage("full/wizban/NewGMFTool")));
-	}
-
-	/**
-	 * Create a new model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	protected EObject createInitialModel() {
-		return GMFToolPackage.eINSTANCE.getGMFToolFactory().createToolRegistry();
-	}
-
-	/**
-	 * Do the work after everything is specified.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public boolean performFinish() {
-		try {
-			final IFile modelFile = getModelFile();
-			createModelFile(modelFile);
-			return openEditor(modelFile);
-		} catch (Exception exception) {
-			GMFToolEditPlugin.INSTANCE.log(exception);
-			return false;
-		}
-	}
-
-	protected void createModelFile(final IFile modelFile) throws Exception {
-		WorkspaceModifyOperation operation = new WorkspaceModifyOperation() {
-			protected void execute(IProgressMonitor progressMonitor) {
-				try {
-					// Create a resource set
-					//
-					ResourceSet resourceSet = new ResourceSetImpl();
-
-					// Get the URI of the model file.
-					//
-					URI fileURI = URI.createPlatformResourceURI(modelFile.getFullPath().toString(), false);
-
-					// Create a resource for this file.
-					//
-					Resource resource = resourceSet.createResource(fileURI, ContentHandler.UNSPECIFIED_CONTENT_TYPE);
-
-					// Add the initial model object to the contents.
-					//
-					EObject rootObject = createInitialModel();
-					if (rootObject != null) {
-						resource.getContents().add(rootObject);
-					}
-
-					// Save the contents of the resource to the file system.
-					//
-					Map<String, String> options = new HashMap<String, String>();
-					options.put(XMLResource.OPTION_ENCODING, "UTF-8");
-					resource.save(options);
-				} catch (Exception exception) {
-					GMFToolEditPlugin.INSTANCE.log(exception);
-				} finally {
-					progressMonitor.done();
-				}
-			}
-		};
-		getContainer().run(false, false, operation);
-	}
-
-	protected boolean openEditor(IFile modelFile) {
-
-		// Select the new file resource in the current view.
-		//
-		IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-		IWorkbenchPage page = workbenchWindow.getActivePage();
-		final IWorkbenchPart activePart = page.getActivePart();
-		if (activePart instanceof ISetSelectionTarget) {
-			final ISelection targetSelection = new StructuredSelection(modelFile);
-			getShell().getDisplay().asyncExec(new Runnable() {
-				public void run() {
-					((ISetSelectionTarget) activePart).selectReveal(targetSelection);
-				}
-			});
-		}
-
-		// Open an editor on the new file.
-		//
-		try {
-			page.openEditor(new FileEditorInput(modelFile), workbench.getEditorRegistry().getDefaultEditor(modelFile.getFullPath().toString()).getId());
-		} catch (PartInitException exception) {
-			MessageDialog.openError(workbenchWindow.getShell(), GMFToolEditPlugin.INSTANCE.getString("_UI_OpenEditorError_label"), exception.getMessage());
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * This is the one page of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public class GMFToolModelWizardNewFileCreationPage extends WizardNewFileCreationPage {
-		/**
-		 * Pass in the selection.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public GMFToolModelWizardNewFileCreationPage(String pageId, IStructuredSelection selection) {
-			super(pageId, selection);
-		}
-
-		/**
-		 * The framework calls this to see if the file is correct.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		protected boolean validatePage() {
-			if (super.validatePage()) {
-				// Make sure the file ends in ".gmftool".
-				//
-				String requiredExt = GMFToolEditPlugin.INSTANCE.getString("_UI_GMFToolEditorFilenameExtension");
-				String enteredExt = new Path(getFileName()).getFileExtension();
-				if (enteredExt == null || !enteredExt.equals(requiredExt)) {
-					setErrorMessage(GMFToolEditPlugin.INSTANCE.getString("_WARN_FilenameExtension", new Object[] { requiredExt }));
-					return false;
-				} else {
-					return true;
-				}
-			} else {
-				return false;
-			}
-		}
-
-		/**
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public IFile getModelFile() {
-			return ResourcesPlugin.getWorkspace().getRoot().getFile(getContainerFullPath().append(getFileName()));
-		}
-	}
-
-	/**
-	 * The framework calls this to create the contents of the wizard.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public void addPages() {
-		// Create a page, set the title, and the initial model file name.
-		//
-		newFileCreationPage = new GMFToolModelWizardNewFileCreationPage("Whatever", selection);
-		newFileCreationPage.setTitle(GMFToolEditPlugin.INSTANCE.getString("_UI_GMFToolModelWizard_label"));
-		newFileCreationPage.setDescription(GMFToolEditPlugin.INSTANCE.getString("_UI_GMFToolModelWizard_description"));
-		newFileCreationPage
-				.setFileName(GMFToolEditPlugin.INSTANCE.getString("_UI_GMFToolEditorFilenameDefaultBase") + "." + GMFToolEditPlugin.INSTANCE.getString("_UI_GMFToolEditorFilenameExtension"));
-		addPage(newFileCreationPage);
-
-		// Try and get the resource selection to determine a current directory for the file dialog.
-		//
-		if (selection != null && !selection.isEmpty()) {
-			// Get the resource...
-			//
-			Object selectedElement = selection.iterator().next();
-			if (selectedElement instanceof IResource) {
-				// Get the resource parent, if its a file.
-				//
-				IResource selectedResource = (IResource) selectedElement;
-				if (selectedResource.getType() == IResource.FILE) {
-					selectedResource = selectedResource.getParent();
-				}
-
-				// This gives us a directory...
-				//
-				if (selectedResource instanceof IFolder || selectedResource instanceof IProject) {
-					// Set this for the container.
-					//
-					newFileCreationPage.setContainerFullPath(selectedResource.getFullPath());
-
-					// Make up a unique new name here.
-					//
-					String defaultModelBaseFilename = GMFToolEditPlugin.INSTANCE.getString("_UI_GMFToolEditorFilenameDefaultBase");
-					String defaultModelFilenameExtension = GMFToolEditPlugin.INSTANCE.getString("_UI_GMFToolEditorFilenameExtension");
-					String modelFilename = defaultModelBaseFilename + "." + defaultModelFilenameExtension;
-					for (int i = 1; ((IContainer) selectedResource).findMember(modelFilename) != null; ++i) {
-						modelFilename = defaultModelBaseFilename + i + "." + defaultModelFilenameExtension;
-					}
-					newFileCreationPage.setFileName(modelFilename);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Get the file from the page.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public IFile getModelFile() {
-		return newFileCreationPage.getModelFile();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/AbstractToolItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/AbstractToolItemProvider.java
deleted file mode 100644
index 124108270be..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/AbstractToolItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.AbstractTool} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class AbstractToolItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractToolItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTitlePropertyDescriptor(object);
-			addDescriptionPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_AbstractTool_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbstractTool_title_feature", "_UI_AbstractTool_type"),
-				GMFToolPackage.eINSTANCE.getAbstractTool_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Description feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDescriptionPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_AbstractTool_description_feature"), getString("_UI_PropertyDescriptor_description", "_UI_AbstractTool_description_feature", "_UI_AbstractTool_type"),
-				GMFToolPackage.eINSTANCE.getAbstractTool_Description(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon());
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((AbstractTool) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_AbstractTool_type") : getString("_UI_AbstractTool_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(AbstractTool.class)) {
-		case GMFToolPackage.ABSTRACT_TOOL__TITLE:
-		case GMFToolPackage.ABSTRACT_TOOL__DESCRIPTION:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON:
-		case GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon(), GMFToolFactory.eINSTANCE.createDefaultImage()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon(), GMFToolFactory.eINSTANCE.createBundleImage()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon(), GMFToolFactory.eINSTANCE.createDefaultImage()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon(), GMFToolFactory.eINSTANCE.createBundleImage()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon() || childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon();
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/BundleImageItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/BundleImageItemProvider.java
deleted file mode 100644
index 12165570860..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/BundleImageItemProvider.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.BundleImage;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.BundleImage} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class BundleImageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BundleImageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addPathPropertyDescriptor(object);
-			addBundlePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Path feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addPathPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_BundleImage_path_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_BundleImage_path_feature", "_UI_BundleImage_type"), GMFToolPackage.eINSTANCE.getBundleImage_Path(), true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Bundle feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addBundlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_BundleImage_bundle_feature"), getString("_UI_PropertyDescriptor_description", "_UI_BundleImage_bundle_feature", "_UI_BundleImage_type"),
-				GMFToolPackage.eINSTANCE.getBundleImage_Bundle(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns BundleImage.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/BundleImage"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((BundleImage) object).getPath();
-		return label == null || label.length() == 0 ? getString("_UI_BundleImage_type") : getString("_UI_BundleImage_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(BundleImage.class)) {
-		case GMFToolPackage.BUNDLE_IMAGE__PATH:
-		case GMFToolPackage.BUNDLE_IMAGE__BUNDLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ContextMenuItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ContextMenuItemProvider.java
deleted file mode 100644
index 020daeda1ad..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ContextMenuItemProvider.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ContextMenu} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContextMenuItemProvider extends MenuItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextMenuItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDefaultPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Default feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDefaultPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_ContextMenu_default_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ContextMenu_default_feature", "_UI_ContextMenu_type"),
-				GMFToolPackage.eINSTANCE.getContextMenu_Default(), true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns ContextMenu.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ContextMenu"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ContextMenu_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/CreationToolItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/CreationToolItemProvider.java
deleted file mode 100644
index c9f0f49fc6d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/CreationToolItemProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.CreationTool} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class CreationToolItemProvider extends AbstractToolItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CreationToolItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns CreationTool.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/CreationTool"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((CreationTool) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_CreationTool_type") : getString("_UI_CreationTool_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon() || childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon();
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/DefaultImageItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/DefaultImageItemProvider.java
deleted file mode 100644
index 1308883c5dc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/DefaultImageItemProvider.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.DefaultImage} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class DefaultImageItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DefaultImageItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns DefaultImage.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/DefaultImage"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_DefaultImage_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GMFToolEditPlugin.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GMFToolEditPlugin.java
deleted file mode 100644
index a0d0f31c0b7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GMFToolEditPlugin.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import org.eclipse.emf.common.EMFPlugin;
-import org.eclipse.emf.common.ui.EclipseUIPlugin;
-import org.eclipse.emf.common.util.ResourceLocator;
-
-/**
- * This is the central singleton for the GMFTool editor plugin.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public final class GMFToolEditPlugin extends EMFPlugin {
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final GMFToolEditPlugin INSTANCE = new GMFToolEditPlugin();
-
-	/**
-	 * Keep track of the singleton.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static Implementation plugin;
-
-	/**
-	 * Create the instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolEditPlugin() {
-		super(new ResourceLocator[] {});
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getPluginResourceLocator() {
-		return plugin;
-	}
-
-	/**
-	 * Returns the singleton instance of the Eclipse plugin.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the singleton instance.
-	 * @generated
-	 */
-	public static Implementation getPlugin() {
-		return plugin;
-	}
-
-	/**
-	 * The actual implementation of the Eclipse <b>Plugin</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static class Implementation extends EclipseUIPlugin {
-		/**
-		 * Creates an instance.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		public Implementation() {
-			super();
-
-			// Remember the static instance.
-			//
-			plugin = this;
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GMFToolItemProviderAdapterFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GMFToolItemProviderAdapterFactory.java
deleted file mode 100644
index 6b2a91d3c4c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GMFToolItemProviderAdapterFactory.java
+++ /dev/null
@@ -1,667 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.edit.provider.ChangeNotifier;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
-import org.eclipse.emf.edit.provider.IChangeNotifier;
-import org.eclipse.emf.edit.provider.IDisposable;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.INotifyChangedListener;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.tooldef.util.GMFToolAdapterFactory;
-
-/**
- * This is the factory that is used to provide the interfaces needed to support Viewers.
- * The adapters generated by this factory convert EMF adapter notifications into calls to {@link #fireNotifyChanged fireNotifyChanged}.
- * The adapters also support Eclipse property sheets.
- * Note that most of the adapters are shared among multiple instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFToolItemProviderAdapterFactory extends GMFToolAdapterFactory implements ComposeableAdapterFactory, IChangeNotifier, IDisposable {
-
-	/**
-	 * This keeps track of the root adapter factory that delegates to this adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ComposedAdapterFactory parentAdapterFactory;
-
-	/**
-	 * This is used to implement {@link org.eclipse.emf.edit.provider.IChangeNotifier}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected IChangeNotifier changeNotifier = new ChangeNotifier();
-
-	/**
-	 * This keeps track of all the supported types checked by {@link #isFactoryForType isFactoryForType}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected Collection<Object> supportedTypes = new ArrayList<Object>();
-
-	/**
-	 * This constructs an instance.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolItemProviderAdapterFactory() {
-		supportedTypes.add(IEditingDomainItemProvider.class);
-		supportedTypes.add(IStructuredItemContentProvider.class);
-		supportedTypes.add(ITreeItemContentProvider.class);
-		supportedTypes.add(IItemLabelProvider.class);
-		supportedTypes.add(IItemPropertySource.class);
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolRegistryItemProvider toolRegistryItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createToolRegistryAdapter() {
-		if (toolRegistryItemProvider == null) {
-			toolRegistryItemProvider = new ToolRegistryItemProvider(this);
-		}
-
-		return toolRegistryItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.PaletteSeparator} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PaletteSeparatorItemProvider paletteSeparatorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.PaletteSeparator}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPaletteSeparatorAdapter() {
-		if (paletteSeparatorItemProvider == null) {
-			paletteSeparatorItemProvider = new PaletteSeparatorItemProvider(this);
-		}
-
-		return paletteSeparatorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.ToolGroup} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolGroupItemProvider toolGroupItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ToolGroup}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createToolGroupAdapter() {
-		if (toolGroupItemProvider == null) {
-			toolGroupItemProvider = new ToolGroupItemProvider(this);
-		}
-
-		return toolGroupItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.Palette} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PaletteItemProvider paletteItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.Palette}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPaletteAdapter() {
-		if (paletteItemProvider == null) {
-			paletteItemProvider = new PaletteItemProvider(this);
-		}
-
-		return paletteItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.StandardTool} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StandardToolItemProvider standardToolItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.StandardTool}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createStandardToolAdapter() {
-		if (standardToolItemProvider == null) {
-			standardToolItemProvider = new StandardToolItemProvider(this);
-		}
-
-		return standardToolItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.CreationTool} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CreationToolItemProvider creationToolItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.CreationTool}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createCreationToolAdapter() {
-		if (creationToolItemProvider == null) {
-			creationToolItemProvider = new CreationToolItemProvider(this);
-		}
-
-		return creationToolItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.GenericTool} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenericToolItemProvider genericToolItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.GenericTool}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createGenericToolAdapter() {
-		if (genericToolItemProvider == null) {
-			genericToolItemProvider = new GenericToolItemProvider(this);
-		}
-
-		return genericToolItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.Separator} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SeparatorItemProvider separatorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.Separator}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createSeparatorAdapter() {
-		if (separatorItemProvider == null) {
-			separatorItemProvider = new SeparatorItemProvider(this);
-		}
-
-		return separatorItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.PredefinedItem} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredefinedItemItemProvider predefinedItemItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.PredefinedItem}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPredefinedItemAdapter() {
-		if (predefinedItemItemProvider == null) {
-			predefinedItemItemProvider = new PredefinedItemItemProvider(this);
-		}
-
-		return predefinedItemItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.PredefinedMenu} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredefinedMenuItemProvider predefinedMenuItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.PredefinedMenu}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPredefinedMenuAdapter() {
-		if (predefinedMenuItemProvider == null) {
-			predefinedMenuItemProvider = new PredefinedMenuItemProvider(this);
-		}
-
-		return predefinedMenuItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.MenuAction} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MenuActionItemProvider menuActionItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.MenuAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createMenuActionAdapter() {
-		if (menuActionItemProvider == null) {
-			menuActionItemProvider = new MenuActionItemProvider(this);
-		}
-
-		return menuActionItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.ItemRef} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ItemRefItemProvider itemRefItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ItemRef}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createItemRefAdapter() {
-		if (itemRefItemProvider == null) {
-			itemRefItemProvider = new ItemRefItemProvider(this);
-		}
-
-		return itemRefItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.ContextMenu} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContextMenuItemProvider contextMenuItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ContextMenu}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createContextMenuAdapter() {
-		if (contextMenuItemProvider == null) {
-			contextMenuItemProvider = new ContextMenuItemProvider(this);
-		}
-
-		return contextMenuItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.PopupMenu} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PopupMenuItemProvider popupMenuItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.PopupMenu}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createPopupMenuAdapter() {
-		if (popupMenuItemProvider == null) {
-			popupMenuItemProvider = new PopupMenuItemProvider(this);
-		}
-
-		return popupMenuItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.MainMenu} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MainMenuItemProvider mainMenuItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.MainMenu}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createMainMenuAdapter() {
-		if (mainMenuItemProvider == null) {
-			mainMenuItemProvider = new MainMenuItemProvider(this);
-		}
-
-		return mainMenuItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.Toolbar} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolbarItemProvider toolbarItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.Toolbar}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createToolbarAdapter() {
-		if (toolbarItemProvider == null) {
-			toolbarItemProvider = new ToolbarItemProvider(this);
-		}
-
-		return toolbarItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.DefaultImage} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefaultImageItemProvider defaultImageItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.DefaultImage}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createDefaultImageAdapter() {
-		if (defaultImageItemProvider == null) {
-			defaultImageItemProvider = new DefaultImageItemProvider(this);
-		}
-
-		return defaultImageItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.BundleImage} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BundleImageItemProvider bundleImageItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.BundleImage}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createBundleImageAdapter() {
-		if (bundleImageItemProvider == null) {
-			bundleImageItemProvider = new BundleImageItemProvider(this);
-		}
-
-		return bundleImageItemProvider;
-	}
-
-	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector} instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenericStyleSelectorItemProvider genericStyleSelectorItemProvider;
-
-	/**
-	 * This creates an adapter for a {@link org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter createGenericStyleSelectorAdapter() {
-		if (genericStyleSelectorItemProvider == null) {
-			genericStyleSelectorItemProvider = new GenericStyleSelectorItemProvider(this);
-		}
-
-		return genericStyleSelectorItemProvider;
-	}
-
-	/**
-	 * This returns the root adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ComposeableAdapterFactory getRootAdapterFactory() {
-		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
-	}
-
-	/**
-	 * This sets the composed adapter factory that contains this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
-		this.parentAdapterFactory = parentAdapterFactory;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object type) {
-		return supportedTypes.contains(type) || super.isFactoryForType(type);
-	}
-
-	/**
-	 * This implementation substitutes the factory itself as the key for the adapter.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Adapter adapt(Notifier notifier, Object type) {
-		return super.adapt(notifier, this);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object adapt(Object object, Object type) {
-		if (isFactoryForType(type)) {
-			Object adapter = super.adapt(object, type);
-			if (!(type instanceof Class<?>) || (((Class<?>) type).isInstance(adapter))) {
-				return adapter;
-			}
-		}
-
-		return null;
-	}
-
-	/**
-	 * This adds a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void addListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.addListener(notifyChangedListener);
-	}
-
-	/**
-	 * This removes a listener.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void removeListener(INotifyChangedListener notifyChangedListener) {
-		changeNotifier.removeListener(notifyChangedListener);
-	}
-
-	/**
-	 * This delegates to {@link #changeNotifier} and to {@link #parentAdapterFactory}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void fireNotifyChanged(Notification notification) {
-		changeNotifier.fireNotifyChanged(notification);
-
-		if (parentAdapterFactory != null) {
-			parentAdapterFactory.fireNotifyChanged(notification);
-		}
-	}
-
-	/**
-	 * This disposes all of the item providers created by this factory. 
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void dispose() {
-		if (toolRegistryItemProvider != null)
-			toolRegistryItemProvider.dispose();
-		if (paletteSeparatorItemProvider != null)
-			paletteSeparatorItemProvider.dispose();
-		if (toolGroupItemProvider != null)
-			toolGroupItemProvider.dispose();
-		if (paletteItemProvider != null)
-			paletteItemProvider.dispose();
-		if (standardToolItemProvider != null)
-			standardToolItemProvider.dispose();
-		if (creationToolItemProvider != null)
-			creationToolItemProvider.dispose();
-		if (genericToolItemProvider != null)
-			genericToolItemProvider.dispose();
-		if (separatorItemProvider != null)
-			separatorItemProvider.dispose();
-		if (predefinedItemItemProvider != null)
-			predefinedItemItemProvider.dispose();
-		if (predefinedMenuItemProvider != null)
-			predefinedMenuItemProvider.dispose();
-		if (menuActionItemProvider != null)
-			menuActionItemProvider.dispose();
-		if (itemRefItemProvider != null)
-			itemRefItemProvider.dispose();
-		if (contextMenuItemProvider != null)
-			contextMenuItemProvider.dispose();
-		if (popupMenuItemProvider != null)
-			popupMenuItemProvider.dispose();
-		if (mainMenuItemProvider != null)
-			mainMenuItemProvider.dispose();
-		if (toolbarItemProvider != null)
-			toolbarItemProvider.dispose();
-		if (defaultImageItemProvider != null)
-			defaultImageItemProvider.dispose();
-		if (bundleImageItemProvider != null)
-			bundleImageItemProvider.dispose();
-		if (genericStyleSelectorItemProvider != null)
-			genericStyleSelectorItemProvider.dispose();
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GenericStyleSelectorItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GenericStyleSelectorItemProvider.java
deleted file mode 100644
index c7ea327b308..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GenericStyleSelectorItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GenericStyleSelectorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenericStyleSelectorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addValuesPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Values feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addValuesPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_GenericStyleSelector_values_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GenericStyleSelector_values_feature", "_UI_GenericStyleSelector_type"),
-				GMFToolPackage.eINSTANCE.getGenericStyleSelector_Values(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns GenericStyleSelector.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/GenericStyleSelector"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_GenericStyleSelector_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GenericStyleSelector.class)) {
-		case GMFToolPackage.GENERIC_STYLE_SELECTOR__VALUES:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GenericToolItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GenericToolItemProvider.java
deleted file mode 100644
index b72cab54580..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/GenericToolItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.GenericTool} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class GenericToolItemProvider extends AbstractToolItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenericToolItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addToolClassPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Tool Class feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addToolClassPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_GenericTool_toolClass_feature"), getString("_UI_PropertyDescriptor_description", "_UI_GenericTool_toolClass_feature", "_UI_GenericTool_type"),
-				GMFToolPackage.eINSTANCE.getGenericTool_ToolClass(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns GenericTool.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/GenericTool"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((GenericTool) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_GenericTool_type") : getString("_UI_GenericTool_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(GenericTool.class)) {
-		case GMFToolPackage.GENERIC_TOOL__TOOL_CLASS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon() || childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon();
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ItemRefItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ItemRefItemProvider.java
deleted file mode 100644
index dfa14abf8d8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ItemRefItemProvider.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ItemRef} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ItemRefItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ItemRefItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addItemPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Item feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addItemPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ItemRef_item_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ItemRef_item_feature", "_UI_ItemRef_type"), GMFToolPackage.eINSTANCE.getItemRef_Item(), true, false, false, null, null, null));
-	}
-
-	/**
-	 * This returns ItemRef.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ItemRef"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ItemRef_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MainMenuItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MainMenuItemProvider.java
deleted file mode 100644
index f7dd4e1c448..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MainMenuItemProvider.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.MainMenu;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.MainMenu} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MainMenuItemProvider extends MenuItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MainMenuItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTitlePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MainMenu_title_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_MainMenu_title_feature", "_UI_MainMenu_type"), GMFToolPackage.eINSTANCE.getMainMenu_Title(), true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns MainMenu.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/MainMenu"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((MainMenu) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_MainMenu_type") : getString("_UI_MainMenu_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MainMenu.class)) {
-		case GMFToolPackage.MAIN_MENU__TITLE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MenuActionItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MenuActionItemProvider.java
deleted file mode 100644
index 12704073e0d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MenuActionItemProvider.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.MenuAction;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.MenuAction} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MenuActionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MenuActionItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTitlePropertyDescriptor(object);
-			addKindPropertyDescriptor(object);
-			addHotKeyPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_ContributionItem_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ContributionItem_title_feature", "_UI_ContributionItem_type"),
-				GMFToolPackage.eINSTANCE.getContributionItem_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Kind feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_MenuAction_kind_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_MenuAction_kind_feature", "_UI_MenuAction_type"), GMFToolPackage.eINSTANCE.getMenuAction_Kind(), true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Hot Key feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addHotKeyPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_MenuAction_hotKey_feature"), getString("_UI_PropertyDescriptor_description", "_UI_MenuAction_hotKey_feature", "_UI_MenuAction_type"),
-				GMFToolPackage.eINSTANCE.getMenuAction_HotKey(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getContributionItem_Icon());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns MenuAction.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/MenuAction"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((MenuAction) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_MenuAction_type") : getString("_UI_MenuAction_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(MenuAction.class)) {
-		case GMFToolPackage.MENU_ACTION__TITLE:
-		case GMFToolPackage.MENU_ACTION__KIND:
-		case GMFToolPackage.MENU_ACTION__HOT_KEY:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case GMFToolPackage.MENU_ACTION__ICON:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getContributionItem_Icon(), GMFToolFactory.eINSTANCE.createDefaultImage()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getContributionItem_Icon(), GMFToolFactory.eINSTANCE.createBundleImage()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MenuItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MenuItemProvider.java
deleted file mode 100644
index 4974c4cff8e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/MenuItemProvider.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Menu;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.Menu} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class MenuItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MenuItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getMenu_Items());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Menu_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Menu.class)) {
-		case GMFToolPackage.MENU__ITEMS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getMenu_Items(), GMFToolFactory.eINSTANCE.createSeparator()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getMenu_Items(), GMFToolFactory.eINSTANCE.createPredefinedItem()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getMenu_Items(), GMFToolFactory.eINSTANCE.createPredefinedMenu()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getMenu_Items(), GMFToolFactory.eINSTANCE.createMenuAction()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getMenu_Items(), GMFToolFactory.eINSTANCE.createItemRef()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getMenu_Items(), GMFToolFactory.eINSTANCE.createPopupMenu()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PaletteItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PaletteItemProvider.java
deleted file mode 100644
index 01eb59ed2f0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PaletteItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.Palette} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PaletteItemProvider extends ToolContainerItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PaletteItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addDefaultPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Default feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addDefaultPropertyDescriptor(Object object) {
-		itemPropertyDescriptors
-				.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Palette_default_feature"),
-						getString("_UI_PropertyDescriptor_description", "_UI_Palette_default_feature", "_UI_Palette_type"), GMFToolPackage.eINSTANCE.getPalette_Default(), true, false, false, null,
-						null, null));
-	}
-
-	/**
-	 * This returns Palette.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Palette"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Palette) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_Palette_type") : getString("_UI_Palette_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon() || childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon();
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PaletteSeparatorItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PaletteSeparatorItemProvider.java
deleted file mode 100644
index 32dd3125292..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PaletteSeparatorItemProvider.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.PaletteSeparator;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.PaletteSeparator} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PaletteSeparatorItemProvider extends AbstractToolItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PaletteSeparatorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns PaletteSeparator.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PaletteSeparator"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PaletteSeparator) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_PaletteSeparator_type") : getString("_UI_PaletteSeparator_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon() || childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon();
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PopupMenuItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PopupMenuItemProvider.java
deleted file mode 100644
index 2c7673d05d9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PopupMenuItemProvider.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.PopupMenu;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.PopupMenu} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PopupMenuItemProvider extends MenuItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PopupMenuItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addTitlePropertyDescriptor(object);
-			addIDPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Title feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addTitlePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_ContributionItem_title_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ContributionItem_title_feature", "_UI_ContributionItem_type"),
-				GMFToolPackage.eINSTANCE.getContributionItem_Title(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the ID feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIDPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_PopupMenu_iD_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_PopupMenu_iD_feature", "_UI_PopupMenu_type"), GMFToolPackage.eINSTANCE.getPopupMenu_ID(), true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getContributionItem_Icon());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns PopupMenu.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PopupMenu"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PopupMenu) object).getID();
-		return label == null || label.length() == 0 ? getString("_UI_PopupMenu_type") : getString("_UI_PopupMenu_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(PopupMenu.class)) {
-		case GMFToolPackage.POPUP_MENU__TITLE:
-		case GMFToolPackage.POPUP_MENU__ID:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		case GMFToolPackage.POPUP_MENU__ICON:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getContributionItem_Icon(), GMFToolFactory.eINSTANCE.createDefaultImage()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getContributionItem_Icon(), GMFToolFactory.eINSTANCE.createBundleImage()));
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PredefinedItemItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PredefinedItemItemProvider.java
deleted file mode 100644
index 1280bb74c86..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PredefinedItemItemProvider.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedItem;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.PredefinedItem} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PredefinedItemItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedItemItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdentifierPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Identifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_PredefinedItem_identifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PredefinedItem_identifier_feature", "_UI_PredefinedItem_type"),
-				GMFToolPackage.eINSTANCE.getPredefinedItem_Identifier(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns PredefinedItem.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PredefinedItem"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PredefinedItem) object).getIdentifier();
-		return label == null || label.length() == 0 ? getString("_UI_PredefinedItem_type") : getString("_UI_PredefinedItem_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(PredefinedItem.class)) {
-		case GMFToolPackage.PREDEFINED_ITEM__IDENTIFIER:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PredefinedMenuItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PredefinedMenuItemProvider.java
deleted file mode 100644
index 6b4f430e8ea..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/PredefinedMenuItemProvider.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedMenu;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.PredefinedMenu} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class PredefinedMenuItemProvider extends MenuItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedMenuItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addIdentifierPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Identifier feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addIdentifierPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_PredefinedItem_identifier_feature"), getString("_UI_PropertyDescriptor_description", "_UI_PredefinedItem_identifier_feature", "_UI_PredefinedItem_type"),
-				GMFToolPackage.eINSTANCE.getPredefinedItem_Identifier(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns PredefinedMenu.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/PredefinedMenu"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((PredefinedMenu) object).getIdentifier();
-		return label == null || label.length() == 0 ? getString("_UI_PredefinedMenu_type") : getString("_UI_PredefinedMenu_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(PredefinedMenu.class)) {
-		case GMFToolPackage.PREDEFINED_MENU__IDENTIFIER:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/SeparatorItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/SeparatorItemProvider.java
deleted file mode 100644
index b8345561fbe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/SeparatorItemProvider.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Separator;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.Separator} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class SeparatorItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public SeparatorItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addNamePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Name feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addNamePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Separator_name_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_Separator_name_feature", "_UI_Separator_type"), GMFToolPackage.eINSTANCE.getSeparator_Name(), true, false, false,
-				ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns Separator.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Separator"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((Separator) object).getName();
-		return label == null || label.length() == 0 ? getString("_UI_Separator_type") : getString("_UI_Separator_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(Separator.class)) {
-		case GMFToolPackage.SEPARATOR__NAME:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/StandardToolItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/StandardToolItemProvider.java
deleted file mode 100644
index d140a25e587..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/StandardToolItemProvider.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.StandardTool;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.StandardTool} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class StandardToolItemProvider extends AbstractToolItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StandardToolItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addToolKindPropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Tool Kind feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addToolKindPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_StandardTool_toolKind_feature"), getString("_UI_PropertyDescriptor_description", "_UI_StandardTool_toolKind_feature", "_UI_StandardTool_type"),
-				GMFToolPackage.eINSTANCE.getStandardTool_ToolKind(), true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This returns StandardTool.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/StandardTool"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((StandardTool) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_StandardTool_type") : getString("_UI_StandardTool_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(StandardTool.class)) {
-		case GMFToolPackage.STANDARD_TOOL__TOOL_KIND:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon() || childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon();
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolContainerItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolContainerItemProvider.java
deleted file mode 100644
index 00accfe6a51..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolContainerItemProvider.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.ToolContainer;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ToolContainer} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ToolContainerItemProvider extends AbstractToolItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolContainerItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getToolContainer_Tools());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ToolContainer) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_ToolContainer_type") : getString("_UI_ToolContainer_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ToolContainer.class)) {
-		case GMFToolPackage.TOOL_CONTAINER__TOOLS:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolContainer_Tools(), GMFToolFactory.eINSTANCE.createPaletteSeparator()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolContainer_Tools(), GMFToolFactory.eINSTANCE.createToolGroup()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolContainer_Tools(), GMFToolFactory.eINSTANCE.createPalette()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolContainer_Tools(), GMFToolFactory.eINSTANCE.createStandardTool()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolContainer_Tools(), GMFToolFactory.eINSTANCE.createCreationTool()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolContainer_Tools(), GMFToolFactory.eINSTANCE.createGenericTool()));
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon() || childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon();
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolGroupItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolGroupItemProvider.java
deleted file mode 100644
index 4b29a8d0d70..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolGroupItemProvider.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.ToolGroup;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ToolGroup} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ToolGroupItemProvider extends ToolContainerItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolGroupItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-			addCollapsiblePropertyDescriptor(object);
-			addStackPropertyDescriptor(object);
-			addActivePropertyDescriptor(object);
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This adds a property descriptor for the Collapsible feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addCollapsiblePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(),
-				getString("_UI_ToolGroup_collapsible_feature"), getString("_UI_PropertyDescriptor_description", "_UI_ToolGroup_collapsible_feature", "_UI_ToolGroup_type"),
-				GMFToolPackage.eINSTANCE.getToolGroup_Collapsible(), true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Stack feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addStackPropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ToolGroup_stack_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ToolGroup_stack_feature", "_UI_ToolGroup_type"), GMFToolPackage.eINSTANCE.getToolGroup_Stack(), true, false, false,
-				ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null));
-	}
-
-	/**
-	 * This adds a property descriptor for the Active feature.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void addActivePropertyDescriptor(Object object) {
-		itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ToolGroup_active_feature"),
-				getString("_UI_PropertyDescriptor_description", "_UI_ToolGroup_active_feature", "_UI_ToolGroup_type"), GMFToolPackage.eINSTANCE.getToolGroup_Active(), true, false, false, null, null,
-				null));
-	}
-
-	/**
-	 * This returns ToolGroup.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolGroup"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		String label = ((ToolGroup) object).getTitle();
-		return label == null || label.length() == 0 ? getString("_UI_ToolGroup_type") : getString("_UI_ToolGroup_type") + " " + label;
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ToolGroup.class)) {
-		case GMFToolPackage.TOOL_GROUP__COLLAPSIBLE:
-		case GMFToolPackage.TOOL_GROUP__STACK:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-	/**
-	 * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getCreateChildText(Object owner, Object feature, Object child, Collection<?> selection) {
-		Object childFeature = feature;
-		Object childObject = child;
-
-		boolean qualify = childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_SmallIcon() || childFeature == GMFToolPackage.eINSTANCE.getAbstractTool_LargeIcon();
-
-		if (qualify) {
-			return getString("_UI_CreateChild_text2", new Object[] { getTypeText(childObject), getFeatureText(childFeature), getTypeText(owner) });
-		}
-		return super.getCreateChildText(owner, feature, child, selection);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolRegistryItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolRegistryItemProvider.java
deleted file mode 100644
index 52f1a3fe41b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolRegistryItemProvider.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.util.ResourceLocator;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ToolRegistryItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider,
-		IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolRegistryItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an
-	 * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or
-	 * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Collection<? extends EStructuralFeature> getChildrenFeatures(Object object) {
-		if (childrenFeatures == null) {
-			super.getChildrenFeatures(object);
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getToolRegistry_SharedActions());
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getToolRegistry_AllMenus());
-			childrenFeatures.add(GMFToolPackage.eINSTANCE.getToolRegistry_Palette());
-		}
-		return childrenFeatures;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EStructuralFeature getChildFeature(Object object, Object child) {
-		// Check the type of the specified child object and return the proper feature to use for
-		// adding (see {@link AddCommand}) it as a child.
-
-		return super.getChildFeature(object, child);
-	}
-
-	/**
-	 * This returns ToolRegistry.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/ToolRegistry"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_ToolRegistry_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-
-		switch (notification.getFeatureID(ToolRegistry.class)) {
-		case GMFToolPackage.TOOL_REGISTRY__SHARED_ACTIONS:
-		case GMFToolPackage.TOOL_REGISTRY__ALL_MENUS:
-		case GMFToolPackage.TOOL_REGISTRY__PALETTE:
-			fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));
-			return;
-		}
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolRegistry_SharedActions(), GMFToolFactory.eINSTANCE.createMenuAction()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolRegistry_AllMenus(), GMFToolFactory.eINSTANCE.createPredefinedMenu()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolRegistry_AllMenus(), GMFToolFactory.eINSTANCE.createContextMenu()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolRegistry_AllMenus(), GMFToolFactory.eINSTANCE.createPopupMenu()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolRegistry_AllMenus(), GMFToolFactory.eINSTANCE.createMainMenu()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolRegistry_AllMenus(), GMFToolFactory.eINSTANCE.createToolbar()));
-
-		newChildDescriptors.add(createChildParameter(GMFToolPackage.eINSTANCE.getToolRegistry_Palette(), GMFToolFactory.eINSTANCE.createPalette()));
-	}
-
-	/**
-	 * Return the resource locator for this item provider's resources.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public ResourceLocator getResourceLocator() {
-		return GMFToolEditPlugin.INSTANCE;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolbarItemProvider.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolbarItemProvider.java
deleted file mode 100644
index f5047f5e3b1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef.edit/src/org/eclipse/papyrus/gmf/tooldef/provider/ToolbarItemProvider.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.provider;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.eclipse.emf.common.notify.AdapterFactory;
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
-import org.eclipse.emf.edit.provider.IItemLabelProvider;
-import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
-import org.eclipse.emf.edit.provider.IItemPropertySource;
-import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
-import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-
-/**
- * This is the item provider adapter for a {@link org.eclipse.papyrus.gmf.tooldef.Toolbar} object.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-public class ToolbarItemProvider extends MenuItemProvider implements IEditingDomainItemProvider, IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {
-
-	/**
-	 * This constructs an instance from a factory and a notifier.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolbarItemProvider(AdapterFactory adapterFactory) {
-		super(adapterFactory);
-	}
-
-	/**
-	 * This returns the property descriptors for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
-		if (itemPropertyDescriptors == null) {
-			super.getPropertyDescriptors(object);
-
-		}
-		return itemPropertyDescriptors;
-	}
-
-	/**
-	 * This returns Toolbar.gif.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object getImage(Object object) {
-		return overlayImage(object, getResourceLocator().getImage("full/obj16/Toolbar"));
-	}
-
-	/**
-	 * This returns the label text for the adapted class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String getText(Object object) {
-		return getString("_UI_Toolbar_type");
-	}
-
-	/**
-	 * This handles model notifications by calling {@link #updateChildren} to update any cached
-	 * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void notifyChanged(Notification notification) {
-		updateChildren(notification);
-		super.notifyChanged(notification);
-	}
-
-	/**
-	 * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
-	 * that can be created under this object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
-		super.collectNewChildDescriptors(newChildDescriptors, object);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.project
deleted file mode 100644
index 4def917e8ed..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.tooldef</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/META-INF/MANIFEST.MF
deleted file mode 100644
index 33d1b3c356a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,15 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.tooldef; singleton:=true
-Bundle-Version: 2.3.0.qualifier
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.papyrus.gmf.tooldef,
- org.eclipse.papyrus.gmf.tooldef.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
- org.eclipse.papyrus.gmf.common;bundle-version="[1.1.0,2.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/build.properties
deleted file mode 100644
index f7e4f4493f9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-#
-# $Id$
-
-bin.includes = .,\
-               models/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html
-jars.compile.order = .
-source.. = src/
-output.. = bin/
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore
deleted file mode 100644
index 9402ccd6a30..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.ecore
+++ /dev/null
@@ -1,138 +0,0 @@
-<?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="tooldef" nsURI="http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition"
-    nsPrefix="gmftool">
-  <eClassifiers xsi:type="ecore:EClass" name="ToolRegistry">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="sharedActions" upperBound="-1"
-        eType="#//MenuAction" containment="true">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Instead of placing&#x9;common actions somewhere in menu hierarchy and referencing them in (2..n) cases, keep them in this central registry and use ItemRef everywhere (i.e. in 1..n cases)"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="allMenus" upperBound="-1"
-        eType="#//Menu" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="palette" eType="#//Palette"
-        containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="AbstractTool" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="smallIcon" eType="#//Image"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="largeIcon" eType="#//Image"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolContainer" abstract="true" eSuperTypes="#//AbstractTool">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="tools" upperBound="-1"
-        eType="#//AbstractTool" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PaletteSeparator" eSuperTypes="#//AbstractTool"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ToolGroup" eSuperTypes="#//ToolContainer">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="stack" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="active" eType="#//AbstractTool"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Palette" eSuperTypes="#//ToolContainer">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="#//AbstractTool"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StandardTool" eSuperTypes="#//AbstractTool">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="predefined, like zoom or marquee"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolKind" eType="#//StandardToolKind"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="StandardToolKind">
-    <eLiterals name="SELECT"/>
-    <eLiterals name="SELECT_PAN" value="1"/>
-    <eLiterals name="MARQUEE" value="2"/>
-    <eLiterals name="ZOOM_PAN" value="3"/>
-    <eLiterals name="ZOOM_IN" value="4"/>
-    <eLiterals name="ZOOM_OUT" value="5"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CreationTool" eSuperTypes="#//AbstractTool"/>
-  <eClassifiers xsi:type="ecore:EClass" name="GenericTool" eSuperTypes="#//AbstractTool">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolClass" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ItemBase" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="Menu" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
-        eType="#//ItemBase" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Separator" eSuperTypes="#//ItemBase">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PredefinedItem" eSuperTypes="#//ItemBase">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PredefinedMenu" eSuperTypes="#//Menu #//PredefinedItem"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ContributionItem" abstract="true" interface="true"
-      eSuperTypes="#//ItemBase">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="icon" eType="#//Image"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MenuAction" eSuperTypes="#//ContributionItem">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ActionKind"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hotKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ItemRef" eSuperTypes="#//ItemBase">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="item" lowerBound="1" eType="#//ItemBase"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ContextMenu" eSuperTypes="#//Menu">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="#//MenuAction"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="PopupMenu" eSuperTypes="#//Menu #//ContributionItem">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        iD="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="MainMenu" eSuperTypes="#//Menu">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="no default action and no id, just a collection of items"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Toolbar" eSuperTypes="#//Menu"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="ActionKind">
-    <eLiterals name="CREATE"/>
-    <eLiterals name="PROPCHANGE" value="1"/>
-    <eLiterals name="MODIFY" value="2"/>
-    <eLiterals name="PROCESS" value="3"/>
-    <eLiterals name="CUSTOM" value="99"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Image" abstract="true" interface="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DefaultImage" eSuperTypes="#//Image">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Delegate to EMF.Edit providers"/>
-    </eAnnotations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="BundleImage" eSuperTypes="#//Image">
-    <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-      <details key="documentation" value="Image bundled as part of distribution"/>
-    </eAnnotations>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Relative path to image"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
-        <details key="documentation" value="Empty value means image path is relative to generated bundle"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="StyleSelector" abstract="true" interface="true">
-    <eOperations name="isOk" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-    </eOperations>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="GenericStyleSelector" eSuperTypes="#//StyleSelector">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="values" lowerBound="1"
-        upperBound="-1" eType="#//AppearanceStyle"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="AppearanceStyle">
-    <eLiterals name="Font"/>
-    <eLiterals name="Fill" value="1"/>
-    <eLiterals name="Line" value="2"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.emf b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.emf
deleted file mode 100644
index 4f227edf7c5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.emf
+++ /dev/null
@@ -1,173 +0,0 @@
-@namespace(uri="http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition", prefix="gmftool")
-package tooldef;
-
-/////////////////
-// Root container
-//
-
-class ToolRegistry {
-	@genmodel(documentation="Instead of placing	common actions somewhere in menu hierarchy and referencing them in (2..n) cases, keep them in this central registry and use ItemRef everywhere (i.e. in 1..n cases)")
-	val MenuAction[*] sharedActions;
-	val Menu[*] allMenus;
-	val Palette[?] palette;
-}
-
-//////////
-// Palette
-//
-
-abstract class AbstractTool {
-	val Image smallIcon;
-	val Image largeIcon;
-	attr String title;
-	attr String description;
-}
-
-abstract class ToolContainer extends AbstractTool {
-	// TODO opposite ref
-	ordered val AbstractTool[*] tools;
-}
-
-class PaletteSeparator extends AbstractTool {
-}
-
-class ToolGroup extends ToolContainer {
-	attr boolean collapsible;
-	attr boolean stack;
-	ref AbstractTool[?] active;
-}
-
-class Palette extends ToolContainer {
-	ref AbstractTool[?] default;
-}
-
-@genmodel(documentation="predefined, like zoom or marquee")
-class StandardTool extends AbstractTool {
-	//attr String identifier;
-	attr StandardToolKind toolKind;
-}
-
-enum StandardToolKind {
-	SELECT;
-	SELECT_PAN;
-	MARQUEE;
-	ZOOM_PAN;
-	ZOOM_IN;
-	ZOOM_OUT;
-}
-
-class CreationTool extends AbstractTool {
-}
-
-class GenericTool extends AbstractTool {
-	attr String[1] toolClass;
-}
-
-/////////////////////
-// Menus and toolbars
-//
-
-abstract interface ItemBase {
-}
-
-abstract class Menu {
-	ordered val ItemBase[*] items; 
-}
-
-class Separator extends ItemBase {
-	attr String name;
-}
-
-class PredefinedItem extends ItemBase {
-	attr String identifier;
-}
-
-class PredefinedMenu extends Menu, PredefinedItem {
-}
-
-abstract interface ContributionItem extends ItemBase {
-	val Image icon;
-	attr String title;
-}
-
-class MenuAction extends ContributionItem {
-	attr ActionKind kind;
-	attr String hotKey;
-}
-
-class ItemRef extends ItemBase {
-	// constraints: self.item not instanceof Separator?
-	ref ItemBase[1] item;
-}
-
-class ContextMenu extends Menu {
-	// constraint: isUndefined(default) or super.items.contains(default)
-	// FIXME - what if default should be itemRef? int (=position) instead?
-	ref MenuAction[?] default;
-}
-
-class PopupMenu extends Menu, ContributionItem {
-	id attr String iD;
-}
-
-@genmodel(documentation="no default action and no id, just a collection of items")
-class MainMenu extends Menu {
-	attr String title;
-}
-
-class Toolbar extends Menu {
-}
-
-///////////////
-// Action kinds
-//
-
-enum ActionKind {
-	CREATE;
-	PROPCHANGE; // detailsLevel, isVisible, modifier
-	MODIFY;
-	PROCESS; // READ?
-	CUSTOM = 99;
-}
-
-
-//class OutlineView {
-//	attr boolean dontneedthat;
-//}
-
-/////////
-// Images
-//
-
-abstract interface Image {
-}
-
-@genmodel(documentation="Delegate to EMF.Edit providers")
-class DefaultImage extends Image {
-}
-
-@genmodel(documentation="Image bundled as part of distribution")
-class BundleImage extends Image {
-	@genmodel(documentation="Relative path to image")
-	attr String path;
-	@genmodel(documentation="Empty value means image path is relative to generated bundle")
-	attr String bundle;
-}
-
-/////////////////////////////
-// Customizing Property Sheet
-//
-
-abstract interface StyleSelector {
-	op boolean isOk(Object style);
-}
-
-class GenericStyleSelector extends StyleSelector {
-	attr AppearanceStyle[+] values;
-}
-
-enum AppearanceStyle {
-	Font;
-	Fill;
-	Line;
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.genmodel b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.genmodel
deleted file mode 100644
index e52c082bccc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/models/tooldef.genmodel
+++ /dev/null
@@ -1,108 +0,0 @@
-<?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" modelDirectory="/org.eclipse.papyrus.gmf.tooldef/src"
-    editorDirectory="/org.eclipse.papyrus.gmf.tooldef.edit/src" modelPluginID="org.eclipse.papyrus.gmf.tooldef"
-    templateDirectory="" redirection="" modelName="GMFTool" editorPluginClass="org.eclipse.papyrus.gmf.tooldef.provider.GMFToolEditPlugin"
-    codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0">
-  <foreignModel>tooldef.ecore</foreignModel>
-  <genPackages prefix="GMFTool" basePackage="org.eclipse.gmf" disposableProviderFactory="true"
-      literalsInterface="false" ecorePackage="tooldef.ecore#/">
-    <genEnums ecoreEnum="tooldef.ecore#//StandardToolKind">
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/SELECT"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/SELECT_PAN"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/MARQUEE"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_PAN"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_IN"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_OUT"/>
-    </genEnums>
-    <genEnums ecoreEnum="tooldef.ecore#//ActionKind">
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/CREATE"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/PROPCHANGE"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/MODIFY"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/PROCESS"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/CUSTOM"/>
-    </genEnums>
-    <genEnums ecoreEnum="tooldef.ecore#//AppearanceStyle">
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Font"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Fill"/>
-      <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Line"/>
-    </genEnums>
-    <genClasses ecoreClass="tooldef.ecore#//ToolRegistry">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/sharedActions"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/allMenus"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/palette"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="tooldef.ecore#//AbstractTool">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//AbstractTool/smallIcon"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//AbstractTool/largeIcon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//AbstractTool/title"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//AbstractTool/description"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="tooldef.ecore#//ToolContainer">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolContainer/tools"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//PaletteSeparator"/>
-    <genClasses ecoreClass="tooldef.ecore#//ToolGroup">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ToolGroup/collapsible"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ToolGroup/stack"/>
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ToolGroup/active"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//Palette">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//Palette/default"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//StandardTool">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//StandardTool/toolKind"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//CreationTool"/>
-    <genClasses ecoreClass="tooldef.ecore#//GenericTool">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//GenericTool/toolClass"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//ItemBase"/>
-    <genClasses image="false" ecoreClass="tooldef.ecore#//Menu">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//Menu/items"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//Separator">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//Separator/name"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//PredefinedItem">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//PredefinedItem/identifier"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//PredefinedMenu"/>
-    <genClasses ecoreClass="tooldef.ecore#//ContributionItem">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ContributionItem/icon"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ContributionItem/title"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//MenuAction">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MenuAction/kind"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MenuAction/hotKey"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//ItemRef">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ItemRef/item"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//ContextMenu">
-      <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ContextMenu/default"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//PopupMenu">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//PopupMenu/iD"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//MainMenu">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MainMenu/title"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//Toolbar"/>
-    <genClasses ecoreClass="tooldef.ecore#//Image"/>
-    <genClasses ecoreClass="tooldef.ecore#//DefaultImage"/>
-    <genClasses ecoreClass="tooldef.ecore#//BundleImage">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//BundleImage/path"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//BundleImage/bundle"/>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//StyleSelector">
-      <genOperations ecoreOperation="tooldef.ecore#//StyleSelector/isOk">
-        <genParameters ecoreParameter="tooldef.ecore#//StyleSelector/isOk/style"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="tooldef.ecore#//GenericStyleSelector">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//GenericStyleSelector/values"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/plugin.properties
deleted file mode 100644
index 7d4d56c07b8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/plugin.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-# 
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-#
-# $Id$
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Papyrus GMF Tooling Model
-providerName = Eclipse Modeling Project
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/plugin.xml
deleted file mode 100644
index 53cd8ac8a0e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/plugin.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition" 
-       class = "org.eclipse.papyrus.gmf.tooldef.GMFToolPackage"
-       genModel = "models/tooldef.genmodel" /> 
-  </extension>
-
-  <extension point="org.eclipse.emf.ecore.extension_parser">
-    <parser type="gmftool" class="org.eclipse.papyrus.gmf.internal.common.ToolingResourceFactory" />
-  </extension>
-
-  <extension point="org.eclipse.team.core.fileTypes">
-    <fileTypes extension="gmftool" type="text" />
-  </extension>
-
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/pom.xml
deleted file mode 100644
index 3bbd409bddd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.tooldef</artifactId>
-	<version>2.3.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/AbstractTool.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/AbstractTool.java
deleted file mode 100644
index 9485a9416c1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/AbstractTool.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Abstract Tool</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getAbstractTool()
- * @model abstract="true"
- * @generated
- */
-public interface AbstractTool extends EObject {
-
-	/**
-	 * Returns the value of the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Small Icon</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Small Icon</em>' containment reference.
-	 * @see #setSmallIcon(Image)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getAbstractTool_SmallIcon()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Image getSmallIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getSmallIcon <em>Small Icon</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Small Icon</em>' containment reference.
-	 * @see #getSmallIcon()
-	 * @generated
-	 */
-	void setSmallIcon(Image value);
-
-	/**
-	 * Returns the value of the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Large Icon</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Large Icon</em>' containment reference.
-	 * @see #setLargeIcon(Image)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getAbstractTool_LargeIcon()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Image getLargeIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getLargeIcon <em>Large Icon</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Large Icon</em>' containment reference.
-	 * @see #getLargeIcon()
-	 * @generated
-	 */
-	void setLargeIcon(Image value);
-
-	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Title</em>' attribute.
-	 * @see #setTitle(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getAbstractTool_Title()
-	 * @model
-	 * @generated
-	 */
-	String getTitle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
-	 * @see #getTitle()
-	 * @generated
-	 */
-	void setTitle(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Description</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Description</em>' attribute.
-	 * @see #setDescription(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getAbstractTool_Description()
-	 * @model
-	 * @generated
-	 */
-	String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-} // AbstractTool
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ActionKind.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ActionKind.java
deleted file mode 100644
index a103ceb7270..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ActionKind.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Action Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getActionKind()
- * @model
- * @generated
- */
-public enum ActionKind implements Enumerator {
-	/**
-	 * The '<em><b>CREATE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CREATE
-	 * @generated
-	 * @ordered
-	 */
-	CREATE_LITERAL(0, "CREATE", "CREATE"),
-	/**
-	 * The '<em><b>PROPCHANGE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PROPCHANGE
-	 * @generated
-	 * @ordered
-	 */
-	PROPCHANGE_LITERAL(1, "PROPCHANGE", "PROPCHANGE"),
-	/**
-	 * The '<em><b>MODIFY</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MODIFY
-	 * @generated
-	 * @ordered
-	 */
-	MODIFY_LITERAL(2, "MODIFY", "MODIFY"),
-	/**
-	 * The '<em><b>PROCESS</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #PROCESS
-	 * @generated
-	 * @ordered
-	 */
-	PROCESS_LITERAL(3, "PROCESS", "PROCESS"),
-	/**
-	 * The '<em><b>CUSTOM</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM
-	 * @generated
-	 * @ordered
-	 */
-	CUSTOM_LITERAL(99, "CUSTOM", "CUSTOM");
-
-	/**
-	 * The '<em><b>CREATE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CREATE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CREATE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CREATE = 0;
-
-	/**
-	 * The '<em><b>PROPCHANGE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>PROPCHANGE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PROPCHANGE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PROPCHANGE = 1;
-
-	/**
-	 * The '<em><b>MODIFY</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>MODIFY</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MODIFY_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MODIFY = 2;
-
-	/**
-	 * The '<em><b>PROCESS</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>PROCESS</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #PROCESS_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int PROCESS = 3;
-
-	/**
-	 * The '<em><b>CUSTOM</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>CUSTOM</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #CUSTOM_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int CUSTOM = 99;
-
-	/**
-	 * An array of all the '<em><b>Action Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ActionKind[] VALUES_ARRAY = new ActionKind[] { CREATE_LITERAL, PROPCHANGE_LITERAL, MODIFY_LITERAL, PROCESS_LITERAL, CUSTOM_LITERAL, };
-
-	/**
-	 * A public read-only list of all the '<em><b>Action Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ActionKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Action Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ActionKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ActionKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Action Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ActionKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ActionKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Action Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ActionKind get(int value) {
-		switch (value) {
-		case CREATE:
-			return CREATE_LITERAL;
-		case PROPCHANGE:
-			return PROPCHANGE_LITERAL;
-		case MODIFY:
-			return MODIFY_LITERAL;
-		case PROCESS:
-			return PROCESS_LITERAL;
-		case CUSTOM:
-			return CUSTOM_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ActionKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/AppearanceStyle.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/AppearanceStyle.java
deleted file mode 100644
index dd1e2cae6fe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/AppearanceStyle.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Appearance Style</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getAppearanceStyle()
- * @model
- * @generated
- */
-public enum AppearanceStyle implements Enumerator {
-	/**
-	 * The '<em><b>Font</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FONT
-	 * @generated
-	 * @ordered
-	 */
-	FONT_LITERAL(0, "Font", "Font"),
-	/**
-	 * The '<em><b>Fill</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FILL
-	 * @generated
-	 * @ordered
-	 */
-	FILL_LITERAL(1, "Fill", "Fill"),
-	/**
-	 * The '<em><b>Line</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #LINE
-	 * @generated
-	 * @ordered
-	 */
-	LINE_LITERAL(2, "Line", "Line");
-
-	/**
-	 * The '<em><b>Font</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Font</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FONT_LITERAL
-	 * @model name="Font"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FONT = 0;
-
-	/**
-	 * The '<em><b>Fill</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Fill</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FILL_LITERAL
-	 * @model name="Fill"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FILL = 1;
-
-	/**
-	 * The '<em><b>Line</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Line</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #LINE_LITERAL
-	 * @model name="Line"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int LINE = 2;
-
-	/**
-	 * An array of all the '<em><b>Appearance Style</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final AppearanceStyle[] VALUES_ARRAY = new AppearanceStyle[] { FONT_LITERAL, FILL_LITERAL, LINE_LITERAL, };
-
-	/**
-	 * A public read-only list of all the '<em><b>Appearance Style</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<AppearanceStyle> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Appearance Style</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AppearanceStyle get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AppearanceStyle result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Appearance Style</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AppearanceStyle getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			AppearanceStyle result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Appearance Style</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static AppearanceStyle get(int value) {
-		switch (value) {
-		case FONT:
-			return FONT_LITERAL;
-		case FILL:
-			return FILL_LITERAL;
-		case LINE:
-			return LINE_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private AppearanceStyle(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/BundleImage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/BundleImage.java
deleted file mode 100644
index 4988e108062..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/BundleImage.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bundle Image</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Image bundled as part of distribution
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.BundleImage#getPath <em>Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.BundleImage#getBundle <em>Bundle</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getBundleImage()
- * @model
- * @generated
- */
-public interface BundleImage extends Image {
-
-	/**
-	 * Returns the value of the '<em><b>Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Path</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Relative path to image
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Path</em>' attribute.
-	 * @see #setPath(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getBundleImage_Path()
-	 * @model
-	 * @generated
-	 */
-	String getPath();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.BundleImage#getPath <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Path</em>' attribute.
-	 * @see #getPath()
-	 * @generated
-	 */
-	void setPath(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Bundle</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Bundle</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Empty value means image path is relative to generated bundle
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Bundle</em>' attribute.
-	 * @see #setBundle(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getBundleImage_Bundle()
-	 * @model
-	 * @generated
-	 */
-	String getBundle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.BundleImage#getBundle <em>Bundle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Bundle</em>' attribute.
-	 * @see #getBundle()
-	 * @generated
-	 */
-	void setBundle(String value);
-
-} // BundleImage
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ContextMenu.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ContextMenu.java
deleted file mode 100644
index 30f51292a85..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ContextMenu.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Context Menu</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ContextMenu#getDefault <em>Default</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getContextMenu()
- * @model
- * @generated
- */
-public interface ContextMenu extends Menu {
-
-	/**
-	 * Returns the value of the '<em><b>Default</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default</em>' reference.
-	 * @see #setDefault(MenuAction)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getContextMenu_Default()
-	 * @model
-	 * @generated
-	 */
-	MenuAction getDefault();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.ContextMenu#getDefault <em>Default</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default</em>' reference.
-	 * @see #getDefault()
-	 * @generated
-	 */
-	void setDefault(MenuAction value);
-
-} // ContextMenu
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ContributionItem.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ContributionItem.java
deleted file mode 100644
index d8c0eed84f1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ContributionItem.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Contribution Item</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem#getIcon <em>Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem#getTitle <em>Title</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getContributionItem()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface ContributionItem extends ItemBase {
-
-	/**
-	 * Returns the value of the '<em><b>Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Icon</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Icon</em>' containment reference.
-	 * @see #setIcon(Image)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getContributionItem_Icon()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Image getIcon();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem#getIcon <em>Icon</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Icon</em>' containment reference.
-	 * @see #getIcon()
-	 * @generated
-	 */
-	void setIcon(Image value);
-
-	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Title</em>' attribute.
-	 * @see #setTitle(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getContributionItem_Title()
-	 * @model
-	 * @generated
-	 */
-	String getTitle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
-	 * @see #getTitle()
-	 * @generated
-	 */
-	void setTitle(String value);
-
-} // ContributionItem
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/CreationTool.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/CreationTool.java
deleted file mode 100644
index 4a98d1902b9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/CreationTool.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Creation Tool</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getCreationTool()
- * @model
- * @generated
- */
-public interface CreationTool extends AbstractTool {
-} // CreationTool
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/DefaultImage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/DefaultImage.java
deleted file mode 100644
index 7b9c4c8d4e2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/DefaultImage.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Default Image</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * Delegate to EMF.Edit providers
- * <!-- end-model-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getDefaultImage()
- * @model
- * @generated
- */
-public interface DefaultImage extends Image {
-} // DefaultImage
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GMFToolFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GMFToolFactory.java
deleted file mode 100644
index 051f0b0261c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GMFToolFactory.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage
- * @generated
- */
-public interface GMFToolFactory extends EFactory {
-
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	GMFToolFactory eINSTANCE = org.eclipse.papyrus.gmf.tooldef.impl.GMFToolFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Tool Registry</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tool Registry</em>'.
-	 * @generated
-	 */
-	ToolRegistry createToolRegistry();
-
-	/**
-	 * Returns a new object of class '<em>Palette Separator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Palette Separator</em>'.
-	 * @generated
-	 */
-	PaletteSeparator createPaletteSeparator();
-
-	/**
-	 * Returns a new object of class '<em>Tool Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Tool Group</em>'.
-	 * @generated
-	 */
-	ToolGroup createToolGroup();
-
-	/**
-	 * Returns a new object of class '<em>Palette</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Palette</em>'.
-	 * @generated
-	 */
-	Palette createPalette();
-
-	/**
-	 * Returns a new object of class '<em>Standard Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Standard Tool</em>'.
-	 * @generated
-	 */
-	StandardTool createStandardTool();
-
-	/**
-	 * Returns a new object of class '<em>Creation Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Creation Tool</em>'.
-	 * @generated
-	 */
-	CreationTool createCreationTool();
-
-	/**
-	 * Returns a new object of class '<em>Generic Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Generic Tool</em>'.
-	 * @generated
-	 */
-	GenericTool createGenericTool();
-
-	/**
-	 * Returns a new object of class '<em>Separator</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Separator</em>'.
-	 * @generated
-	 */
-	Separator createSeparator();
-
-	/**
-	 * Returns a new object of class '<em>Predefined Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Predefined Item</em>'.
-	 * @generated
-	 */
-	PredefinedItem createPredefinedItem();
-
-	/**
-	 * Returns a new object of class '<em>Predefined Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Predefined Menu</em>'.
-	 * @generated
-	 */
-	PredefinedMenu createPredefinedMenu();
-
-	/**
-	 * Returns a new object of class '<em>Menu Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Menu Action</em>'.
-	 * @generated
-	 */
-	MenuAction createMenuAction();
-
-	/**
-	 * Returns a new object of class '<em>Item Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Item Ref</em>'.
-	 * @generated
-	 */
-	ItemRef createItemRef();
-
-	/**
-	 * Returns a new object of class '<em>Context Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Context Menu</em>'.
-	 * @generated
-	 */
-	ContextMenu createContextMenu();
-
-	/**
-	 * Returns a new object of class '<em>Popup Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Popup Menu</em>'.
-	 * @generated
-	 */
-	PopupMenu createPopupMenu();
-
-	/**
-	 * Returns a new object of class '<em>Main Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Main Menu</em>'.
-	 * @generated
-	 */
-	MainMenu createMainMenu();
-
-	/**
-	 * Returns a new object of class '<em>Toolbar</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Toolbar</em>'.
-	 * @generated
-	 */
-	Toolbar createToolbar();
-
-	/**
-	 * Returns a new object of class '<em>Default Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Default Image</em>'.
-	 * @generated
-	 */
-	DefaultImage createDefaultImage();
-
-	/**
-	 * Returns a new object of class '<em>Bundle Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Bundle Image</em>'.
-	 * @generated
-	 */
-	BundleImage createBundleImage();
-
-	/**
-	 * Returns a new object of class '<em>Generic Style Selector</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Generic Style Selector</em>'.
-	 * @generated
-	 */
-	GenericStyleSelector createGenericStyleSelector();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	GMFToolPackage getGMFToolPackage();
-
-} //GMFToolFactory
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GMFToolPackage.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GMFToolPackage.java
deleted file mode 100644
index cb319da2018..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GMFToolPackage.java
+++ /dev/null
@@ -1,1821 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolFactory
- * @model kind="package"
- * @generated
- */
-public interface GMFToolPackage extends EPackage {
-
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "tooldef";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "gmftool";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	GMFToolPackage eINSTANCE = org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolRegistryImpl <em>Tool Registry</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.ToolRegistryImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getToolRegistry()
-	 * @generated
-	 */
-	int TOOL_REGISTRY = 0;
-
-	/**
-	 * The feature id for the '<em><b>Shared Actions</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_REGISTRY__SHARED_ACTIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>All Menus</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_REGISTRY__ALL_MENUS = 1;
-
-	/**
-	 * The feature id for the '<em><b>Palette</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_REGISTRY__PALETTE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Tool Registry</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_REGISTRY_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.AbstractToolImpl <em>Abstract Tool</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.AbstractToolImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getAbstractTool()
-	 * @generated
-	 */
-	int ABSTRACT_TOOL = 1;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TOOL__SMALL_ICON = 0;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TOOL__LARGE_ICON = 1;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TOOL__TITLE = 2;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TOOL__DESCRIPTION = 3;
-
-	/**
-	 * The number of structural features of the '<em>Abstract Tool</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ABSTRACT_TOOL_FEATURE_COUNT = 4;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolContainerImpl <em>Tool Container</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.ToolContainerImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getToolContainer()
-	 * @generated
-	 */
-	int TOOL_CONTAINER = 2;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_CONTAINER__SMALL_ICON = ABSTRACT_TOOL__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_CONTAINER__LARGE_ICON = ABSTRACT_TOOL__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_CONTAINER__TITLE = ABSTRACT_TOOL__TITLE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_CONTAINER__DESCRIPTION = ABSTRACT_TOOL__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Tools</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_CONTAINER__TOOLS = ABSTRACT_TOOL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Tool Container</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_CONTAINER_FEATURE_COUNT = ABSTRACT_TOOL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.PaletteSeparatorImpl <em>Palette Separator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.PaletteSeparatorImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getPaletteSeparator()
-	 * @generated
-	 */
-	int PALETTE_SEPARATOR = 3;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_SEPARATOR__SMALL_ICON = ABSTRACT_TOOL__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_SEPARATOR__LARGE_ICON = ABSTRACT_TOOL__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_SEPARATOR__TITLE = ABSTRACT_TOOL__TITLE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_SEPARATOR__DESCRIPTION = ABSTRACT_TOOL__DESCRIPTION;
-
-	/**
-	 * The number of structural features of the '<em>Palette Separator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_SEPARATOR_FEATURE_COUNT = ABSTRACT_TOOL_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolGroupImpl <em>Tool Group</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.ToolGroupImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getToolGroup()
-	 * @generated
-	 */
-	int TOOL_GROUP = 4;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP__SMALL_ICON = TOOL_CONTAINER__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP__LARGE_ICON = TOOL_CONTAINER__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP__TITLE = TOOL_CONTAINER__TITLE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP__DESCRIPTION = TOOL_CONTAINER__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Tools</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP__TOOLS = TOOL_CONTAINER__TOOLS;
-
-	/**
-	 * The feature id for the '<em><b>Collapsible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP__COLLAPSIBLE = TOOL_CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Stack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP__STACK = TOOL_CONTAINER_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Active</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP__ACTIVE = TOOL_CONTAINER_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Tool Group</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOL_GROUP_FEATURE_COUNT = TOOL_CONTAINER_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.PaletteImpl <em>Palette</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.PaletteImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getPalette()
-	 * @generated
-	 */
-	int PALETTE = 5;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE__SMALL_ICON = TOOL_CONTAINER__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE__LARGE_ICON = TOOL_CONTAINER__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE__TITLE = TOOL_CONTAINER__TITLE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE__DESCRIPTION = TOOL_CONTAINER__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Tools</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE__TOOLS = TOOL_CONTAINER__TOOLS;
-
-	/**
-	 * The feature id for the '<em><b>Default</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE__DEFAULT = TOOL_CONTAINER_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Palette</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PALETTE_FEATURE_COUNT = TOOL_CONTAINER_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.StandardToolImpl <em>Standard Tool</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.StandardToolImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getStandardTool()
-	 * @generated
-	 */
-	int STANDARD_TOOL = 6;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STANDARD_TOOL__SMALL_ICON = ABSTRACT_TOOL__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STANDARD_TOOL__LARGE_ICON = ABSTRACT_TOOL__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STANDARD_TOOL__TITLE = ABSTRACT_TOOL__TITLE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STANDARD_TOOL__DESCRIPTION = ABSTRACT_TOOL__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Tool Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STANDARD_TOOL__TOOL_KIND = ABSTRACT_TOOL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Standard Tool</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STANDARD_TOOL_FEATURE_COUNT = ABSTRACT_TOOL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.CreationToolImpl <em>Creation Tool</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.CreationToolImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getCreationTool()
-	 * @generated
-	 */
-	int CREATION_TOOL = 7;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CREATION_TOOL__SMALL_ICON = ABSTRACT_TOOL__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CREATION_TOOL__LARGE_ICON = ABSTRACT_TOOL__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CREATION_TOOL__TITLE = ABSTRACT_TOOL__TITLE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CREATION_TOOL__DESCRIPTION = ABSTRACT_TOOL__DESCRIPTION;
-
-	/**
-	 * The number of structural features of the '<em>Creation Tool</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CREATION_TOOL_FEATURE_COUNT = ABSTRACT_TOOL_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.GenericToolImpl <em>Generic Tool</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GenericToolImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getGenericTool()
-	 * @generated
-	 */
-	int GENERIC_TOOL = 8;
-
-	/**
-	 * The feature id for the '<em><b>Small Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERIC_TOOL__SMALL_ICON = ABSTRACT_TOOL__SMALL_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Large Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERIC_TOOL__LARGE_ICON = ABSTRACT_TOOL__LARGE_ICON;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERIC_TOOL__TITLE = ABSTRACT_TOOL__TITLE;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERIC_TOOL__DESCRIPTION = ABSTRACT_TOOL__DESCRIPTION;
-
-	/**
-	 * The feature id for the '<em><b>Tool Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERIC_TOOL__TOOL_CLASS = ABSTRACT_TOOL_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Generic Tool</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERIC_TOOL_FEATURE_COUNT = ABSTRACT_TOOL_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.ItemBase <em>Item Base</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.ItemBase
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getItemBase()
-	 * @generated
-	 */
-	int ITEM_BASE = 9;
-
-	/**
-	 * The number of structural features of the '<em>Item Base</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITEM_BASE_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.MenuImpl <em>Menu</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.MenuImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getMenu()
-	 * @generated
-	 */
-	int MENU = 10;
-
-	/**
-	 * The feature id for the '<em><b>Items</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU__ITEMS = 0;
-
-	/**
-	 * The number of structural features of the '<em>Menu</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.SeparatorImpl <em>Separator</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.SeparatorImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getSeparator()
-	 * @generated
-	 */
-	int SEPARATOR = 11;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEPARATOR__NAME = ITEM_BASE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Separator</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int SEPARATOR_FEATURE_COUNT = ITEM_BASE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.PredefinedItemImpl <em>Predefined Item</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.PredefinedItemImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getPredefinedItem()
-	 * @generated
-	 */
-	int PREDEFINED_ITEM = 12;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDEFINED_ITEM__IDENTIFIER = ITEM_BASE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Predefined Item</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDEFINED_ITEM_FEATURE_COUNT = ITEM_BASE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.PredefinedMenuImpl <em>Predefined Menu</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.PredefinedMenuImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getPredefinedMenu()
-	 * @generated
-	 */
-	int PREDEFINED_MENU = 13;
-
-	/**
-	 * The feature id for the '<em><b>Items</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDEFINED_MENU__ITEMS = MENU__ITEMS;
-
-	/**
-	 * The feature id for the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDEFINED_MENU__IDENTIFIER = MENU_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Predefined Menu</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int PREDEFINED_MENU_FEATURE_COUNT = MENU_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem <em>Contribution Item</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.ContributionItem
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getContributionItem()
-	 * @generated
-	 */
-	int CONTRIBUTION_ITEM = 14;
-
-	/**
-	 * The feature id for the '<em><b>Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTRIBUTION_ITEM__ICON = ITEM_BASE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTRIBUTION_ITEM__TITLE = ITEM_BASE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Contribution Item</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTRIBUTION_ITEM_FEATURE_COUNT = ITEM_BASE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.MenuActionImpl <em>Menu Action</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.MenuActionImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getMenuAction()
-	 * @generated
-	 */
-	int MENU_ACTION = 15;
-
-	/**
-	 * The feature id for the '<em><b>Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU_ACTION__ICON = CONTRIBUTION_ITEM__ICON;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU_ACTION__TITLE = CONTRIBUTION_ITEM__TITLE;
-
-	/**
-	 * The feature id for the '<em><b>Kind</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU_ACTION__KIND = CONTRIBUTION_ITEM_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Hot Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU_ACTION__HOT_KEY = CONTRIBUTION_ITEM_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Menu Action</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MENU_ACTION_FEATURE_COUNT = CONTRIBUTION_ITEM_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.ItemRefImpl <em>Item Ref</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.ItemRefImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getItemRef()
-	 * @generated
-	 */
-	int ITEM_REF = 16;
-
-	/**
-	 * The feature id for the '<em><b>Item</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITEM_REF__ITEM = ITEM_BASE_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Item Ref</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ITEM_REF_FEATURE_COUNT = ITEM_BASE_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.ContextMenuImpl <em>Context Menu</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.ContextMenuImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getContextMenu()
-	 * @generated
-	 */
-	int CONTEXT_MENU = 17;
-
-	/**
-	 * The feature id for the '<em><b>Items</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTEXT_MENU__ITEMS = MENU__ITEMS;
-
-	/**
-	 * The feature id for the '<em><b>Default</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTEXT_MENU__DEFAULT = MENU_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Context Menu</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int CONTEXT_MENU_FEATURE_COUNT = MENU_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.PopupMenuImpl <em>Popup Menu</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.PopupMenuImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getPopupMenu()
-	 * @generated
-	 */
-	int POPUP_MENU = 18;
-
-	/**
-	 * The feature id for the '<em><b>Items</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POPUP_MENU__ITEMS = MENU__ITEMS;
-
-	/**
-	 * The feature id for the '<em><b>Icon</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POPUP_MENU__ICON = MENU_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POPUP_MENU__TITLE = MENU_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POPUP_MENU__ID = MENU_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>Popup Menu</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int POPUP_MENU_FEATURE_COUNT = MENU_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.MainMenuImpl <em>Main Menu</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.MainMenuImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getMainMenu()
-	 * @generated
-	 */
-	int MAIN_MENU = 19;
-
-	/**
-	 * The feature id for the '<em><b>Items</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAIN_MENU__ITEMS = MENU__ITEMS;
-
-	/**
-	 * The feature id for the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAIN_MENU__TITLE = MENU_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Main Menu</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int MAIN_MENU_FEATURE_COUNT = MENU_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolbarImpl <em>Toolbar</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.ToolbarImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getToolbar()
-	 * @generated
-	 */
-	int TOOLBAR = 20;
-
-	/**
-	 * The feature id for the '<em><b>Items</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOLBAR__ITEMS = MENU__ITEMS;
-
-	/**
-	 * The number of structural features of the '<em>Toolbar</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TOOLBAR_FEATURE_COUNT = MENU_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.Image <em>Image</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.Image
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getImage()
-	 * @generated
-	 */
-	int IMAGE = 21;
-
-	/**
-	 * The number of structural features of the '<em>Image</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMAGE_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.DefaultImageImpl <em>Default Image</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.DefaultImageImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getDefaultImage()
-	 * @generated
-	 */
-	int DEFAULT_IMAGE = 22;
-
-	/**
-	 * The number of structural features of the '<em>Default Image</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DEFAULT_IMAGE_FEATURE_COUNT = IMAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.BundleImageImpl <em>Bundle Image</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.BundleImageImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getBundleImage()
-	 * @generated
-	 */
-	int BUNDLE_IMAGE = 23;
-
-	/**
-	 * The feature id for the '<em><b>Path</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BUNDLE_IMAGE__PATH = IMAGE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Bundle</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BUNDLE_IMAGE__BUNDLE = IMAGE_FEATURE_COUNT + 1;
-
-	/**
-	 * The number of structural features of the '<em>Bundle Image</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int BUNDLE_IMAGE_FEATURE_COUNT = IMAGE_FEATURE_COUNT + 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.StyleSelector <em>Style Selector</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.StyleSelector
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getStyleSelector()
-	 * @generated
-	 */
-	int STYLE_SELECTOR = 24;
-
-	/**
-	 * The number of structural features of the '<em>Style Selector</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int STYLE_SELECTOR_FEATURE_COUNT = 0;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.impl.GenericStyleSelectorImpl <em>Generic Style Selector</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GenericStyleSelectorImpl
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getGenericStyleSelector()
-	 * @generated
-	 */
-	int GENERIC_STYLE_SELECTOR = 25;
-
-	/**
-	 * The feature id for the '<em><b>Values</b></em>' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERIC_STYLE_SELECTOR__VALUES = STYLE_SELECTOR_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>Generic Style Selector</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int GENERIC_STYLE_SELECTOR_FEATURE_COUNT = STYLE_SELECTOR_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.StandardToolKind <em>Standard Tool Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.StandardToolKind
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getStandardToolKind()
-	 * @generated
-	 */
-	int STANDARD_TOOL_KIND = 26;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.ActionKind <em>Action Kind</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.ActionKind
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getActionKind()
-	 * @generated
-	 */
-	int ACTION_KIND = 27;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.papyrus.gmf.tooldef.AppearanceStyle <em>Appearance Style</em>}' enum.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.papyrus.gmf.tooldef.AppearanceStyle
-	 * @see org.eclipse.papyrus.gmf.tooldef.impl.GMFToolPackageImpl#getAppearanceStyle()
-	 * @generated
-	 */
-	int APPEARANCE_STYLE = 28;
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry <em>Tool Registry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool Registry</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolRegistry
-	 * @generated
-	 */
-	EClass getToolRegistry();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getSharedActions <em>Shared Actions</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Shared Actions</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getSharedActions()
-	 * @see #getToolRegistry()
-	 * @generated
-	 */
-	EReference getToolRegistry_SharedActions();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getAllMenus <em>All Menus</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>All Menus</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getAllMenus()
-	 * @see #getToolRegistry()
-	 * @generated
-	 */
-	EReference getToolRegistry_AllMenus();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getPalette <em>Palette</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Palette</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getPalette()
-	 * @see #getToolRegistry()
-	 * @generated
-	 */
-	EReference getToolRegistry_Palette();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool <em>Abstract Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Abstract Tool</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.AbstractTool
-	 * @generated
-	 */
-	EClass getAbstractTool();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getSmallIcon <em>Small Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Small Icon</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.AbstractTool#getSmallIcon()
-	 * @see #getAbstractTool()
-	 * @generated
-	 */
-	EReference getAbstractTool_SmallIcon();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getLargeIcon <em>Large Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Large Icon</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.AbstractTool#getLargeIcon()
-	 * @see #getAbstractTool()
-	 * @generated
-	 */
-	EReference getAbstractTool_LargeIcon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Title</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.AbstractTool#getTitle()
-	 * @see #getAbstractTool()
-	 * @generated
-	 */
-	EAttribute getAbstractTool_Title();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.AbstractTool#getDescription()
-	 * @see #getAbstractTool()
-	 * @generated
-	 */
-	EAttribute getAbstractTool_Description();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.ToolContainer <em>Tool Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool Container</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolContainer
-	 * @generated
-	 */
-	EClass getToolContainer();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.tooldef.ToolContainer#getTools <em>Tools</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Tools</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolContainer#getTools()
-	 * @see #getToolContainer()
-	 * @generated
-	 */
-	EReference getToolContainer_Tools();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.PaletteSeparator <em>Palette Separator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Palette Separator</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PaletteSeparator
-	 * @generated
-	 */
-	EClass getPaletteSeparator();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup <em>Tool Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Tool Group</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolGroup
-	 * @generated
-	 */
-	EClass getToolGroup();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#isCollapsible <em>Collapsible</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Collapsible</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolGroup#isCollapsible()
-	 * @see #getToolGroup()
-	 * @generated
-	 */
-	EAttribute getToolGroup_Collapsible();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#isStack <em>Stack</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Stack</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolGroup#isStack()
-	 * @see #getToolGroup()
-	 * @generated
-	 */
-	EAttribute getToolGroup_Stack();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#getActive <em>Active</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Active</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolGroup#getActive()
-	 * @see #getToolGroup()
-	 * @generated
-	 */
-	EReference getToolGroup_Active();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.Palette <em>Palette</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Palette</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Palette
-	 * @generated
-	 */
-	EClass getPalette();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.tooldef.Palette#getDefault <em>Default</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Default</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Palette#getDefault()
-	 * @see #getPalette()
-	 * @generated
-	 */
-	EReference getPalette_Default();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.StandardTool <em>Standard Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Standard Tool</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.StandardTool
-	 * @generated
-	 */
-	EClass getStandardTool();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.StandardTool#getToolKind <em>Tool Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Tool Kind</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.StandardTool#getToolKind()
-	 * @see #getStandardTool()
-	 * @generated
-	 */
-	EAttribute getStandardTool_ToolKind();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.CreationTool <em>Creation Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Creation Tool</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.CreationTool
-	 * @generated
-	 */
-	EClass getCreationTool();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.GenericTool <em>Generic Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Generic Tool</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GenericTool
-	 * @generated
-	 */
-	EClass getGenericTool();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.GenericTool#getToolClass <em>Tool Class</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Tool Class</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GenericTool#getToolClass()
-	 * @see #getGenericTool()
-	 * @generated
-	 */
-	EAttribute getGenericTool_ToolClass();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.ItemBase <em>Item Base</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Item Base</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ItemBase
-	 * @generated
-	 */
-	EClass getItemBase();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.Menu <em>Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Menu</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Menu
-	 * @generated
-	 */
-	EClass getMenu();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.papyrus.gmf.tooldef.Menu#getItems <em>Items</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Items</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Menu#getItems()
-	 * @see #getMenu()
-	 * @generated
-	 */
-	EReference getMenu_Items();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.Separator <em>Separator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Separator</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Separator
-	 * @generated
-	 */
-	EClass getSeparator();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.Separator#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Separator#getName()
-	 * @see #getSeparator()
-	 * @generated
-	 */
-	EAttribute getSeparator_Name();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.PredefinedItem <em>Predefined Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Predefined Item</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PredefinedItem
-	 * @generated
-	 */
-	EClass getPredefinedItem();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.PredefinedItem#getIdentifier <em>Identifier</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Identifier</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PredefinedItem#getIdentifier()
-	 * @see #getPredefinedItem()
-	 * @generated
-	 */
-	EAttribute getPredefinedItem_Identifier();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.PredefinedMenu <em>Predefined Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Predefined Menu</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PredefinedMenu
-	 * @generated
-	 */
-	EClass getPredefinedMenu();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem <em>Contribution Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Contribution Item</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ContributionItem
-	 * @generated
-	 */
-	EClass getContributionItem();
-
-	/**
-	 * Returns the meta object for the containment reference '{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem#getIcon <em>Icon</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference '<em>Icon</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ContributionItem#getIcon()
-	 * @see #getContributionItem()
-	 * @generated
-	 */
-	EReference getContributionItem_Icon();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Title</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ContributionItem#getTitle()
-	 * @see #getContributionItem()
-	 * @generated
-	 */
-	EAttribute getContributionItem_Title();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.MenuAction <em>Menu Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Menu Action</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.MenuAction
-	 * @generated
-	 */
-	EClass getMenuAction();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.MenuAction#getKind <em>Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Kind</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.MenuAction#getKind()
-	 * @see #getMenuAction()
-	 * @generated
-	 */
-	EAttribute getMenuAction_Kind();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.MenuAction#getHotKey <em>Hot Key</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hot Key</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.MenuAction#getHotKey()
-	 * @see #getMenuAction()
-	 * @generated
-	 */
-	EAttribute getMenuAction_HotKey();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.ItemRef <em>Item Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Item Ref</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ItemRef
-	 * @generated
-	 */
-	EClass getItemRef();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.tooldef.ItemRef#getItem <em>Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Item</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ItemRef#getItem()
-	 * @see #getItemRef()
-	 * @generated
-	 */
-	EReference getItemRef_Item();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.ContextMenu <em>Context Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Context Menu</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ContextMenu
-	 * @generated
-	 */
-	EClass getContextMenu();
-
-	/**
-	 * Returns the meta object for the reference '{@link org.eclipse.papyrus.gmf.tooldef.ContextMenu#getDefault <em>Default</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the reference '<em>Default</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ContextMenu#getDefault()
-	 * @see #getContextMenu()
-	 * @generated
-	 */
-	EReference getContextMenu_Default();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.PopupMenu <em>Popup Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Popup Menu</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PopupMenu
-	 * @generated
-	 */
-	EClass getPopupMenu();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.PopupMenu#getID <em>ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>ID</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PopupMenu#getID()
-	 * @see #getPopupMenu()
-	 * @generated
-	 */
-	EAttribute getPopupMenu_ID();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.MainMenu <em>Main Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Main Menu</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.MainMenu
-	 * @generated
-	 */
-	EClass getMainMenu();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.MainMenu#getTitle <em>Title</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Title</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.MainMenu#getTitle()
-	 * @see #getMainMenu()
-	 * @generated
-	 */
-	EAttribute getMainMenu_Title();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.Toolbar <em>Toolbar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Toolbar</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Toolbar
-	 * @generated
-	 */
-	EClass getToolbar();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.Image <em>Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Image</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Image
-	 * @generated
-	 */
-	EClass getImage();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.DefaultImage <em>Default Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Default Image</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.DefaultImage
-	 * @generated
-	 */
-	EClass getDefaultImage();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.BundleImage <em>Bundle Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Bundle Image</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.BundleImage
-	 * @generated
-	 */
-	EClass getBundleImage();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.BundleImage#getPath <em>Path</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Path</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.BundleImage#getPath()
-	 * @see #getBundleImage()
-	 * @generated
-	 */
-	EAttribute getBundleImage_Path();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.papyrus.gmf.tooldef.BundleImage#getBundle <em>Bundle</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Bundle</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.BundleImage#getBundle()
-	 * @see #getBundleImage()
-	 * @generated
-	 */
-	EAttribute getBundleImage_Bundle();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.StyleSelector <em>Style Selector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Style Selector</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.StyleSelector
-	 * @generated
-	 */
-	EClass getStyleSelector();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector <em>Generic Style Selector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Generic Style Selector</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector
-	 * @generated
-	 */
-	EClass getGenericStyleSelector();
-
-	/**
-	 * Returns the meta object for the attribute list '{@link org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector#getValues <em>Values</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute list '<em>Values</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector#getValues()
-	 * @see #getGenericStyleSelector()
-	 * @generated
-	 */
-	EAttribute getGenericStyleSelector_Values();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.tooldef.StandardToolKind <em>Standard Tool Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Standard Tool Kind</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.StandardToolKind
-	 * @generated
-	 */
-	EEnum getStandardToolKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.tooldef.ActionKind <em>Action Kind</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Action Kind</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ActionKind
-	 * @generated
-	 */
-	EEnum getActionKind();
-
-	/**
-	 * Returns the meta object for enum '{@link org.eclipse.papyrus.gmf.tooldef.AppearanceStyle <em>Appearance Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for enum '<em>Appearance Style</em>'.
-	 * @see org.eclipse.papyrus.gmf.tooldef.AppearanceStyle
-	 * @generated
-	 */
-	EEnum getAppearanceStyle();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	GMFToolFactory getGMFToolFactory();
-
-} //GMFToolPackage
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GenericStyleSelector.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GenericStyleSelector.java
deleted file mode 100644
index 6d9b360da50..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GenericStyleSelector.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Generic Style Selector</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector#getValues <em>Values</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getGenericStyleSelector()
- * @model
- * @generated
- */
-public interface GenericStyleSelector extends StyleSelector {
-
-	/**
-	 * Returns the value of the '<em><b>Values</b></em>' attribute list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.tooldef.AppearanceStyle}.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.tooldef.AppearanceStyle}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Values</em>' attribute list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Values</em>' attribute list.
-	 * @see org.eclipse.papyrus.gmf.tooldef.AppearanceStyle
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getGenericStyleSelector_Values()
-	 * @model required="true"
-	 * @generated
-	 */
-	EList<AppearanceStyle> getValues();
-
-} // GenericStyleSelector
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GenericTool.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GenericTool.java
deleted file mode 100644
index b6b07e3ef5b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/GenericTool.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Generic Tool</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.GenericTool#getToolClass <em>Tool Class</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getGenericTool()
- * @model
- * @generated
- */
-public interface GenericTool extends AbstractTool {
-
-	/**
-	 * Returns the value of the '<em><b>Tool Class</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Class</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Class</em>' attribute.
-	 * @see #setToolClass(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getGenericTool_ToolClass()
-	 * @model required="true"
-	 * @generated
-	 */
-	String getToolClass();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.GenericTool#getToolClass <em>Tool Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tool Class</em>' attribute.
-	 * @see #getToolClass()
-	 * @generated
-	 */
-	void setToolClass(String value);
-
-} // GenericTool
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Image.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Image.java
deleted file mode 100644
index e21fa526960..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Image.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Image</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getImage()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface Image extends EObject {
-} // Image
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ItemBase.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ItemBase.java
deleted file mode 100644
index 36d3a700360..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ItemBase.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Item Base</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getItemBase()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface ItemBase extends EObject {
-} // ItemBase
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ItemRef.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ItemRef.java
deleted file mode 100644
index 9b4bd8b5fa1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ItemRef.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Item Ref</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ItemRef#getItem <em>Item</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getItemRef()
- * @model
- * @generated
- */
-public interface ItemRef extends ItemBase {
-
-	/**
-	 * Returns the value of the '<em><b>Item</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Item</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Item</em>' reference.
-	 * @see #setItem(ItemBase)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getItemRef_Item()
-	 * @model required="true"
-	 * @generated
-	 */
-	ItemBase getItem();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.ItemRef#getItem <em>Item</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Item</em>' reference.
-	 * @see #getItem()
-	 * @generated
-	 */
-	void setItem(ItemBase value);
-
-} // ItemRef
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/MainMenu.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/MainMenu.java
deleted file mode 100644
index 486d5f0309d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/MainMenu.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Main Menu</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * no default action and no id, just a collection of items
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.MainMenu#getTitle <em>Title</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getMainMenu()
- * @model
- * @generated
- */
-public interface MainMenu extends Menu {
-
-	/**
-	 * Returns the value of the '<em><b>Title</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Title</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Title</em>' attribute.
-	 * @see #setTitle(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getMainMenu_Title()
-	 * @model
-	 * @generated
-	 */
-	String getTitle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.MainMenu#getTitle <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Title</em>' attribute.
-	 * @see #getTitle()
-	 * @generated
-	 */
-	void setTitle(String value);
-
-} // MainMenu
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Menu.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Menu.java
deleted file mode 100644
index 501982039ac..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Menu.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Menu</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.Menu#getItems <em>Items</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getMenu()
- * @model abstract="true"
- * @generated
- */
-public interface Menu extends EObject {
-
-	/**
-	 * Returns the value of the '<em><b>Items</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.tooldef.ItemBase}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Items</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Items</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getMenu_Items()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<ItemBase> getItems();
-
-} // Menu
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/MenuAction.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/MenuAction.java
deleted file mode 100644
index 9ed57417501..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/MenuAction.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Menu Action</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.MenuAction#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.MenuAction#getHotKey <em>Hot Key</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getMenuAction()
- * @model
- * @generated
- */
-public interface MenuAction extends ContributionItem {
-
-	/**
-	 * Returns the value of the '<em><b>Kind</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.tooldef.ActionKind}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ActionKind
-	 * @see #setKind(ActionKind)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getMenuAction_Kind()
-	 * @model
-	 * @generated
-	 */
-	ActionKind getKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.MenuAction#getKind <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Kind</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ActionKind
-	 * @see #getKind()
-	 * @generated
-	 */
-	void setKind(ActionKind value);
-
-	/**
-	 * Returns the value of the '<em><b>Hot Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hot Key</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Hot Key</em>' attribute.
-	 * @see #setHotKey(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getMenuAction_HotKey()
-	 * @model
-	 * @generated
-	 */
-	String getHotKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.MenuAction#getHotKey <em>Hot Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hot Key</em>' attribute.
-	 * @see #getHotKey()
-	 * @generated
-	 */
-	void setHotKey(String value);
-
-} // MenuAction
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Palette.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Palette.java
deleted file mode 100644
index 7a5a158b373..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Palette.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Palette</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.Palette#getDefault <em>Default</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getPalette()
- * @model
- * @generated
- */
-public interface Palette extends ToolContainer {
-
-	/**
-	 * Returns the value of the '<em><b>Default</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default</em>' reference.
-	 * @see #setDefault(AbstractTool)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getPalette_Default()
-	 * @model
-	 * @generated
-	 */
-	AbstractTool getDefault();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.Palette#getDefault <em>Default</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default</em>' reference.
-	 * @see #getDefault()
-	 * @generated
-	 */
-	void setDefault(AbstractTool value);
-
-} // Palette
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PaletteSeparator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PaletteSeparator.java
deleted file mode 100644
index 424c2c7f912..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PaletteSeparator.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Palette Separator</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getPaletteSeparator()
- * @model
- * @generated
- */
-public interface PaletteSeparator extends AbstractTool {
-} // PaletteSeparator
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PopupMenu.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PopupMenu.java
deleted file mode 100644
index 28b0dc9e84f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PopupMenu.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Popup Menu</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.PopupMenu#getID <em>ID</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getPopupMenu()
- * @model
- * @generated
- */
-public interface PopupMenu extends Menu, ContributionItem {
-
-	/**
-	 * Returns the value of the '<em><b>ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>ID</em>' attribute.
-	 * @see #setID(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getPopupMenu_ID()
-	 * @model id="true"
-	 * @generated
-	 */
-	String getID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.PopupMenu#getID <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ID</em>' attribute.
-	 * @see #getID()
-	 * @generated
-	 */
-	void setID(String value);
-
-} // PopupMenu
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PredefinedItem.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PredefinedItem.java
deleted file mode 100644
index dbe1c08d7b1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PredefinedItem.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Predefined Item</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.PredefinedItem#getIdentifier <em>Identifier</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getPredefinedItem()
- * @model
- * @generated
- */
-public interface PredefinedItem extends ItemBase {
-
-	/**
-	 * Returns the value of the '<em><b>Identifier</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Identifier</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Identifier</em>' attribute.
-	 * @see #setIdentifier(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getPredefinedItem_Identifier()
-	 * @model
-	 * @generated
-	 */
-	String getIdentifier();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.PredefinedItem#getIdentifier <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Identifier</em>' attribute.
-	 * @see #getIdentifier()
-	 * @generated
-	 */
-	void setIdentifier(String value);
-
-} // PredefinedItem
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PredefinedMenu.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PredefinedMenu.java
deleted file mode 100644
index 83b6fd64b20..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/PredefinedMenu.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Predefined Menu</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getPredefinedMenu()
- * @model
- * @generated
- */
-public interface PredefinedMenu extends Menu, PredefinedItem {
-} // PredefinedMenu
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Separator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Separator.java
deleted file mode 100644
index be3ec6d993b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Separator.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Separator</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.Separator#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getSeparator()
- * @model
- * @generated
- */
-public interface Separator extends ItemBase {
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getSeparator_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.Separator#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // Separator
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StandardTool.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StandardTool.java
deleted file mode 100644
index 7025f3b5637..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StandardTool.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Standard Tool</b></em>'.
- * <!-- end-user-doc -->
- *
- * <!-- begin-model-doc -->
- * predefined, like zoom or marquee
- * <!-- end-model-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.StandardTool#getToolKind <em>Tool Kind</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getStandardTool()
- * @model
- * @generated
- */
-public interface StandardTool extends AbstractTool {
-
-	/**
-	 * Returns the value of the '<em><b>Tool Kind</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.papyrus.gmf.tooldef.StandardToolKind}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tool Kind</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tool Kind</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.tooldef.StandardToolKind
-	 * @see #setToolKind(StandardToolKind)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getStandardTool_ToolKind()
-	 * @model
-	 * @generated
-	 */
-	StandardToolKind getToolKind();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.StandardTool#getToolKind <em>Tool Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Tool Kind</em>' attribute.
-	 * @see org.eclipse.papyrus.gmf.tooldef.StandardToolKind
-	 * @see #getToolKind()
-	 * @generated
-	 */
-	void setToolKind(StandardToolKind value);
-
-} // StandardTool
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StandardToolKind.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StandardToolKind.java
deleted file mode 100644
index 82b5611ac38..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StandardToolKind.java
+++ /dev/null
@@ -1,326 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Standard Tool Kind</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getStandardToolKind()
- * @model
- * @generated
- */
-public enum StandardToolKind implements Enumerator {
-	/**
-	 * The '<em><b>SELECT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SELECT
-	 * @generated
-	 * @ordered
-	 */
-	SELECT_LITERAL(0, "SELECT", "SELECT"),
-	/**
-	 * The '<em><b>SELECT PAN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SELECT_PAN
-	 * @generated
-	 * @ordered
-	 */
-	SELECT_PAN_LITERAL(1, "SELECT_PAN", "SELECT_PAN"),
-	/**
-	 * The '<em><b>MARQUEE</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #MARQUEE
-	 * @generated
-	 * @ordered
-	 */
-	MARQUEE_LITERAL(2, "MARQUEE", "MARQUEE"),
-	/**
-	 * The '<em><b>ZOOM PAN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ZOOM_PAN
-	 * @generated
-	 * @ordered
-	 */
-	ZOOM_PAN_LITERAL(3, "ZOOM_PAN", "ZOOM_PAN"),
-	/**
-	 * The '<em><b>ZOOM IN</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ZOOM_IN
-	 * @generated
-	 * @ordered
-	 */
-	ZOOM_IN_LITERAL(4, "ZOOM_IN", "ZOOM_IN"),
-	/**
-	 * The '<em><b>ZOOM OUT</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ZOOM_OUT
-	 * @generated
-	 * @ordered
-	 */
-	ZOOM_OUT_LITERAL(5, "ZOOM_OUT", "ZOOM_OUT");
-
-	/**
-	 * The '<em><b>SELECT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SELECT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SELECT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SELECT = 0;
-
-	/**
-	 * The '<em><b>SELECT PAN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>SELECT PAN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SELECT_PAN_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SELECT_PAN = 1;
-
-	/**
-	 * The '<em><b>MARQUEE</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>MARQUEE</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #MARQUEE_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int MARQUEE = 2;
-
-	/**
-	 * The '<em><b>ZOOM PAN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ZOOM PAN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ZOOM_PAN_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ZOOM_PAN = 3;
-
-	/**
-	 * The '<em><b>ZOOM IN</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ZOOM IN</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ZOOM_IN_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ZOOM_IN = 4;
-
-	/**
-	 * The '<em><b>ZOOM OUT</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>ZOOM OUT</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ZOOM_OUT_LITERAL
-	 * @model
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ZOOM_OUT = 5;
-
-	/**
-	 * An array of all the '<em><b>Standard Tool Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final StandardToolKind[] VALUES_ARRAY = new StandardToolKind[] { SELECT_LITERAL, SELECT_PAN_LITERAL, MARQUEE_LITERAL, ZOOM_PAN_LITERAL, ZOOM_IN_LITERAL, ZOOM_OUT_LITERAL, };
-
-	/**
-	 * A public read-only list of all the '<em><b>Standard Tool Kind</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<StandardToolKind> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>Standard Tool Kind</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static StandardToolKind get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			StandardToolKind result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Standard Tool Kind</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static StandardToolKind getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			StandardToolKind result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>Standard Tool Kind</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static StandardToolKind get(int value) {
-		switch (value) {
-		case SELECT:
-			return SELECT_LITERAL;
-		case SELECT_PAN:
-			return SELECT_PAN_LITERAL;
-		case MARQUEE:
-			return MARQUEE_LITERAL;
-		case ZOOM_PAN:
-			return ZOOM_PAN_LITERAL;
-		case ZOOM_IN:
-			return ZOOM_IN_LITERAL;
-		case ZOOM_OUT:
-			return ZOOM_OUT_LITERAL;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private StandardToolKind(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-		return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StyleSelector.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StyleSelector.java
deleted file mode 100644
index 9122de9f528..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/StyleSelector.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Style Selector</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getStyleSelector()
- * @model interface="true" abstract="true"
- * @generated
- */
-public interface StyleSelector extends EObject {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	boolean isOk(Object style);
-
-} // StyleSelector
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolContainer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolContainer.java
deleted file mode 100644
index 4b2ae9b43e9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolContainer.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ToolContainer#getTools <em>Tools</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolContainer()
- * @model abstract="true"
- * @generated
- */
-public interface ToolContainer extends AbstractTool {
-
-	/**
-	 * Returns the value of the '<em><b>Tools</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.tooldef.AbstractTool}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Tools</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Tools</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolContainer_Tools()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<AbstractTool> getTools();
-
-} // ToolContainer
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolGroup.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolGroup.java
deleted file mode 100644
index 1bfac90377e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolGroup.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool Group</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#isCollapsible <em>Collapsible</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#isStack <em>Stack</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#getActive <em>Active</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolGroup()
- * @model
- * @generated
- */
-public interface ToolGroup extends ToolContainer {
-
-	/**
-	 * Returns the value of the '<em><b>Collapsible</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Collapsible</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Collapsible</em>' attribute.
-	 * @see #setCollapsible(boolean)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolGroup_Collapsible()
-	 * @model
-	 * @generated
-	 */
-	boolean isCollapsible();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#isCollapsible <em>Collapsible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Collapsible</em>' attribute.
-	 * @see #isCollapsible()
-	 * @generated
-	 */
-	void setCollapsible(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Stack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Stack</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Stack</em>' attribute.
-	 * @see #setStack(boolean)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolGroup_Stack()
-	 * @model
-	 * @generated
-	 */
-	boolean isStack();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#isStack <em>Stack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Stack</em>' attribute.
-	 * @see #isStack()
-	 * @generated
-	 */
-	void setStack(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Active</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Active</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Active</em>' reference.
-	 * @see #setActive(AbstractTool)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolGroup_Active()
-	 * @model
-	 * @generated
-	 */
-	AbstractTool getActive();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup#getActive <em>Active</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Active</em>' reference.
-	 * @see #getActive()
-	 * @generated
-	 */
-	void setActive(AbstractTool value);
-
-} // ToolGroup
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolRegistry.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolRegistry.java
deleted file mode 100644
index c2da1ecb41e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/ToolRegistry.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Tool Registry</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getSharedActions <em>Shared Actions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getAllMenus <em>All Menus</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getPalette <em>Palette</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolRegistry()
- * @model
- * @generated
- */
-public interface ToolRegistry extends EObject {
-
-	/**
-	 * Returns the value of the '<em><b>Shared Actions</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.tooldef.MenuAction}.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * <!-- begin-model-doc -->
-	 * Instead of placing	common actions somewhere in menu hierarchy and referencing them in (2..n) cases, keep them in this central registry and use ItemRef everywhere (i.e. in 1..n cases)
-	 * <!-- end-model-doc -->
-	 * @return the value of the '<em>Shared Actions</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolRegistry_SharedActions()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<MenuAction> getSharedActions();
-
-	/**
-	 * Returns the value of the '<em><b>All Menus</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.papyrus.gmf.tooldef.Menu}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>All Menus</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>All Menus</em>' containment reference list.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolRegistry_AllMenus()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Menu> getAllMenus();
-
-	/**
-	 * Returns the value of the '<em><b>Palette</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Palette</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Palette</em>' containment reference.
-	 * @see #setPalette(Palette)
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolRegistry_Palette()
-	 * @model containment="true"
-	 * @generated
-	 */
-	Palette getPalette();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry#getPalette <em>Palette</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Palette</em>' containment reference.
-	 * @see #getPalette()
-	 * @generated
-	 */
-	void setPalette(Palette value);
-
-} // ToolRegistry
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Toolbar.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Toolbar.java
deleted file mode 100644
index a718c82f765..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/Toolbar.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Toolbar</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#getToolbar()
- * @model
- * @generated
- */
-public interface Toolbar extends Menu {
-} // Toolbar
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/AbstractToolImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/AbstractToolImpl.java
deleted file mode 100644
index 40f567fa727..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/AbstractToolImpl.java
+++ /dev/null
@@ -1,387 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Image;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Abstract Tool</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.AbstractToolImpl#getSmallIcon <em>Small Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.AbstractToolImpl#getLargeIcon <em>Large Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.AbstractToolImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.AbstractToolImpl#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class AbstractToolImpl extends EObjectImpl implements AbstractTool {
-
-	/**
-	 * The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSmallIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected Image smallIcon;
-
-	/**
-	 * The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getLargeIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected Image largeIcon;
-
-	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TITLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String title = TITLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AbstractToolImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getAbstractTool();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Image getSmallIcon() {
-		return smallIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetSmallIcon(Image newSmallIcon, NotificationChain msgs) {
-		Image oldSmallIcon = smallIcon;
-		smallIcon = newSmallIcon;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON, oldSmallIcon, newSmallIcon);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSmallIcon(Image newSmallIcon) {
-		if (newSmallIcon != smallIcon) {
-			NotificationChain msgs = null;
-			if (smallIcon != null)
-				msgs = ((InternalEObject) smallIcon).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON, null, msgs);
-			if (newSmallIcon != null)
-				msgs = ((InternalEObject) newSmallIcon).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON, null, msgs);
-			msgs = basicSetSmallIcon(newSmallIcon, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON, newSmallIcon, newSmallIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Image getLargeIcon() {
-		return largeIcon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetLargeIcon(Image newLargeIcon, NotificationChain msgs) {
-		Image oldLargeIcon = largeIcon;
-		largeIcon = newLargeIcon;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON, oldLargeIcon, newLargeIcon);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setLargeIcon(Image newLargeIcon) {
-		if (newLargeIcon != largeIcon) {
-			NotificationChain msgs = null;
-			if (largeIcon != null)
-				msgs = ((InternalEObject) largeIcon).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON, null, msgs);
-			if (newLargeIcon != null)
-				msgs = ((InternalEObject) newLargeIcon).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON, null, msgs);
-			msgs = basicSetLargeIcon(newLargeIcon, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON, newLargeIcon, newLargeIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTitle(String newTitle) {
-		String oldTitle = title;
-		title = newTitle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.ABSTRACT_TOOL__TITLE, oldTitle, title));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.ABSTRACT_TOOL__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON:
-			return basicSetSmallIcon(null, msgs);
-		case GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON:
-			return basicSetLargeIcon(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON:
-			return getSmallIcon();
-		case GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON:
-			return getLargeIcon();
-		case GMFToolPackage.ABSTRACT_TOOL__TITLE:
-			return getTitle();
-		case GMFToolPackage.ABSTRACT_TOOL__DESCRIPTION:
-			return getDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON:
-			setSmallIcon((Image) newValue);
-			return;
-		case GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON:
-			setLargeIcon((Image) newValue);
-			return;
-		case GMFToolPackage.ABSTRACT_TOOL__TITLE:
-			setTitle((String) newValue);
-			return;
-		case GMFToolPackage.ABSTRACT_TOOL__DESCRIPTION:
-			setDescription((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON:
-			setSmallIcon((Image) null);
-			return;
-		case GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON:
-			setLargeIcon((Image) null);
-			return;
-		case GMFToolPackage.ABSTRACT_TOOL__TITLE:
-			setTitle(TITLE_EDEFAULT);
-			return;
-		case GMFToolPackage.ABSTRACT_TOOL__DESCRIPTION:
-			setDescription(DESCRIPTION_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.ABSTRACT_TOOL__SMALL_ICON:
-			return smallIcon != null;
-		case GMFToolPackage.ABSTRACT_TOOL__LARGE_ICON:
-			return largeIcon != null;
-		case GMFToolPackage.ABSTRACT_TOOL__TITLE:
-			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-		case GMFToolPackage.ABSTRACT_TOOL__DESCRIPTION:
-			return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (title: ");
-		result.append(title);
-		result.append(", description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AbstractToolImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/BundleImageImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/BundleImageImpl.java
deleted file mode 100644
index 0a33ef72614..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/BundleImageImpl.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.tooldef.BundleImage;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bundle Image</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.BundleImageImpl#getPath <em>Path</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.BundleImageImpl#getBundle <em>Bundle</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class BundleImageImpl extends EObjectImpl implements BundleImage {
-
-	/**
-	 * The default value of the '{@link #getPath() <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String PATH_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getPath() <em>Path</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPath()
-	 * @generated
-	 * @ordered
-	 */
-	protected String path = PATH_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBundle() <em>Bundle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBundle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String BUNDLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getBundle() <em>Bundle</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBundle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String bundle = BUNDLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected BundleImageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getBundleImage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getPath() {
-		return path;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPath(String newPath) {
-		String oldPath = path;
-		path = newPath;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.BUNDLE_IMAGE__PATH, oldPath, path));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getBundle() {
-		return bundle;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBundle(String newBundle) {
-		String oldBundle = bundle;
-		bundle = newBundle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.BUNDLE_IMAGE__BUNDLE, oldBundle, bundle));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.BUNDLE_IMAGE__PATH:
-			return getPath();
-		case GMFToolPackage.BUNDLE_IMAGE__BUNDLE:
-			return getBundle();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.BUNDLE_IMAGE__PATH:
-			setPath((String) newValue);
-			return;
-		case GMFToolPackage.BUNDLE_IMAGE__BUNDLE:
-			setBundle((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.BUNDLE_IMAGE__PATH:
-			setPath(PATH_EDEFAULT);
-			return;
-		case GMFToolPackage.BUNDLE_IMAGE__BUNDLE:
-			setBundle(BUNDLE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.BUNDLE_IMAGE__PATH:
-			return PATH_EDEFAULT == null ? path != null : !PATH_EDEFAULT.equals(path);
-		case GMFToolPackage.BUNDLE_IMAGE__BUNDLE:
-			return BUNDLE_EDEFAULT == null ? bundle != null : !BUNDLE_EDEFAULT.equals(bundle);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (path: ");
-		result.append(path);
-		result.append(", bundle: ");
-		result.append(bundle);
-		result.append(')');
-		return result.toString();
-	}
-
-} //BundleImageImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ContextMenuImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ContextMenuImpl.java
deleted file mode 100644
index 27e5c817fa9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ContextMenuImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.tooldef.ContextMenu;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.MenuAction;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Context Menu</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ContextMenuImpl#getDefault <em>Default</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ContextMenuImpl extends MenuImpl implements ContextMenu {
-
-	/**
-	 * The cached value of the '{@link #getDefault() <em>Default</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefault()
-	 * @generated
-	 * @ordered
-	 */
-	protected MenuAction default_;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContextMenuImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getContextMenu();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MenuAction getDefault() {
-		if (default_ != null && default_.eIsProxy()) {
-			InternalEObject oldDefault = (InternalEObject) default_;
-			default_ = (MenuAction) eResolveProxy(oldDefault);
-			if (default_ != oldDefault) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFToolPackage.CONTEXT_MENU__DEFAULT, oldDefault, default_));
-			}
-		}
-		return default_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MenuAction basicGetDefault() {
-		return default_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefault(MenuAction newDefault) {
-		MenuAction oldDefault = default_;
-		default_ = newDefault;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.CONTEXT_MENU__DEFAULT, oldDefault, default_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.CONTEXT_MENU__DEFAULT:
-			if (resolve)
-				return getDefault();
-			return basicGetDefault();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.CONTEXT_MENU__DEFAULT:
-			setDefault((MenuAction) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.CONTEXT_MENU__DEFAULT:
-			setDefault((MenuAction) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.CONTEXT_MENU__DEFAULT:
-			return default_ != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ContextMenuImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/CreationToolImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/CreationToolImpl.java
deleted file mode 100644
index 74a2cccfe46..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/CreationToolImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Creation Tool</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class CreationToolImpl extends AbstractToolImpl implements CreationTool {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected CreationToolImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getCreationTool();
-	}
-
-} //CreationToolImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/DefaultImageImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/DefaultImageImpl.java
deleted file mode 100644
index 571bb4b0040..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/DefaultImageImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.tooldef.DefaultImage;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Default Image</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class DefaultImageImpl extends EObjectImpl implements DefaultImage {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DefaultImageImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getDefaultImage();
-	}
-
-} //DefaultImageImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GMFToolFactoryImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GMFToolFactoryImpl.java
deleted file mode 100644
index fe74a35825e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GMFToolFactoryImpl.java
+++ /dev/null
@@ -1,452 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.papyrus.gmf.tooldef.ActionKind;
-import org.eclipse.papyrus.gmf.tooldef.AppearanceStyle;
-import org.eclipse.papyrus.gmf.tooldef.BundleImage;
-import org.eclipse.papyrus.gmf.tooldef.ContextMenu;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.DefaultImage;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-import org.eclipse.papyrus.gmf.tooldef.ItemRef;
-import org.eclipse.papyrus.gmf.tooldef.MainMenu;
-import org.eclipse.papyrus.gmf.tooldef.MenuAction;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.PaletteSeparator;
-import org.eclipse.papyrus.gmf.tooldef.PopupMenu;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedItem;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedMenu;
-import org.eclipse.papyrus.gmf.tooldef.Separator;
-import org.eclipse.papyrus.gmf.tooldef.StandardTool;
-import org.eclipse.papyrus.gmf.tooldef.StandardToolKind;
-import org.eclipse.papyrus.gmf.tooldef.ToolGroup;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-import org.eclipse.papyrus.gmf.tooldef.Toolbar;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFToolFactoryImpl extends EFactoryImpl implements GMFToolFactory {
-
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static GMFToolFactory init() {
-		try {
-			GMFToolFactory theGMFToolFactory = (GMFToolFactory) EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/papyrus/gmf/2020/ToolDefinition");
-			if (theGMFToolFactory != null) {
-				return theGMFToolFactory;
-			}
-		} catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new GMFToolFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-		case GMFToolPackage.TOOL_REGISTRY:
-			return createToolRegistry();
-		case GMFToolPackage.PALETTE_SEPARATOR:
-			return createPaletteSeparator();
-		case GMFToolPackage.TOOL_GROUP:
-			return createToolGroup();
-		case GMFToolPackage.PALETTE:
-			return createPalette();
-		case GMFToolPackage.STANDARD_TOOL:
-			return createStandardTool();
-		case GMFToolPackage.CREATION_TOOL:
-			return createCreationTool();
-		case GMFToolPackage.GENERIC_TOOL:
-			return createGenericTool();
-		case GMFToolPackage.SEPARATOR:
-			return createSeparator();
-		case GMFToolPackage.PREDEFINED_ITEM:
-			return createPredefinedItem();
-		case GMFToolPackage.PREDEFINED_MENU:
-			return createPredefinedMenu();
-		case GMFToolPackage.MENU_ACTION:
-			return createMenuAction();
-		case GMFToolPackage.ITEM_REF:
-			return createItemRef();
-		case GMFToolPackage.CONTEXT_MENU:
-			return createContextMenu();
-		case GMFToolPackage.POPUP_MENU:
-			return createPopupMenu();
-		case GMFToolPackage.MAIN_MENU:
-			return createMainMenu();
-		case GMFToolPackage.TOOLBAR:
-			return createToolbar();
-		case GMFToolPackage.DEFAULT_IMAGE:
-			return createDefaultImage();
-		case GMFToolPackage.BUNDLE_IMAGE:
-			return createBundleImage();
-		case GMFToolPackage.GENERIC_STYLE_SELECTOR:
-			return createGenericStyleSelector();
-		default:
-			throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object createFromString(EDataType eDataType, String initialValue) {
-		switch (eDataType.getClassifierID()) {
-		case GMFToolPackage.STANDARD_TOOL_KIND:
-			return createStandardToolKindFromString(eDataType, initialValue);
-		case GMFToolPackage.ACTION_KIND:
-			return createActionKindFromString(eDataType, initialValue);
-		case GMFToolPackage.APPEARANCE_STYLE:
-			return createAppearanceStyleFromString(eDataType, initialValue);
-		default:
-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String convertToString(EDataType eDataType, Object instanceValue) {
-		switch (eDataType.getClassifierID()) {
-		case GMFToolPackage.STANDARD_TOOL_KIND:
-			return convertStandardToolKindToString(eDataType, instanceValue);
-		case GMFToolPackage.ACTION_KIND:
-			return convertActionKindToString(eDataType, instanceValue);
-		case GMFToolPackage.APPEARANCE_STYLE:
-			return convertAppearanceStyleToString(eDataType, instanceValue);
-		default:
-			throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolRegistry createToolRegistry() {
-		ToolRegistryImpl toolRegistry = new ToolRegistryImpl();
-		return toolRegistry;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PaletteSeparator createPaletteSeparator() {
-		PaletteSeparatorImpl paletteSeparator = new PaletteSeparatorImpl();
-		return paletteSeparator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ToolGroup createToolGroup() {
-		ToolGroupImpl toolGroup = new ToolGroupImpl();
-		return toolGroup;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Palette createPalette() {
-		PaletteImpl palette = new PaletteImpl();
-		return palette;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StandardTool createStandardTool() {
-		StandardToolImpl standardTool = new StandardToolImpl();
-		return standardTool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public CreationTool createCreationTool() {
-		CreationToolImpl creationTool = new CreationToolImpl();
-		return creationTool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenericTool createGenericTool() {
-		GenericToolImpl genericTool = new GenericToolImpl();
-		return genericTool;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Separator createSeparator() {
-		SeparatorImpl separator = new SeparatorImpl();
-		return separator;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedItem createPredefinedItem() {
-		PredefinedItemImpl predefinedItem = new PredefinedItemImpl();
-		return predefinedItem;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PredefinedMenu createPredefinedMenu() {
-		PredefinedMenuImpl predefinedMenu = new PredefinedMenuImpl();
-		return predefinedMenu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MenuAction createMenuAction() {
-		MenuActionImpl menuAction = new MenuActionImpl();
-		return menuAction;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ItemRef createItemRef() {
-		ItemRefImpl itemRef = new ItemRefImpl();
-		return itemRef;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextMenu createContextMenu() {
-		ContextMenuImpl contextMenu = new ContextMenuImpl();
-		return contextMenu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public PopupMenu createPopupMenu() {
-		PopupMenuImpl popupMenu = new PopupMenuImpl();
-		return popupMenu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public MainMenu createMainMenu() {
-		MainMenuImpl mainMenu = new MainMenuImpl();
-		return mainMenu;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Toolbar createToolbar() {
-		ToolbarImpl toolbar = new ToolbarImpl();
-		return toolbar;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DefaultImage createDefaultImage() {
-		DefaultImageImpl defaultImage = new DefaultImageImpl();
-		return defaultImage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public BundleImage createBundleImage() {
-		BundleImageImpl bundleImage = new BundleImageImpl();
-		return bundleImage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GenericStyleSelector createGenericStyleSelector() {
-		GenericStyleSelectorImpl genericStyleSelector = new GenericStyleSelectorImpl();
-		return genericStyleSelector;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StandardToolKind createStandardToolKindFromString(EDataType eDataType, String initialValue) {
-		StandardToolKind result = StandardToolKind.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertStandardToolKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActionKind createActionKindFromString(EDataType eDataType, String initialValue) {
-		ActionKind result = ActionKind.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertActionKindToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AppearanceStyle createAppearanceStyleFromString(EDataType eDataType, String initialValue) {
-		AppearanceStyle result = AppearanceStyle.get(initialValue);
-		if (result == null)
-			throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-		return result;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String convertAppearanceStyleToString(EDataType eDataType, Object instanceValue) {
-		return instanceValue == null ? null : instanceValue.toString();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolPackage getGMFToolPackage() {
-		return (GMFToolPackage) getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static GMFToolPackage getPackage() {
-		return GMFToolPackage.eINSTANCE;
-	}
-
-} //GMFToolFactoryImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GMFToolPackageImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GMFToolPackageImpl.java
deleted file mode 100644
index e166f4552e3..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GMFToolPackageImpl.java
+++ /dev/null
@@ -1,1152 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.ActionKind;
-import org.eclipse.papyrus.gmf.tooldef.AppearanceStyle;
-import org.eclipse.papyrus.gmf.tooldef.BundleImage;
-import org.eclipse.papyrus.gmf.tooldef.ContextMenu;
-import org.eclipse.papyrus.gmf.tooldef.ContributionItem;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.DefaultImage;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolFactory;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-import org.eclipse.papyrus.gmf.tooldef.Image;
-import org.eclipse.papyrus.gmf.tooldef.ItemBase;
-import org.eclipse.papyrus.gmf.tooldef.ItemRef;
-import org.eclipse.papyrus.gmf.tooldef.MainMenu;
-import org.eclipse.papyrus.gmf.tooldef.Menu;
-import org.eclipse.papyrus.gmf.tooldef.MenuAction;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.PaletteSeparator;
-import org.eclipse.papyrus.gmf.tooldef.PopupMenu;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedItem;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedMenu;
-import org.eclipse.papyrus.gmf.tooldef.Separator;
-import org.eclipse.papyrus.gmf.tooldef.StandardTool;
-import org.eclipse.papyrus.gmf.tooldef.StandardToolKind;
-import org.eclipse.papyrus.gmf.tooldef.StyleSelector;
-import org.eclipse.papyrus.gmf.tooldef.ToolContainer;
-import org.eclipse.papyrus.gmf.tooldef.ToolGroup;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-import org.eclipse.papyrus.gmf.tooldef.Toolbar;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class GMFToolPackageImpl extends EPackageImpl implements GMFToolPackage {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolRegistryEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass abstractToolEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolContainerEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass paletteSeparatorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolGroupEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass paletteEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass standardToolEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass creationToolEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass genericToolEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass itemBaseEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass menuEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass separatorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass predefinedItemEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass predefinedMenuEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contributionItemEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass menuActionEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass itemRefEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass contextMenuEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass popupMenuEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass mainMenuEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass toolbarEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass imageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass defaultImageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass bundleImageEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass styleSelectorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass genericStyleSelectorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum standardToolKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum actionKindEEnum = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EEnum appearanceStyleEEnum = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private GMFToolPackageImpl() {
-		super(eNS_URI, GMFToolFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-	 * 
-	 * <p>This method is used to initialize {@link GMFToolPackage#eINSTANCE} when that field is accessed.
-	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static GMFToolPackage init() {
-		if (isInited)
-			return (GMFToolPackage) EPackage.Registry.INSTANCE.getEPackage(GMFToolPackage.eNS_URI);
-
-		// Obtain or create and register package
-		GMFToolPackageImpl theGMFToolPackage = (GMFToolPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof GMFToolPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
-				: new GMFToolPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theGMFToolPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theGMFToolPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theGMFToolPackage.freeze();
-
-		// Update the registry and return the package
-		EPackage.Registry.INSTANCE.put(GMFToolPackage.eNS_URI, theGMFToolPackage);
-		return theGMFToolPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getToolRegistry() {
-		return toolRegistryEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getToolRegistry_SharedActions() {
-		return (EReference) toolRegistryEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getToolRegistry_AllMenus() {
-		return (EReference) toolRegistryEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getToolRegistry_Palette() {
-		return (EReference) toolRegistryEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAbstractTool() {
-		return abstractToolEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractTool_SmallIcon() {
-		return (EReference) abstractToolEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAbstractTool_LargeIcon() {
-		return (EReference) abstractToolEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractTool_Title() {
-		return (EAttribute) abstractToolEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAbstractTool_Description() {
-		return (EAttribute) abstractToolEClass.getEStructuralFeatures().get(3);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getToolContainer() {
-		return toolContainerEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getToolContainer_Tools() {
-		return (EReference) toolContainerEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPaletteSeparator() {
-		return paletteSeparatorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getToolGroup() {
-		return toolGroupEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getToolGroup_Collapsible() {
-		return (EAttribute) toolGroupEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getToolGroup_Stack() {
-		return (EAttribute) toolGroupEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getToolGroup_Active() {
-		return (EReference) toolGroupEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPalette() {
-		return paletteEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getPalette_Default() {
-		return (EReference) paletteEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getStandardTool() {
-		return standardToolEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getStandardTool_ToolKind() {
-		return (EAttribute) standardToolEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getCreationTool() {
-		return creationToolEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGenericTool() {
-		return genericToolEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGenericTool_ToolClass() {
-		return (EAttribute) genericToolEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getItemBase() {
-		return itemBaseEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMenu() {
-		return menuEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getMenu_Items() {
-		return (EReference) menuEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getSeparator() {
-		return separatorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getSeparator_Name() {
-		return (EAttribute) separatorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPredefinedItem() {
-		return predefinedItemEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPredefinedItem_Identifier() {
-		return (EAttribute) predefinedItemEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPredefinedMenu() {
-		return predefinedMenuEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContributionItem() {
-		return contributionItemEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContributionItem_Icon() {
-		return (EReference) contributionItemEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getContributionItem_Title() {
-		return (EAttribute) contributionItemEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMenuAction() {
-		return menuActionEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMenuAction_Kind() {
-		return (EAttribute) menuActionEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMenuAction_HotKey() {
-		return (EAttribute) menuActionEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getItemRef() {
-		return itemRefEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getItemRef_Item() {
-		return (EReference) itemRefEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getContextMenu() {
-		return contextMenuEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getContextMenu_Default() {
-		return (EReference) contextMenuEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getPopupMenu() {
-		return popupMenuEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getPopupMenu_ID() {
-		return (EAttribute) popupMenuEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getMainMenu() {
-		return mainMenuEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getMainMenu_Title() {
-		return (EAttribute) mainMenuEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getToolbar() {
-		return toolbarEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getImage() {
-		return imageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDefaultImage() {
-		return defaultImageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getBundleImage() {
-		return bundleImageEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBundleImage_Path() {
-		return (EAttribute) bundleImageEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getBundleImage_Bundle() {
-		return (EAttribute) bundleImageEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getStyleSelector() {
-		return styleSelectorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getGenericStyleSelector() {
-		return genericStyleSelectorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getGenericStyleSelector_Values() {
-		return (EAttribute) genericStyleSelectorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getStandardToolKind() {
-		return standardToolKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getActionKind() {
-		return actionKindEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EEnum getAppearanceStyle() {
-		return appearanceStyleEEnum;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolFactory getGMFToolFactory() {
-		return (GMFToolFactory) getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated)
-			return;
-		isCreated = true;
-
-		// Create classes and their features
-		toolRegistryEClass = createEClass(TOOL_REGISTRY);
-		createEReference(toolRegistryEClass, TOOL_REGISTRY__SHARED_ACTIONS);
-		createEReference(toolRegistryEClass, TOOL_REGISTRY__ALL_MENUS);
-		createEReference(toolRegistryEClass, TOOL_REGISTRY__PALETTE);
-
-		abstractToolEClass = createEClass(ABSTRACT_TOOL);
-		createEReference(abstractToolEClass, ABSTRACT_TOOL__SMALL_ICON);
-		createEReference(abstractToolEClass, ABSTRACT_TOOL__LARGE_ICON);
-		createEAttribute(abstractToolEClass, ABSTRACT_TOOL__TITLE);
-		createEAttribute(abstractToolEClass, ABSTRACT_TOOL__DESCRIPTION);
-
-		toolContainerEClass = createEClass(TOOL_CONTAINER);
-		createEReference(toolContainerEClass, TOOL_CONTAINER__TOOLS);
-
-		paletteSeparatorEClass = createEClass(PALETTE_SEPARATOR);
-
-		toolGroupEClass = createEClass(TOOL_GROUP);
-		createEAttribute(toolGroupEClass, TOOL_GROUP__COLLAPSIBLE);
-		createEAttribute(toolGroupEClass, TOOL_GROUP__STACK);
-		createEReference(toolGroupEClass, TOOL_GROUP__ACTIVE);
-
-		paletteEClass = createEClass(PALETTE);
-		createEReference(paletteEClass, PALETTE__DEFAULT);
-
-		standardToolEClass = createEClass(STANDARD_TOOL);
-		createEAttribute(standardToolEClass, STANDARD_TOOL__TOOL_KIND);
-
-		creationToolEClass = createEClass(CREATION_TOOL);
-
-		genericToolEClass = createEClass(GENERIC_TOOL);
-		createEAttribute(genericToolEClass, GENERIC_TOOL__TOOL_CLASS);
-
-		itemBaseEClass = createEClass(ITEM_BASE);
-
-		menuEClass = createEClass(MENU);
-		createEReference(menuEClass, MENU__ITEMS);
-
-		separatorEClass = createEClass(SEPARATOR);
-		createEAttribute(separatorEClass, SEPARATOR__NAME);
-
-		predefinedItemEClass = createEClass(PREDEFINED_ITEM);
-		createEAttribute(predefinedItemEClass, PREDEFINED_ITEM__IDENTIFIER);
-
-		predefinedMenuEClass = createEClass(PREDEFINED_MENU);
-
-		contributionItemEClass = createEClass(CONTRIBUTION_ITEM);
-		createEReference(contributionItemEClass, CONTRIBUTION_ITEM__ICON);
-		createEAttribute(contributionItemEClass, CONTRIBUTION_ITEM__TITLE);
-
-		menuActionEClass = createEClass(MENU_ACTION);
-		createEAttribute(menuActionEClass, MENU_ACTION__KIND);
-		createEAttribute(menuActionEClass, MENU_ACTION__HOT_KEY);
-
-		itemRefEClass = createEClass(ITEM_REF);
-		createEReference(itemRefEClass, ITEM_REF__ITEM);
-
-		contextMenuEClass = createEClass(CONTEXT_MENU);
-		createEReference(contextMenuEClass, CONTEXT_MENU__DEFAULT);
-
-		popupMenuEClass = createEClass(POPUP_MENU);
-		createEAttribute(popupMenuEClass, POPUP_MENU__ID);
-
-		mainMenuEClass = createEClass(MAIN_MENU);
-		createEAttribute(mainMenuEClass, MAIN_MENU__TITLE);
-
-		toolbarEClass = createEClass(TOOLBAR);
-
-		imageEClass = createEClass(IMAGE);
-
-		defaultImageEClass = createEClass(DEFAULT_IMAGE);
-
-		bundleImageEClass = createEClass(BUNDLE_IMAGE);
-		createEAttribute(bundleImageEClass, BUNDLE_IMAGE__PATH);
-		createEAttribute(bundleImageEClass, BUNDLE_IMAGE__BUNDLE);
-
-		styleSelectorEClass = createEClass(STYLE_SELECTOR);
-
-		genericStyleSelectorEClass = createEClass(GENERIC_STYLE_SELECTOR);
-		createEAttribute(genericStyleSelectorEClass, GENERIC_STYLE_SELECTOR__VALUES);
-
-		// Create enums
-		standardToolKindEEnum = createEEnum(STANDARD_TOOL_KIND);
-		actionKindEEnum = createEEnum(ACTION_KIND);
-		appearanceStyleEEnum = createEEnum(APPEARANCE_STYLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized)
-			return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-		toolContainerEClass.getESuperTypes().add(this.getAbstractTool());
-		paletteSeparatorEClass.getESuperTypes().add(this.getAbstractTool());
-		toolGroupEClass.getESuperTypes().add(this.getToolContainer());
-		paletteEClass.getESuperTypes().add(this.getToolContainer());
-		standardToolEClass.getESuperTypes().add(this.getAbstractTool());
-		creationToolEClass.getESuperTypes().add(this.getAbstractTool());
-		genericToolEClass.getESuperTypes().add(this.getAbstractTool());
-		separatorEClass.getESuperTypes().add(this.getItemBase());
-		predefinedItemEClass.getESuperTypes().add(this.getItemBase());
-		predefinedMenuEClass.getESuperTypes().add(this.getMenu());
-		predefinedMenuEClass.getESuperTypes().add(this.getPredefinedItem());
-		contributionItemEClass.getESuperTypes().add(this.getItemBase());
-		menuActionEClass.getESuperTypes().add(this.getContributionItem());
-		itemRefEClass.getESuperTypes().add(this.getItemBase());
-		contextMenuEClass.getESuperTypes().add(this.getMenu());
-		popupMenuEClass.getESuperTypes().add(this.getMenu());
-		popupMenuEClass.getESuperTypes().add(this.getContributionItem());
-		mainMenuEClass.getESuperTypes().add(this.getMenu());
-		toolbarEClass.getESuperTypes().add(this.getMenu());
-		defaultImageEClass.getESuperTypes().add(this.getImage());
-		bundleImageEClass.getESuperTypes().add(this.getImage());
-		genericStyleSelectorEClass.getESuperTypes().add(this.getStyleSelector());
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(toolRegistryEClass, ToolRegistry.class, "ToolRegistry", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getToolRegistry_SharedActions(), this.getMenuAction(), null, "sharedActions", null, 0, -1, ToolRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getToolRegistry_AllMenus(), this.getMenu(), null, "allMenus", null, 0, -1, ToolRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getToolRegistry_Palette(), this.getPalette(), null, "palette", null, 0, 1, ToolRegistry.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(abstractToolEClass, AbstractTool.class, "AbstractTool", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAbstractTool_SmallIcon(), this.getImage(), null, "smallIcon", null, 0, 1, AbstractTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEReference(getAbstractTool_LargeIcon(), this.getImage(), null, "largeIcon", null, 0, 1, AbstractTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAbstractTool_Title(), ecorePackage.getEString(), "title", null, 0, 1, AbstractTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAbstractTool_Description(), ecorePackage.getEString(), "description", null, 0, 1, AbstractTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(toolContainerEClass, ToolContainer.class, "ToolContainer", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getToolContainer_Tools(), this.getAbstractTool(), null, "tools", null, 0, -1, ToolContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
-				!IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(paletteSeparatorEClass, PaletteSeparator.class, "PaletteSeparator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(toolGroupEClass, ToolGroup.class, "ToolGroup", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getToolGroup_Collapsible(), ecorePackage.getEBoolean(), "collapsible", null, 0, 1, ToolGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getToolGroup_Stack(), ecorePackage.getEBoolean(), "stack", null, 0, 1, ToolGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEReference(getToolGroup_Active(), this.getAbstractTool(), null, "active", null, 0, 1, ToolGroup.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(paletteEClass, Palette.class, "Palette", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getPalette_Default(), this.getAbstractTool(), null, "default", null, 0, 1, Palette.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(standardToolEClass, StandardTool.class, "StandardTool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getStandardTool_ToolKind(), this.getStandardToolKind(), "toolKind", null, 0, 1, StandardTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(creationToolEClass, CreationTool.class, "CreationTool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(genericToolEClass, GenericTool.class, "GenericTool", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGenericTool_ToolClass(), ecorePackage.getEString(), "toolClass", null, 1, 1, GenericTool.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(itemBaseEClass, ItemBase.class, "ItemBase", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(menuEClass, Menu.class, "Menu", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getMenu_Items(), this.getItemBase(), null, "items", null, 0, -1, Menu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(separatorEClass, Separator.class, "Separator", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getSeparator_Name(), ecorePackage.getEString(), "name", null, 0, 1, Separator.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		initEClass(predefinedItemEClass, PredefinedItem.class, "PredefinedItem", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPredefinedItem_Identifier(), ecorePackage.getEString(), "identifier", null, 0, 1, PredefinedItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(predefinedMenuEClass, PredefinedMenu.class, "PredefinedMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(contributionItemEClass, ContributionItem.class, "ContributionItem", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getContributionItem_Icon(), this.getImage(), null, "icon", null, 0, 1, ContributionItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getContributionItem_Title(), ecorePackage.getEString(), "title", null, 0, 1, ContributionItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(menuActionEClass, MenuAction.class, "MenuAction", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMenuAction_Kind(), this.getActionKind(), "kind", null, 0, 1, MenuAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-		initEAttribute(getMenuAction_HotKey(), ecorePackage.getEString(), "hotKey", null, 0, 1, MenuAction.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(itemRefEClass, ItemRef.class, "ItemRef", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getItemRef_Item(), this.getItemBase(), null, "item", null, 1, 1, ItemRef.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
-				IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(contextMenuEClass, ContextMenu.class, "ContextMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getContextMenu_Default(), this.getMenuAction(), null, "default", null, 0, 1, ContextMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
-				!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(popupMenuEClass, PopupMenu.class, "PopupMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getPopupMenu_ID(), ecorePackage.getEString(), "iD", null, 0, 1, PopupMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, IS_ID, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		initEClass(mainMenuEClass, MainMenu.class, "MainMenu", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getMainMenu_Title(), ecorePackage.getEString(), "title", null, 0, 1, MainMenu.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED,
-				IS_ORDERED);
-
-		initEClass(toolbarEClass, Toolbar.class, "Toolbar", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(imageEClass, Image.class, "Image", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(defaultImageEClass, DefaultImage.class, "DefaultImage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		initEClass(bundleImageEClass, BundleImage.class, "BundleImage", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getBundleImage_Path(), ecorePackage.getEString(), "path", null, 0, 1, BundleImage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-		initEAttribute(getBundleImage_Bundle(), ecorePackage.getEString(), "bundle", null, 0, 1, BundleImage.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
-				!IS_DERIVED, IS_ORDERED);
-
-		initEClass(styleSelectorEClass, StyleSelector.class, "StyleSelector", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-		EOperation op = addEOperation(styleSelectorEClass, ecorePackage.getEBoolean(), "isOk", 0, 1, IS_UNIQUE, IS_ORDERED);
-		addEParameter(op, ecorePackage.getEJavaObject(), "style", 0, 1, IS_UNIQUE, IS_ORDERED);
-
-		initEClass(genericStyleSelectorEClass, GenericStyleSelector.class, "GenericStyleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getGenericStyleSelector_Values(), this.getAppearanceStyle(), "values", null, 1, -1, GenericStyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
-				!IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Initialize enums and add enum literals
-		initEEnum(standardToolKindEEnum, StandardToolKind.class, "StandardToolKind");
-		addEEnumLiteral(standardToolKindEEnum, StandardToolKind.SELECT_LITERAL);
-		addEEnumLiteral(standardToolKindEEnum, StandardToolKind.SELECT_PAN_LITERAL);
-		addEEnumLiteral(standardToolKindEEnum, StandardToolKind.MARQUEE_LITERAL);
-		addEEnumLiteral(standardToolKindEEnum, StandardToolKind.ZOOM_PAN_LITERAL);
-		addEEnumLiteral(standardToolKindEEnum, StandardToolKind.ZOOM_IN_LITERAL);
-		addEEnumLiteral(standardToolKindEEnum, StandardToolKind.ZOOM_OUT_LITERAL);
-
-		initEEnum(actionKindEEnum, ActionKind.class, "ActionKind");
-		addEEnumLiteral(actionKindEEnum, ActionKind.CREATE_LITERAL);
-		addEEnumLiteral(actionKindEEnum, ActionKind.PROPCHANGE_LITERAL);
-		addEEnumLiteral(actionKindEEnum, ActionKind.MODIFY_LITERAL);
-		addEEnumLiteral(actionKindEEnum, ActionKind.PROCESS_LITERAL);
-		addEEnumLiteral(actionKindEEnum, ActionKind.CUSTOM_LITERAL);
-
-		initEEnum(appearanceStyleEEnum, AppearanceStyle.class, "AppearanceStyle");
-		addEEnumLiteral(appearanceStyleEEnum, AppearanceStyle.FONT_LITERAL);
-		addEEnumLiteral(appearanceStyleEEnum, AppearanceStyle.FILL_LITERAL);
-		addEEnumLiteral(appearanceStyleEEnum, AppearanceStyle.LINE_LITERAL);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //GMFToolPackageImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GenericStyleSelectorImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GenericStyleSelectorImpl.java
deleted file mode 100644
index 247b35c3865..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GenericStyleSelectorImpl.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EDataTypeUniqueEList;
-import org.eclipse.papyrus.gmf.tooldef.AppearanceStyle;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Generic Style Selector</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.GenericStyleSelectorImpl#getValues <em>Values</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GenericStyleSelectorImpl extends EObjectImpl implements GenericStyleSelector {
-
-	/**
-	 * The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValues()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<AppearanceStyle> values;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenericStyleSelectorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getGenericStyleSelector();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<AppearanceStyle> getValues() {
-		if (values == null) {
-			values = new EDataTypeUniqueEList<AppearanceStyle>(AppearanceStyle.class, this, GMFToolPackage.GENERIC_STYLE_SELECTOR__VALUES);
-		}
-		return values;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated NOT
-	 */
-	public boolean isOk(Object style) {
-		if (false == style instanceof EObject) {
-			return false;
-		}
-		final String styleName = ((EObject) style).eClass().getName();
-		for (AppearanceStyle s : getValues()) {
-			if (styleName.equals(s.getName() + "Style")) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.GENERIC_STYLE_SELECTOR__VALUES:
-			return getValues();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.GENERIC_STYLE_SELECTOR__VALUES:
-			getValues().clear();
-			getValues().addAll((Collection<? extends AppearanceStyle>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.GENERIC_STYLE_SELECTOR__VALUES:
-			getValues().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.GENERIC_STYLE_SELECTOR__VALUES:
-			return values != null && !values.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (values: ");
-		result.append(values);
-		result.append(')');
-		return result.toString();
-	}
-
-} //GenericStyleSelectorImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GenericToolImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GenericToolImpl.java
deleted file mode 100644
index 3e1631d3591..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/GenericToolImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Generic Tool</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.GenericToolImpl#getToolClass <em>Tool Class</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class GenericToolImpl extends AbstractToolImpl implements GenericTool {
-
-	/**
-	 * The default value of the '{@link #getToolClass() <em>Tool Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TOOL_CLASS_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getToolClass() <em>Tool Class</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolClass()
-	 * @generated
-	 * @ordered
-	 */
-	protected String toolClass = TOOL_CLASS_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GenericToolImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getGenericTool();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getToolClass() {
-		return toolClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setToolClass(String newToolClass) {
-		String oldToolClass = toolClass;
-		toolClass = newToolClass;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.GENERIC_TOOL__TOOL_CLASS, oldToolClass, toolClass));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.GENERIC_TOOL__TOOL_CLASS:
-			return getToolClass();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.GENERIC_TOOL__TOOL_CLASS:
-			setToolClass((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.GENERIC_TOOL__TOOL_CLASS:
-			setToolClass(TOOL_CLASS_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.GENERIC_TOOL__TOOL_CLASS:
-			return TOOL_CLASS_EDEFAULT == null ? toolClass != null : !TOOL_CLASS_EDEFAULT.equals(toolClass);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (toolClass: ");
-		result.append(toolClass);
-		result.append(')');
-		return result.toString();
-	}
-
-} //GenericToolImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ItemRefImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ItemRefImpl.java
deleted file mode 100644
index 0d23b80a591..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ItemRefImpl.java
+++ /dev/null
@@ -1,174 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.ItemBase;
-import org.eclipse.papyrus.gmf.tooldef.ItemRef;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Item Ref</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ItemRefImpl#getItem <em>Item</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ItemRefImpl extends EObjectImpl implements ItemRef {
-
-	/**
-	 * The cached value of the '{@link #getItem() <em>Item</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getItem()
-	 * @generated
-	 * @ordered
-	 */
-	protected ItemBase item;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ItemRefImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getItemRef();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ItemBase getItem() {
-		if (item != null && item.eIsProxy()) {
-			InternalEObject oldItem = (InternalEObject) item;
-			item = (ItemBase) eResolveProxy(oldItem);
-			if (item != oldItem) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFToolPackage.ITEM_REF__ITEM, oldItem, item));
-			}
-		}
-		return item;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ItemBase basicGetItem() {
-		return item;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setItem(ItemBase newItem) {
-		ItemBase oldItem = item;
-		item = newItem;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.ITEM_REF__ITEM, oldItem, item));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.ITEM_REF__ITEM:
-			if (resolve)
-				return getItem();
-			return basicGetItem();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.ITEM_REF__ITEM:
-			setItem((ItemBase) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.ITEM_REF__ITEM:
-			setItem((ItemBase) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.ITEM_REF__ITEM:
-			return item != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ItemRefImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MainMenuImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MainMenuImpl.java
deleted file mode 100644
index 30deffb6373..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MainMenuImpl.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.MainMenu;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Main Menu</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.MainMenuImpl#getTitle <em>Title</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MainMenuImpl extends MenuImpl implements MainMenu {
-
-	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TITLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String title = TITLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MainMenuImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getMainMenu();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTitle(String newTitle) {
-		String oldTitle = title;
-		title = newTitle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.MAIN_MENU__TITLE, oldTitle, title));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.MAIN_MENU__TITLE:
-			return getTitle();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.MAIN_MENU__TITLE:
-			setTitle((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.MAIN_MENU__TITLE:
-			setTitle(TITLE_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.MAIN_MENU__TITLE:
-			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (title: ");
-		result.append(title);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MainMenuImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MenuActionImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MenuActionImpl.java
deleted file mode 100644
index 629edc17782..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MenuActionImpl.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.tooldef.ActionKind;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Image;
-import org.eclipse.papyrus.gmf.tooldef.MenuAction;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Menu Action</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.MenuActionImpl#getIcon <em>Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.MenuActionImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.MenuActionImpl#getKind <em>Kind</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.MenuActionImpl#getHotKey <em>Hot Key</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MenuActionImpl extends EObjectImpl implements MenuAction {
-
-	/**
-	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected Image icon;
-
-	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TITLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String title = TITLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final ActionKind KIND_EDEFAULT = ActionKind.CREATE_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected ActionKind kind = KIND_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getHotKey() <em>Hot Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHotKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String HOT_KEY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getHotKey() <em>Hot Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHotKey()
-	 * @generated
-	 * @ordered
-	 */
-	protected String hotKey = HOT_KEY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MenuActionImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getMenuAction();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Image getIcon() {
-		return icon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIcon(Image newIcon, NotificationChain msgs) {
-		Image oldIcon = icon;
-		icon = newIcon;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFToolPackage.MENU_ACTION__ICON, oldIcon, newIcon);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIcon(Image newIcon) {
-		if (newIcon != icon) {
-			NotificationChain msgs = null;
-			if (icon != null)
-				msgs = ((InternalEObject) icon).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.MENU_ACTION__ICON, null, msgs);
-			if (newIcon != null)
-				msgs = ((InternalEObject) newIcon).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.MENU_ACTION__ICON, null, msgs);
-			msgs = basicSetIcon(newIcon, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.MENU_ACTION__ICON, newIcon, newIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTitle(String newTitle) {
-		String oldTitle = title;
-		title = newTitle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.MENU_ACTION__TITLE, oldTitle, title));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ActionKind getKind() {
-		return kind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setKind(ActionKind newKind) {
-		ActionKind oldKind = kind;
-		kind = newKind == null ? KIND_EDEFAULT : newKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.MENU_ACTION__KIND, oldKind, kind));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getHotKey() {
-		return hotKey;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHotKey(String newHotKey) {
-		String oldHotKey = hotKey;
-		hotKey = newHotKey;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.MENU_ACTION__HOT_KEY, oldHotKey, hotKey));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case GMFToolPackage.MENU_ACTION__ICON:
-			return basicSetIcon(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.MENU_ACTION__ICON:
-			return getIcon();
-		case GMFToolPackage.MENU_ACTION__TITLE:
-			return getTitle();
-		case GMFToolPackage.MENU_ACTION__KIND:
-			return getKind();
-		case GMFToolPackage.MENU_ACTION__HOT_KEY:
-			return getHotKey();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.MENU_ACTION__ICON:
-			setIcon((Image) newValue);
-			return;
-		case GMFToolPackage.MENU_ACTION__TITLE:
-			setTitle((String) newValue);
-			return;
-		case GMFToolPackage.MENU_ACTION__KIND:
-			setKind((ActionKind) newValue);
-			return;
-		case GMFToolPackage.MENU_ACTION__HOT_KEY:
-			setHotKey((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.MENU_ACTION__ICON:
-			setIcon((Image) null);
-			return;
-		case GMFToolPackage.MENU_ACTION__TITLE:
-			setTitle(TITLE_EDEFAULT);
-			return;
-		case GMFToolPackage.MENU_ACTION__KIND:
-			setKind(KIND_EDEFAULT);
-			return;
-		case GMFToolPackage.MENU_ACTION__HOT_KEY:
-			setHotKey(HOT_KEY_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.MENU_ACTION__ICON:
-			return icon != null;
-		case GMFToolPackage.MENU_ACTION__TITLE:
-			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-		case GMFToolPackage.MENU_ACTION__KIND:
-			return kind != KIND_EDEFAULT;
-		case GMFToolPackage.MENU_ACTION__HOT_KEY:
-			return HOT_KEY_EDEFAULT == null ? hotKey != null : !HOT_KEY_EDEFAULT.equals(hotKey);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (title: ");
-		result.append(title);
-		result.append(", kind: ");
-		result.append(kind);
-		result.append(", hotKey: ");
-		result.append(hotKey);
-		result.append(')');
-		return result.toString();
-	}
-
-} //MenuActionImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MenuImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MenuImpl.java
deleted file mode 100644
index ca699fa977c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/MenuImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.ItemBase;
-import org.eclipse.papyrus.gmf.tooldef.Menu;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Menu</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.MenuImpl#getItems <em>Items</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MenuImpl extends EObjectImpl implements Menu {
-
-	/**
-	 * The cached value of the '{@link #getItems() <em>Items</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getItems()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<ItemBase> items;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected MenuImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getMenu();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<ItemBase> getItems() {
-		if (items == null) {
-			items = new EObjectContainmentEList<ItemBase>(ItemBase.class, this, GMFToolPackage.MENU__ITEMS);
-		}
-		return items;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case GMFToolPackage.MENU__ITEMS:
-			return ((InternalEList<?>) getItems()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.MENU__ITEMS:
-			return getItems();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.MENU__ITEMS:
-			getItems().clear();
-			getItems().addAll((Collection<? extends ItemBase>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.MENU__ITEMS:
-			getItems().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.MENU__ITEMS:
-			return items != null && !items.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //MenuImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PaletteImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PaletteImpl.java
deleted file mode 100644
index 693e1f2fbca..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PaletteImpl.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Palette</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.PaletteImpl#getDefault <em>Default</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PaletteImpl extends ToolContainerImpl implements Palette {
-
-	/**
-	 * The cached value of the '{@link #getDefault() <em>Default</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDefault()
-	 * @generated
-	 * @ordered
-	 */
-	protected AbstractTool default_;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PaletteImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getPalette();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTool getDefault() {
-		if (default_ != null && default_.eIsProxy()) {
-			InternalEObject oldDefault = (InternalEObject) default_;
-			default_ = (AbstractTool) eResolveProxy(oldDefault);
-			if (default_ != oldDefault) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFToolPackage.PALETTE__DEFAULT, oldDefault, default_));
-			}
-		}
-		return default_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTool basicGetDefault() {
-		return default_;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDefault(AbstractTool newDefault) {
-		AbstractTool oldDefault = default_;
-		default_ = newDefault;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.PALETTE__DEFAULT, oldDefault, default_));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.PALETTE__DEFAULT:
-			if (resolve)
-				return getDefault();
-			return basicGetDefault();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.PALETTE__DEFAULT:
-			setDefault((AbstractTool) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.PALETTE__DEFAULT:
-			setDefault((AbstractTool) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.PALETTE__DEFAULT:
-			return default_ != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //PaletteImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PaletteSeparatorImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PaletteSeparatorImpl.java
deleted file mode 100644
index 2d042d57846..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PaletteSeparatorImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.PaletteSeparator;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Palette Separator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class PaletteSeparatorImpl extends AbstractToolImpl implements PaletteSeparator {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PaletteSeparatorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getPaletteSeparator();
-	}
-
-} //PaletteSeparatorImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PopupMenuImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PopupMenuImpl.java
deleted file mode 100644
index 5e67b25cca5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PopupMenuImpl.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.tooldef.ContributionItem;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Image;
-import org.eclipse.papyrus.gmf.tooldef.ItemBase;
-import org.eclipse.papyrus.gmf.tooldef.PopupMenu;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Popup Menu</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.PopupMenuImpl#getIcon <em>Icon</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.PopupMenuImpl#getTitle <em>Title</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.PopupMenuImpl#getID <em>ID</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PopupMenuImpl extends MenuImpl implements PopupMenu {
-
-	/**
-	 * The cached value of the '{@link #getIcon() <em>Icon</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIcon()
-	 * @generated
-	 * @ordered
-	 */
-	protected Image icon;
-
-	/**
-	 * The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TITLE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getTitle() <em>Title</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTitle()
-	 * @generated
-	 * @ordered
-	 */
-	protected String title = TITLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getID() <em>ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String iD = ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PopupMenuImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getPopupMenu();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Image getIcon() {
-		return icon;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetIcon(Image newIcon, NotificationChain msgs) {
-		Image oldIcon = icon;
-		icon = newIcon;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFToolPackage.POPUP_MENU__ICON, oldIcon, newIcon);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIcon(Image newIcon) {
-		if (newIcon != icon) {
-			NotificationChain msgs = null;
-			if (icon != null)
-				msgs = ((InternalEObject) icon).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.POPUP_MENU__ICON, null, msgs);
-			if (newIcon != null)
-				msgs = ((InternalEObject) newIcon).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.POPUP_MENU__ICON, null, msgs);
-			msgs = basicSetIcon(newIcon, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.POPUP_MENU__ICON, newIcon, newIcon));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getTitle() {
-		return title;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setTitle(String newTitle) {
-		String oldTitle = title;
-		title = newTitle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.POPUP_MENU__TITLE, oldTitle, title));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getID() {
-		return iD;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setID(String newID) {
-		String oldID = iD;
-		iD = newID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.POPUP_MENU__ID, oldID, iD));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case GMFToolPackage.POPUP_MENU__ICON:
-			return basicSetIcon(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.POPUP_MENU__ICON:
-			return getIcon();
-		case GMFToolPackage.POPUP_MENU__TITLE:
-			return getTitle();
-		case GMFToolPackage.POPUP_MENU__ID:
-			return getID();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.POPUP_MENU__ICON:
-			setIcon((Image) newValue);
-			return;
-		case GMFToolPackage.POPUP_MENU__TITLE:
-			setTitle((String) newValue);
-			return;
-		case GMFToolPackage.POPUP_MENU__ID:
-			setID((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.POPUP_MENU__ICON:
-			setIcon((Image) null);
-			return;
-		case GMFToolPackage.POPUP_MENU__TITLE:
-			setTitle(TITLE_EDEFAULT);
-			return;
-		case GMFToolPackage.POPUP_MENU__ID:
-			setID(ID_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.POPUP_MENU__ICON:
-			return icon != null;
-		case GMFToolPackage.POPUP_MENU__TITLE:
-			return TITLE_EDEFAULT == null ? title != null : !TITLE_EDEFAULT.equals(title);
-		case GMFToolPackage.POPUP_MENU__ID:
-			return ID_EDEFAULT == null ? iD != null : !ID_EDEFAULT.equals(iD);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ItemBase.class) {
-			switch (derivedFeatureID) {
-			default:
-				return -1;
-			}
-		}
-		if (baseClass == ContributionItem.class) {
-			switch (derivedFeatureID) {
-			case GMFToolPackage.POPUP_MENU__ICON:
-				return GMFToolPackage.CONTRIBUTION_ITEM__ICON;
-			case GMFToolPackage.POPUP_MENU__TITLE:
-				return GMFToolPackage.CONTRIBUTION_ITEM__TITLE;
-			default:
-				return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ItemBase.class) {
-			switch (baseFeatureID) {
-			default:
-				return -1;
-			}
-		}
-		if (baseClass == ContributionItem.class) {
-			switch (baseFeatureID) {
-			case GMFToolPackage.CONTRIBUTION_ITEM__ICON:
-				return GMFToolPackage.POPUP_MENU__ICON;
-			case GMFToolPackage.CONTRIBUTION_ITEM__TITLE:
-				return GMFToolPackage.POPUP_MENU__TITLE;
-			default:
-				return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (title: ");
-		result.append(title);
-		result.append(", iD: ");
-		result.append(iD);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PopupMenuImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PredefinedItemImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PredefinedItemImpl.java
deleted file mode 100644
index 7f33cb738e9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PredefinedItemImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedItem;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Predefined Item</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.PredefinedItemImpl#getIdentifier <em>Identifier</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PredefinedItemImpl extends EObjectImpl implements PredefinedItem {
-
-	/**
-	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IDENTIFIER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected String identifier = IDENTIFIER_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredefinedItemImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getPredefinedItem();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getIdentifier() {
-		return identifier;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIdentifier(String newIdentifier) {
-		String oldIdentifier = identifier;
-		identifier = newIdentifier;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.PREDEFINED_ITEM__IDENTIFIER, oldIdentifier, identifier));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.PREDEFINED_ITEM__IDENTIFIER:
-			return getIdentifier();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.PREDEFINED_ITEM__IDENTIFIER:
-			setIdentifier((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.PREDEFINED_ITEM__IDENTIFIER:
-			setIdentifier(IDENTIFIER_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.PREDEFINED_ITEM__IDENTIFIER:
-			return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (identifier: ");
-		result.append(identifier);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PredefinedItemImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PredefinedMenuImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PredefinedMenuImpl.java
deleted file mode 100644
index a373271ffa0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/PredefinedMenuImpl.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.ItemBase;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedItem;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedMenu;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Predefined Menu</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.PredefinedMenuImpl#getIdentifier <em>Identifier</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class PredefinedMenuImpl extends MenuImpl implements PredefinedMenu {
-
-	/**
-	 * The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String IDENTIFIER_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getIdentifier()
-	 * @generated
-	 * @ordered
-	 */
-	protected String identifier = IDENTIFIER_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected PredefinedMenuImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getPredefinedMenu();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getIdentifier() {
-		return identifier;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setIdentifier(String newIdentifier) {
-		String oldIdentifier = identifier;
-		identifier = newIdentifier;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.PREDEFINED_MENU__IDENTIFIER, oldIdentifier, identifier));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.PREDEFINED_MENU__IDENTIFIER:
-			return getIdentifier();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.PREDEFINED_MENU__IDENTIFIER:
-			setIdentifier((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.PREDEFINED_MENU__IDENTIFIER:
-			setIdentifier(IDENTIFIER_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.PREDEFINED_MENU__IDENTIFIER:
-			return IDENTIFIER_EDEFAULT == null ? identifier != null : !IDENTIFIER_EDEFAULT.equals(identifier);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eBaseStructuralFeatureID(int derivedFeatureID, Class<?> baseClass) {
-		if (baseClass == ItemBase.class) {
-			switch (derivedFeatureID) {
-			default:
-				return -1;
-			}
-		}
-		if (baseClass == PredefinedItem.class) {
-			switch (derivedFeatureID) {
-			case GMFToolPackage.PREDEFINED_MENU__IDENTIFIER:
-				return GMFToolPackage.PREDEFINED_ITEM__IDENTIFIER;
-			default:
-				return -1;
-			}
-		}
-		return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public int eDerivedStructuralFeatureID(int baseFeatureID, Class<?> baseClass) {
-		if (baseClass == ItemBase.class) {
-			switch (baseFeatureID) {
-			default:
-				return -1;
-			}
-		}
-		if (baseClass == PredefinedItem.class) {
-			switch (baseFeatureID) {
-			case GMFToolPackage.PREDEFINED_ITEM__IDENTIFIER:
-				return GMFToolPackage.PREDEFINED_MENU__IDENTIFIER;
-			default:
-				return -1;
-			}
-		}
-		return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (identifier: ");
-		result.append(identifier);
-		result.append(')');
-		return result.toString();
-	}
-
-} //PredefinedMenuImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/SeparatorImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/SeparatorImpl.java
deleted file mode 100644
index c2874bb3211..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/SeparatorImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Separator;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Separator</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.SeparatorImpl#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SeparatorImpl extends EObjectImpl implements Separator {
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected SeparatorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getSeparator();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.SEPARATOR__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.SEPARATOR__NAME:
-			return getName();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.SEPARATOR__NAME:
-			setName((String) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.SEPARATOR__NAME:
-			setName(NAME_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.SEPARATOR__NAME:
-			return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (name: ");
-		result.append(name);
-		result.append(')');
-		return result.toString();
-	}
-
-} //SeparatorImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/StandardToolImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/StandardToolImpl.java
deleted file mode 100644
index da358078f4f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/StandardToolImpl.java
+++ /dev/null
@@ -1,180 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.StandardTool;
-import org.eclipse.papyrus.gmf.tooldef.StandardToolKind;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Standard Tool</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.StandardToolImpl#getToolKind <em>Tool Kind</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class StandardToolImpl extends AbstractToolImpl implements StandardTool {
-
-	/**
-	 * The default value of the '{@link #getToolKind() <em>Tool Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final StandardToolKind TOOL_KIND_EDEFAULT = StandardToolKind.SELECT_LITERAL;
-
-	/**
-	 * The cached value of the '{@link #getToolKind() <em>Tool Kind</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getToolKind()
-	 * @generated
-	 * @ordered
-	 */
-	protected StandardToolKind toolKind = TOOL_KIND_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StandardToolImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getStandardTool();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StandardToolKind getToolKind() {
-		return toolKind;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setToolKind(StandardToolKind newToolKind) {
-		StandardToolKind oldToolKind = toolKind;
-		toolKind = newToolKind == null ? TOOL_KIND_EDEFAULT : newToolKind;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.STANDARD_TOOL__TOOL_KIND, oldToolKind, toolKind));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.STANDARD_TOOL__TOOL_KIND:
-			return getToolKind();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.STANDARD_TOOL__TOOL_KIND:
-			setToolKind((StandardToolKind) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.STANDARD_TOOL__TOOL_KIND:
-			setToolKind(TOOL_KIND_EDEFAULT);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.STANDARD_TOOL__TOOL_KIND:
-			return toolKind != TOOL_KIND_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (toolKind: ");
-		result.append(toolKind);
-		result.append(')');
-		return result.toString();
-	}
-
-} //StandardToolImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolContainerImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolContainerImpl.java
deleted file mode 100644
index 6e8a8c0b164..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolContainerImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.ToolContainer;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tool Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolContainerImpl#getTools <em>Tools</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class ToolContainerImpl extends AbstractToolImpl implements ToolContainer {
-
-	/**
-	 * The cached value of the '{@link #getTools() <em>Tools</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getTools()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<AbstractTool> tools;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolContainerImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getToolContainer();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<AbstractTool> getTools() {
-		if (tools == null) {
-			tools = new EObjectContainmentEList<AbstractTool>(AbstractTool.class, this, GMFToolPackage.TOOL_CONTAINER__TOOLS);
-		}
-		return tools;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_CONTAINER__TOOLS:
-			return ((InternalEList<?>) getTools()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_CONTAINER__TOOLS:
-			return getTools();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_CONTAINER__TOOLS:
-			getTools().clear();
-			getTools().addAll((Collection<? extends AbstractTool>) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_CONTAINER__TOOLS:
-			getTools().clear();
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_CONTAINER__TOOLS:
-			return tools != null && !tools.isEmpty();
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ToolContainerImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolGroupImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolGroupImpl.java
deleted file mode 100644
index 4865f035a11..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolGroupImpl.java
+++ /dev/null
@@ -1,296 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.ToolGroup;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tool Group</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolGroupImpl#isCollapsible <em>Collapsible</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolGroupImpl#isStack <em>Stack</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolGroupImpl#getActive <em>Active</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ToolGroupImpl extends ToolContainerImpl implements ToolGroup {
-
-	/**
-	 * The default value of the '{@link #isCollapsible() <em>Collapsible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCollapsible()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean COLLAPSIBLE_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isCollapsible() <em>Collapsible</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isCollapsible()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean collapsible = COLLAPSIBLE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #isStack() <em>Stack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStack()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean STACK_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isStack() <em>Stack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isStack()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean stack = STACK_EDEFAULT;
-
-	/**
-	 * The cached value of the '{@link #getActive() <em>Active</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getActive()
-	 * @generated
-	 * @ordered
-	 */
-	protected AbstractTool active;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolGroupImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getToolGroup();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isCollapsible() {
-		return collapsible;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setCollapsible(boolean newCollapsible) {
-		boolean oldCollapsible = collapsible;
-		collapsible = newCollapsible;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.TOOL_GROUP__COLLAPSIBLE, oldCollapsible, collapsible));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isStack() {
-		return stack;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStack(boolean newStack) {
-		boolean oldStack = stack;
-		stack = newStack;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.TOOL_GROUP__STACK, oldStack, stack));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTool getActive() {
-		if (active != null && active.eIsProxy()) {
-			InternalEObject oldActive = (InternalEObject) active;
-			active = (AbstractTool) eResolveProxy(oldActive);
-			if (active != oldActive) {
-				if (eNotificationRequired())
-					eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFToolPackage.TOOL_GROUP__ACTIVE, oldActive, active));
-			}
-		}
-		return active;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AbstractTool basicGetActive() {
-		return active;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setActive(AbstractTool newActive) {
-		AbstractTool oldActive = active;
-		active = newActive;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.TOOL_GROUP__ACTIVE, oldActive, active));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_GROUP__COLLAPSIBLE:
-			return isCollapsible();
-		case GMFToolPackage.TOOL_GROUP__STACK:
-			return isStack();
-		case GMFToolPackage.TOOL_GROUP__ACTIVE:
-			if (resolve)
-				return getActive();
-			return basicGetActive();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_GROUP__COLLAPSIBLE:
-			setCollapsible((Boolean) newValue);
-			return;
-		case GMFToolPackage.TOOL_GROUP__STACK:
-			setStack((Boolean) newValue);
-			return;
-		case GMFToolPackage.TOOL_GROUP__ACTIVE:
-			setActive((AbstractTool) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_GROUP__COLLAPSIBLE:
-			setCollapsible(COLLAPSIBLE_EDEFAULT);
-			return;
-		case GMFToolPackage.TOOL_GROUP__STACK:
-			setStack(STACK_EDEFAULT);
-			return;
-		case GMFToolPackage.TOOL_GROUP__ACTIVE:
-			setActive((AbstractTool) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_GROUP__COLLAPSIBLE:
-			return collapsible != COLLAPSIBLE_EDEFAULT;
-		case GMFToolPackage.TOOL_GROUP__STACK:
-			return stack != STACK_EDEFAULT;
-		case GMFToolPackage.TOOL_GROUP__ACTIVE:
-			return active != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy())
-			return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (collapsible: ");
-		result.append(collapsible);
-		result.append(", stack: ");
-		result.append(stack);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ToolGroupImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolRegistryImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolRegistryImpl.java
deleted file mode 100644
index ed3368496b0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolRegistryImpl.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Menu;
-import org.eclipse.papyrus.gmf.tooldef.MenuAction;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Tool Registry</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolRegistryImpl#getSharedActions <em>Shared Actions</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolRegistryImpl#getAllMenus <em>All Menus</em>}</li>
- *   <li>{@link org.eclipse.papyrus.gmf.tooldef.impl.ToolRegistryImpl#getPalette <em>Palette</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ToolRegistryImpl extends EObjectImpl implements ToolRegistry {
-
-	/**
-	 * The cached value of the '{@link #getSharedActions() <em>Shared Actions</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSharedActions()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<MenuAction> sharedActions;
-
-	/**
-	 * The cached value of the '{@link #getAllMenus() <em>All Menus</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAllMenus()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Menu> allMenus;
-
-	/**
-	 * The cached value of the '{@link #getPalette() <em>Palette</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getPalette()
-	 * @generated
-	 * @ordered
-	 */
-	protected Palette palette;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolRegistryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getToolRegistry();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<MenuAction> getSharedActions() {
-		if (sharedActions == null) {
-			sharedActions = new EObjectContainmentEList<MenuAction>(MenuAction.class, this, GMFToolPackage.TOOL_REGISTRY__SHARED_ACTIONS);
-		}
-		return sharedActions;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Menu> getAllMenus() {
-		if (allMenus == null) {
-			allMenus = new EObjectContainmentEList<Menu>(Menu.class, this, GMFToolPackage.TOOL_REGISTRY__ALL_MENUS);
-		}
-		return allMenus;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Palette getPalette() {
-		return palette;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public NotificationChain basicSetPalette(Palette newPalette, NotificationChain msgs) {
-		Palette oldPalette = palette;
-		palette = newPalette;
-		if (eNotificationRequired()) {
-			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, GMFToolPackage.TOOL_REGISTRY__PALETTE, oldPalette, newPalette);
-			if (msgs == null)
-				msgs = notification;
-			else
-				msgs.add(notification);
-		}
-		return msgs;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setPalette(Palette newPalette) {
-		if (newPalette != palette) {
-			NotificationChain msgs = null;
-			if (palette != null)
-				msgs = ((InternalEObject) palette).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.TOOL_REGISTRY__PALETTE, null, msgs);
-			if (newPalette != null)
-				msgs = ((InternalEObject) newPalette).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - GMFToolPackage.TOOL_REGISTRY__PALETTE, null, msgs);
-			msgs = basicSetPalette(newPalette, msgs);
-			if (msgs != null)
-				msgs.dispatch();
-		} else if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, GMFToolPackage.TOOL_REGISTRY__PALETTE, newPalette, newPalette));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_REGISTRY__SHARED_ACTIONS:
-			return ((InternalEList<?>) getSharedActions()).basicRemove(otherEnd, msgs);
-		case GMFToolPackage.TOOL_REGISTRY__ALL_MENUS:
-			return ((InternalEList<?>) getAllMenus()).basicRemove(otherEnd, msgs);
-		case GMFToolPackage.TOOL_REGISTRY__PALETTE:
-			return basicSetPalette(null, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_REGISTRY__SHARED_ACTIONS:
-			return getSharedActions();
-		case GMFToolPackage.TOOL_REGISTRY__ALL_MENUS:
-			return getAllMenus();
-		case GMFToolPackage.TOOL_REGISTRY__PALETTE:
-			return getPalette();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_REGISTRY__SHARED_ACTIONS:
-			getSharedActions().clear();
-			getSharedActions().addAll((Collection<? extends MenuAction>) newValue);
-			return;
-		case GMFToolPackage.TOOL_REGISTRY__ALL_MENUS:
-			getAllMenus().clear();
-			getAllMenus().addAll((Collection<? extends Menu>) newValue);
-			return;
-		case GMFToolPackage.TOOL_REGISTRY__PALETTE:
-			setPalette((Palette) newValue);
-			return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_REGISTRY__SHARED_ACTIONS:
-			getSharedActions().clear();
-			return;
-		case GMFToolPackage.TOOL_REGISTRY__ALL_MENUS:
-			getAllMenus().clear();
-			return;
-		case GMFToolPackage.TOOL_REGISTRY__PALETTE:
-			setPalette((Palette) null);
-			return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-		case GMFToolPackage.TOOL_REGISTRY__SHARED_ACTIONS:
-			return sharedActions != null && !sharedActions.isEmpty();
-		case GMFToolPackage.TOOL_REGISTRY__ALL_MENUS:
-			return allMenus != null && !allMenus.isEmpty();
-		case GMFToolPackage.TOOL_REGISTRY__PALETTE:
-			return palette != null;
-		}
-		return super.eIsSet(featureID);
-	}
-
-} //ToolRegistryImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolbarImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolbarImpl.java
deleted file mode 100644
index 77e799ec692..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/impl/ToolbarImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.Toolbar;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Toolbar</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class ToolbarImpl extends MenuImpl implements Toolbar {
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ToolbarImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return GMFToolPackage.eINSTANCE.getToolbar();
-	}
-
-} //ToolbarImpl
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/util/GMFToolAdapterFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/util/GMFToolAdapterFactory.java
deleted file mode 100644
index 72ce6e536e7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/util/GMFToolAdapterFactory.java
+++ /dev/null
@@ -1,637 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.BundleImage;
-import org.eclipse.papyrus.gmf.tooldef.ContextMenu;
-import org.eclipse.papyrus.gmf.tooldef.ContributionItem;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.DefaultImage;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-import org.eclipse.papyrus.gmf.tooldef.Image;
-import org.eclipse.papyrus.gmf.tooldef.ItemBase;
-import org.eclipse.papyrus.gmf.tooldef.ItemRef;
-import org.eclipse.papyrus.gmf.tooldef.MainMenu;
-import org.eclipse.papyrus.gmf.tooldef.Menu;
-import org.eclipse.papyrus.gmf.tooldef.MenuAction;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.PaletteSeparator;
-import org.eclipse.papyrus.gmf.tooldef.PopupMenu;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedItem;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedMenu;
-import org.eclipse.papyrus.gmf.tooldef.Separator;
-import org.eclipse.papyrus.gmf.tooldef.StandardTool;
-import org.eclipse.papyrus.gmf.tooldef.StyleSelector;
-import org.eclipse.papyrus.gmf.tooldef.ToolContainer;
-import org.eclipse.papyrus.gmf.tooldef.ToolGroup;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-import org.eclipse.papyrus.gmf.tooldef.Toolbar;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage
- * @generated
- */
-public class GMFToolAdapterFactory extends AdapterFactoryImpl {
-
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static GMFToolPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = GMFToolPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject) object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected GMFToolSwitch<Adapter> modelSwitch = new GMFToolSwitch<Adapter>() {
-
-		@Override
-		public Adapter caseToolRegistry(ToolRegistry object) {
-			return createToolRegistryAdapter();
-		}
-
-		@Override
-		public Adapter caseAbstractTool(AbstractTool object) {
-			return createAbstractToolAdapter();
-		}
-
-		@Override
-		public Adapter caseToolContainer(ToolContainer object) {
-			return createToolContainerAdapter();
-		}
-
-		@Override
-		public Adapter casePaletteSeparator(PaletteSeparator object) {
-			return createPaletteSeparatorAdapter();
-		}
-
-		@Override
-		public Adapter caseToolGroup(ToolGroup object) {
-			return createToolGroupAdapter();
-		}
-
-		@Override
-		public Adapter casePalette(Palette object) {
-			return createPaletteAdapter();
-		}
-
-		@Override
-		public Adapter caseStandardTool(StandardTool object) {
-			return createStandardToolAdapter();
-		}
-
-		@Override
-		public Adapter caseCreationTool(CreationTool object) {
-			return createCreationToolAdapter();
-		}
-
-		@Override
-		public Adapter caseGenericTool(GenericTool object) {
-			return createGenericToolAdapter();
-		}
-
-		@Override
-		public Adapter caseItemBase(ItemBase object) {
-			return createItemBaseAdapter();
-		}
-
-		@Override
-		public Adapter caseMenu(Menu object) {
-			return createMenuAdapter();
-		}
-
-		@Override
-		public Adapter caseSeparator(Separator object) {
-			return createSeparatorAdapter();
-		}
-
-		@Override
-		public Adapter casePredefinedItem(PredefinedItem object) {
-			return createPredefinedItemAdapter();
-		}
-
-		@Override
-		public Adapter casePredefinedMenu(PredefinedMenu object) {
-			return createPredefinedMenuAdapter();
-		}
-
-		@Override
-		public Adapter caseContributionItem(ContributionItem object) {
-			return createContributionItemAdapter();
-		}
-
-		@Override
-		public Adapter caseMenuAction(MenuAction object) {
-			return createMenuActionAdapter();
-		}
-
-		@Override
-		public Adapter caseItemRef(ItemRef object) {
-			return createItemRefAdapter();
-		}
-
-		@Override
-		public Adapter caseContextMenu(ContextMenu object) {
-			return createContextMenuAdapter();
-		}
-
-		@Override
-		public Adapter casePopupMenu(PopupMenu object) {
-			return createPopupMenuAdapter();
-		}
-
-		@Override
-		public Adapter caseMainMenu(MainMenu object) {
-			return createMainMenuAdapter();
-		}
-
-		@Override
-		public Adapter caseToolbar(Toolbar object) {
-			return createToolbarAdapter();
-		}
-
-		@Override
-		public Adapter caseImage(Image object) {
-			return createImageAdapter();
-		}
-
-		@Override
-		public Adapter caseDefaultImage(DefaultImage object) {
-			return createDefaultImageAdapter();
-		}
-
-		@Override
-		public Adapter caseBundleImage(BundleImage object) {
-			return createBundleImageAdapter();
-		}
-
-		@Override
-		public Adapter caseStyleSelector(StyleSelector object) {
-			return createStyleSelectorAdapter();
-		}
-
-		@Override
-		public Adapter caseGenericStyleSelector(GenericStyleSelector object) {
-			return createGenericStyleSelectorAdapter();
-		}
-
-		@Override
-		public Adapter defaultCase(EObject object) {
-			return createEObjectAdapter();
-		}
-	};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject) target);
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.ToolRegistry <em>Tool Registry</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolRegistry
-	 * @generated
-	 */
-	public Adapter createToolRegistryAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.AbstractTool <em>Abstract Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.AbstractTool
-	 * @generated
-	 */
-	public Adapter createAbstractToolAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.ToolContainer <em>Tool Container</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolContainer
-	 * @generated
-	 */
-	public Adapter createToolContainerAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.PaletteSeparator <em>Palette Separator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PaletteSeparator
-	 * @generated
-	 */
-	public Adapter createPaletteSeparatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.ToolGroup <em>Tool Group</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ToolGroup
-	 * @generated
-	 */
-	public Adapter createToolGroupAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.Palette <em>Palette</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Palette
-	 * @generated
-	 */
-	public Adapter createPaletteAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.StandardTool <em>Standard Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.StandardTool
-	 * @generated
-	 */
-	public Adapter createStandardToolAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.CreationTool <em>Creation Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.CreationTool
-	 * @generated
-	 */
-	public Adapter createCreationToolAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.GenericTool <em>Generic Tool</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GenericTool
-	 * @generated
-	 */
-	public Adapter createGenericToolAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.ItemBase <em>Item Base</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ItemBase
-	 * @generated
-	 */
-	public Adapter createItemBaseAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.Menu <em>Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Menu
-	 * @generated
-	 */
-	public Adapter createMenuAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.Separator <em>Separator</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Separator
-	 * @generated
-	 */
-	public Adapter createSeparatorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.PredefinedItem <em>Predefined Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PredefinedItem
-	 * @generated
-	 */
-	public Adapter createPredefinedItemAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.PredefinedMenu <em>Predefined Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PredefinedMenu
-	 * @generated
-	 */
-	public Adapter createPredefinedMenuAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.ContributionItem <em>Contribution Item</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ContributionItem
-	 * @generated
-	 */
-	public Adapter createContributionItemAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.MenuAction <em>Menu Action</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.MenuAction
-	 * @generated
-	 */
-	public Adapter createMenuActionAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.ItemRef <em>Item Ref</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ItemRef
-	 * @generated
-	 */
-	public Adapter createItemRefAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.ContextMenu <em>Context Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.ContextMenu
-	 * @generated
-	 */
-	public Adapter createContextMenuAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.PopupMenu <em>Popup Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.PopupMenu
-	 * @generated
-	 */
-	public Adapter createPopupMenuAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.MainMenu <em>Main Menu</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.MainMenu
-	 * @generated
-	 */
-	public Adapter createMainMenuAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.Toolbar <em>Toolbar</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Toolbar
-	 * @generated
-	 */
-	public Adapter createToolbarAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.Image <em>Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.Image
-	 * @generated
-	 */
-	public Adapter createImageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.DefaultImage <em>Default Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.DefaultImage
-	 * @generated
-	 */
-	public Adapter createDefaultImageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.BundleImage <em>Bundle Image</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.BundleImage
-	 * @generated
-	 */
-	public Adapter createBundleImageAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.StyleSelector <em>Style Selector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.StyleSelector
-	 * @generated
-	 */
-	public Adapter createStyleSelectorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector <em>Generic Style Selector</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector
-	 * @generated
-	 */
-	public Adapter createGenericStyleSelectorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //GMFToolAdapterFactory
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/util/GMFToolSwitch.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/util/GMFToolSwitch.java
deleted file mode 100644
index f455628cfbd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.tooldef/src/org/eclipse/papyrus/gmf/tooldef/util/GMFToolSwitch.java
+++ /dev/null
@@ -1,759 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, ARTAL
- * 
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- * 
- *  SPDX-License-Identifier: EPL-2.0
- * 
- *  Contributors:
- *     Borland - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ******************************************************************************/
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.eclipse.papyrus.gmf.tooldef.util;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.papyrus.gmf.tooldef.AbstractTool;
-import org.eclipse.papyrus.gmf.tooldef.BundleImage;
-import org.eclipse.papyrus.gmf.tooldef.ContextMenu;
-import org.eclipse.papyrus.gmf.tooldef.ContributionItem;
-import org.eclipse.papyrus.gmf.tooldef.CreationTool;
-import org.eclipse.papyrus.gmf.tooldef.DefaultImage;
-import org.eclipse.papyrus.gmf.tooldef.GMFToolPackage;
-import org.eclipse.papyrus.gmf.tooldef.GenericStyleSelector;
-import org.eclipse.papyrus.gmf.tooldef.GenericTool;
-import org.eclipse.papyrus.gmf.tooldef.Image;
-import org.eclipse.papyrus.gmf.tooldef.ItemBase;
-import org.eclipse.papyrus.gmf.tooldef.ItemRef;
-import org.eclipse.papyrus.gmf.tooldef.MainMenu;
-import org.eclipse.papyrus.gmf.tooldef.Menu;
-import org.eclipse.papyrus.gmf.tooldef.MenuAction;
-import org.eclipse.papyrus.gmf.tooldef.Palette;
-import org.eclipse.papyrus.gmf.tooldef.PaletteSeparator;
-import org.eclipse.papyrus.gmf.tooldef.PopupMenu;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedItem;
-import org.eclipse.papyrus.gmf.tooldef.PredefinedMenu;
-import org.eclipse.papyrus.gmf.tooldef.Separator;
-import org.eclipse.papyrus.gmf.tooldef.StandardTool;
-import org.eclipse.papyrus.gmf.tooldef.StyleSelector;
-import org.eclipse.papyrus.gmf.tooldef.ToolContainer;
-import org.eclipse.papyrus.gmf.tooldef.ToolGroup;
-import org.eclipse.papyrus.gmf.tooldef.ToolRegistry;
-import org.eclipse.papyrus.gmf.tooldef.Toolbar;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.papyrus.gmf.tooldef.GMFToolPackage
- * @generated
- */
-public class GMFToolSwitch<T> extends Switch<T> {
-
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static GMFToolPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public GMFToolSwitch() {
-		if (modelPackage == null) {
-			modelPackage = GMFToolPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Checks whether this is a switch for the given package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @parameter ePackage the package in question.
-	 * @return whether this is a switch for the given package.
-	 * @generated
-	 */
-	@Override
-	protected boolean isSwitchFor(EPackage ePackage) {
-		return ePackage == modelPackage;
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	@Override
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-		case GMFToolPackage.TOOL_REGISTRY: {
-			ToolRegistry toolRegistry = (ToolRegistry) theEObject;
-			T result = caseToolRegistry(toolRegistry);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.ABSTRACT_TOOL: {
-			AbstractTool abstractTool = (AbstractTool) theEObject;
-			T result = caseAbstractTool(abstractTool);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.TOOL_CONTAINER: {
-			ToolContainer toolContainer = (ToolContainer) theEObject;
-			T result = caseToolContainer(toolContainer);
-			if (result == null)
-				result = caseAbstractTool(toolContainer);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.PALETTE_SEPARATOR: {
-			PaletteSeparator paletteSeparator = (PaletteSeparator) theEObject;
-			T result = casePaletteSeparator(paletteSeparator);
-			if (result == null)
-				result = caseAbstractTool(paletteSeparator);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.TOOL_GROUP: {
-			ToolGroup toolGroup = (ToolGroup) theEObject;
-			T result = caseToolGroup(toolGroup);
-			if (result == null)
-				result = caseToolContainer(toolGroup);
-			if (result == null)
-				result = caseAbstractTool(toolGroup);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.PALETTE: {
-			Palette palette = (Palette) theEObject;
-			T result = casePalette(palette);
-			if (result == null)
-				result = caseToolContainer(palette);
-			if (result == null)
-				result = caseAbstractTool(palette);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.STANDARD_TOOL: {
-			StandardTool standardTool = (StandardTool) theEObject;
-			T result = caseStandardTool(standardTool);
-			if (result == null)
-				result = caseAbstractTool(standardTool);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.CREATION_TOOL: {
-			CreationTool creationTool = (CreationTool) theEObject;
-			T result = caseCreationTool(creationTool);
-			if (result == null)
-				result = caseAbstractTool(creationTool);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.GENERIC_TOOL: {
-			GenericTool genericTool = (GenericTool) theEObject;
-			T result = caseGenericTool(genericTool);
-			if (result == null)
-				result = caseAbstractTool(genericTool);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.ITEM_BASE: {
-			ItemBase itemBase = (ItemBase) theEObject;
-			T result = caseItemBase(itemBase);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.MENU: {
-			Menu menu = (Menu) theEObject;
-			T result = caseMenu(menu);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.SEPARATOR: {
-			Separator separator = (Separator) theEObject;
-			T result = caseSeparator(separator);
-			if (result == null)
-				result = caseItemBase(separator);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.PREDEFINED_ITEM: {
-			PredefinedItem predefinedItem = (PredefinedItem) theEObject;
-			T result = casePredefinedItem(predefinedItem);
-			if (result == null)
-				result = caseItemBase(predefinedItem);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.PREDEFINED_MENU: {
-			PredefinedMenu predefinedMenu = (PredefinedMenu) theEObject;
-			T result = casePredefinedMenu(predefinedMenu);
-			if (result == null)
-				result = caseMenu(predefinedMenu);
-			if (result == null)
-				result = casePredefinedItem(predefinedMenu);
-			if (result == null)
-				result = caseItemBase(predefinedMenu);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.CONTRIBUTION_ITEM: {
-			ContributionItem contributionItem = (ContributionItem) theEObject;
-			T result = caseContributionItem(contributionItem);
-			if (result == null)
-				result = caseItemBase(contributionItem);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.MENU_ACTION: {
-			MenuAction menuAction = (MenuAction) theEObject;
-			T result = caseMenuAction(menuAction);
-			if (result == null)
-				result = caseContributionItem(menuAction);
-			if (result == null)
-				result = caseItemBase(menuAction);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.ITEM_REF: {
-			ItemRef itemRef = (ItemRef) theEObject;
-			T result = caseItemRef(itemRef);
-			if (result == null)
-				result = caseItemBase(itemRef);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.CONTEXT_MENU: {
-			ContextMenu contextMenu = (ContextMenu) theEObject;
-			T result = caseContextMenu(contextMenu);
-			if (result == null)
-				result = caseMenu(contextMenu);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.POPUP_MENU: {
-			PopupMenu popupMenu = (PopupMenu) theEObject;
-			T result = casePopupMenu(popupMenu);
-			if (result == null)
-				result = caseMenu(popupMenu);
-			if (result == null)
-				result = caseContributionItem(popupMenu);
-			if (result == null)
-				result = caseItemBase(popupMenu);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.MAIN_MENU: {
-			MainMenu mainMenu = (MainMenu) theEObject;
-			T result = caseMainMenu(mainMenu);
-			if (result == null)
-				result = caseMenu(mainMenu);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.TOOLBAR: {
-			Toolbar toolbar = (Toolbar) theEObject;
-			T result = caseToolbar(toolbar);
-			if (result == null)
-				result = caseMenu(toolbar);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.IMAGE: {
-			Image image = (Image) theEObject;
-			T result = caseImage(image);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.DEFAULT_IMAGE: {
-			DefaultImage defaultImage = (DefaultImage) theEObject;
-			T result = caseDefaultImage(defaultImage);
-			if (result == null)
-				result = caseImage(defaultImage);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.BUNDLE_IMAGE: {
-			BundleImage bundleImage = (BundleImage) theEObject;
-			T result = caseBundleImage(bundleImage);
-			if (result == null)
-				result = caseImage(bundleImage);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.STYLE_SELECTOR: {
-			StyleSelector styleSelector = (StyleSelector) theEObject;
-			T result = caseStyleSelector(styleSelector);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		case GMFToolPackage.GENERIC_STYLE_SELECTOR: {
-			GenericStyleSelector genericStyleSelector = (GenericStyleSelector) theEObject;
-			T result = caseGenericStyleSelector(genericStyleSelector);
-			if (result == null)
-				result = caseStyleSelector(genericStyleSelector);
-			if (result == null)
-				result = defaultCase(theEObject);
-			return result;
-		}
-		default:
-			return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Tool Registry</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Tool Registry</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseToolRegistry(ToolRegistry object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Abstract Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Abstract Tool</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAbstractTool(AbstractTool object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Tool Container</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Tool Container</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseToolContainer(ToolContainer object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Palette Separator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Palette Separator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePaletteSeparator(PaletteSeparator object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Tool Group</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Tool Group</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseToolGroup(ToolGroup object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Palette</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Palette</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePalette(Palette object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Standard Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Standard Tool</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseStandardTool(StandardTool object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Creation Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Creation Tool</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseCreationTool(CreationTool object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Generic Tool</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Generic Tool</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGenericTool(GenericTool object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Item Base</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Item Base</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseItemBase(ItemBase object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Menu</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMenu(Menu object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Separator</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Separator</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseSeparator(Separator object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Predefined Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Predefined Item</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePredefinedItem(PredefinedItem object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Predefined Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Predefined Menu</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePredefinedMenu(PredefinedMenu object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Contribution Item</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Contribution Item</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseContributionItem(ContributionItem object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Menu Action</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Menu Action</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMenuAction(MenuAction object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Item Ref</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Item Ref</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseItemRef(ItemRef object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Context Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Context Menu</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseContextMenu(ContextMenu object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Popup Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Popup Menu</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T casePopupMenu(PopupMenu object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Main Menu</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Main Menu</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseMainMenu(MainMenu object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Toolbar</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Toolbar</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseToolbar(Toolbar object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Image</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseImage(Image object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Default Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Default Image</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDefaultImage(DefaultImage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Bundle Image</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Bundle Image</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseBundleImage(BundleImage object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Style Selector</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Style Selector</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseStyleSelector(StyleSelector object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Generic Style Selector</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Generic Style Selector</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseGenericStyleSelector(GenericStyleSelector object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	@Override
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //GMFToolSwitch
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.project
deleted file mode 100644
index 7aac3caf8b1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.xpand.qvtlibrary</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/META-INF/MANIFEST.MF
deleted file mode 100644
index 7bbd0d7b623..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.xpand.qvtlibrary;singleton:=true
-Bundle-Version: 1.2.0.qualifier
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.20.0,4.0.0)",
- org.eclipse.ocl.ecore;bundle-version="[3.15.0,4.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)"
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Export-Package: org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries;x-friends:="org.eclipse.papyrus.gmf.xpand"
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.ini b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.ini
deleted file mode 100644
index 945d0616766..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-welcomePage=$nl$/welcome.xml
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.mappings b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.mappings
deleted file mode 100644
index 529ce239e9d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@buildId@
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.properties
deleted file mode 100644
index f0b48bb9bb5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/about.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-########################################################################################
-#  Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-#  All rights reserved.   This program and the accompanying materials
-#  are made available under the terms of the Eclipse Public License 2.0
-#  which accompanies this distribution, and is available at
-#  https://www.eclipse.org/legal/epl-2.0/ 
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-#  Contributors: 
-#    Borland - Initial API and implementation
-#    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-########################################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-featureName=Graphical Modeling Framework (GMF) Xpand QVT Library
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Xpand QVT Library \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2009.  All rights reserved.\n\
-\n\
-GMF is a framework for generating graphical applications based on EMF and GEF.\n\
-Visit http://www.eclipse.org/gmf
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/build.properties
deleted file mode 100644
index 338a47fd03c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-################################################################################
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               plugin.properties,\
-               about.html,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/modeling32.png b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/modeling32.png
deleted file mode 100644
index 6b08de2ada7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/modeling32.png
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/plugin.properties
deleted file mode 100644
index 5f62541169d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/plugin.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#     Borland Software Corporation - initial API and implementation
-#     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-################################################################################
-pluginName = Papyrus GMF Xtend-specific QVT library
-providerName = Eclipse Modeling Project
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/plugin.xml
deleted file mode 100644
index 0bf4e112c92..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/plugin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
-         <unit
-               name="StringOperations"
-               namespace="xpt">
-            <library
-                  class="org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries.XpandStringOperations"
-                  name="StringOperations">
-               <metamodel
-                     nsURI="http://www.eclipse.org/emf/2002/Ecore">
-               </metamodel>
-            </library>
-         </unit>
-         <unit
-               name="OclAnyOperations"
-               namespace="xpt">
-            <library
-                  class="org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries.XpandOclAnyOperations"
-                  name="OclAnyOperations">
-               <metamodel
-                     nsURI="http://www.eclipse.org/emf/2002/Ecore">
-               </metamodel>
-            </library>
-         </unit>
-         <unit
-               name="IntegerOperations"
-               namespace="xpt">
-            <library
-                  class="org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries.XpandIntegerOperations"
-                  name="IntegerOperations">
-               <metamodel
-                     nsURI="http://www.eclipse.org/emf/2002/Ecore">
-               </metamodel>
-            </library>
-         </unit>
-         <unit
-               name="GlobalVarOperations"
-               namespace="xpt">
-            <library
-                  class="org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries.XpandGlobalVars"
-                  name="GlobalVarOperations">
-               <metamodel
-                     nsURI="http://www.eclipse.org/emf/2002/Ecore">
-               </metamodel>
-            </library>
-         </unit>
-   </extension>
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/pom.xml
deleted file mode 100644
index 59e80c8caa2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.xpand.qvtlibrary</artifactId>
-	<version>1.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandGlobalVars.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandGlobalVars.java
deleted file mode 100644
index ff0e5074584..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandGlobalVars.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries;
-
-import java.util.Collections;
-import java.util.Map;
-
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-
-public class XpandGlobalVars {
-
-	public Map<String, Object> globalVariables = Collections.emptyMap();
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public String xpandGetStringGlobalVar(String varName) {
-		if (globalVariables.containsKey(varName)) {
-			Object varValue = globalVariables.get(varName);
-			if (varValue instanceof String) {
-				return (String) varValue;
-			}
-			throw new RuntimeException("Incorrect global variable value - string should present instead: " + varValue);
-		}
-		return null;
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public Object xpandGetObjectGlobalVar(String varName) {
-		if (globalVariables.containsKey(varName)) {
-			return globalVariables.get(varName);
-		}
-		return null;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandIntegerOperations.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandIntegerOperations.java
deleted file mode 100644
index caf03629f8a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandIntegerOperations.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries;
-
-import java.util.List;
-
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-import org.eclipse.ocl.util.CollectionUtil;
-
-public class XpandIntegerOperations {
-
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static List<Integer> xpandUpTo(Integer self, Integer parameter) {
-		List<Integer> result = CollectionUtil.<Integer> createNewSequence();
-		for (int l1 = self.intValue(), l2 = parameter.intValue(); l1 <= l2; l1++) {
-			result.add(new Integer(l1));
-		}
-		return result;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandOclAnyOperations.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandOclAnyOperations.java
deleted file mode 100644
index b0da0fb0457..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandOclAnyOperations.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- */
-package org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries;
-
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-
-public class XpandOclAnyOperations {
-
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static Boolean xpandCompareTo(Object self, Object parameter) {
-		if (self == null) {
-			return parameter == null;
-		}
-		if (parameter == null) {
-			return false;
-		}
-		if (self instanceof Comparable<?>) {
-			@SuppressWarnings("unchecked") Comparable<Object> x = (Comparable<Object>) self;
-			return x.compareTo(parameter) == 0;
-		}
-		return String.valueOf(self).compareTo(String.valueOf(parameter)) == 0;
-
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandStringOperations.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandStringOperations.java
deleted file mode 100644
index 06ae7ccee41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand.qvtlibrary/src/org/eclipse/papyrus/gmf/internal/xpand/qvtlibraries/XpandStringOperations.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-import org.eclipse.ocl.util.CollectionUtil;
-
-public class XpandStringOperations {
-
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static String xpandToFirstLower(String self) {
-		if ((self == null) || (self.length() == 0)) {
-			return self;
-		}
-		char[] arr = self.toCharArray();
-		arr[0] = Character.toLowerCase(arr[0]);
-		return new String(arr);
-	}
-
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static List<String> xpandToCharList(String self) {
-		List<String> rv = CollectionUtil.<String> createNewSequence();
-		for (int i = 0; i < self.length(); i++) {
-			rv.add(self.substring(i, i + 1));
-		}
-		return rv;
-	}
-
-	/*
-	 * Not in use in current templates, however kept for migration simplicity
-	 */
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static String xpandSubstring(String self, Integer beginIndex) {
-		return self.substring(beginIndex);
-	}
-
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static String xpandReplaceAll(String self, String regex, String replacement) {
-		return self.replaceAll(regex, replacement);
-	}
-
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static String xpandReplaceFirst(String self, String regex, String replacement) {
-		return self.replaceFirst(regex, replacement);
-	}
-
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static List<String> xpandSplit(String self, String regex) {
-		return CollectionUtil.createNewSequence(Arrays.asList(self.split(regex)));
-	}
-
-	@Operation(contextual = true, kind = Kind.HELPER)
-	public static Boolean xpandMatches(String self, String regex) {
-		return self.matches(regex);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.classpath b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.classpath
deleted file mode 100644
index e801ebfb468..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.project b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.project
deleted file mode 100644
index ac66cdd6bb6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.papyrus.gmf.xpand</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.settings/org.eclipse.jdt.core.prefs b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c9545f06a41..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
-org.eclipse.jdt.core.compiler.release=enabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/META-INF/MANIFEST.MF b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/META-INF/MANIFEST.MF
deleted file mode 100644
index 40713914c57..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,61 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.papyrus.gmf.xpand;singleton:=true
-Bundle-Version: 2.2.0.qualifier
-Require-Bundle: org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.m2m.qvt.oml;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
- org.eclipse.m2m.qvt.oml.common;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.m2m.qvt.oml.project;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.m2m.qvt.oml.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.papyrus.gmf.xpand.qvtlibrary;bundle-version="[1.0.0,2.0.0)",
- lpg.runtime.java;bundle-version="[2.0.17,3.0.0)";visibility:=reexport
-Export-Package: org.eclipse.papyrus.gmf.internal.xpand;
-  x-friends:="org.eclipse.papyrus.gmf.xpand.editor,
-   org.eclipse.gmf.tests.xpand,
-   org.eclipse.papyrus.gmf.graphdef.codegen,
-   org.eclipse.papyrus.gmf.codegen,
-   org.eclipse.papyrus.gmf.codegen.lite,
-   org.eclipse.papyrus.gmf.common,
-   org.eclipse.papyrus.gmf.xpand.debug,
-   org.eclipse.papyrus.gmf.xpand.ant,
-   org.eclipse.papyrus.gmf.codegen.ui",
- org.eclipse.papyrus.gmf.internal.xpand.ast;x-friends:="org.eclipse.papyrus.gmf.xpand.editor,org.eclipse.gmf.tests.xpand,org.eclipse.papyrus.gmf.xpand.debug",
- org.eclipse.papyrus.gmf.internal.xpand.build;x-friends:="org.eclipse.papyrus.gmf.xpand.editor",
- org.eclipse.papyrus.gmf.internal.xpand.eval;x-friends:="org.eclipse.papyrus.gmf.xpand.debug,org.eclipse.gmf.tests.xpand",
- org.eclipse.papyrus.gmf.internal.xpand.expression.ast;x-friends:="org.eclipse.papyrus.gmf.xpand.editor,org.eclipse.gmf.tests.xpand,org.eclipse.papyrus.gmf.xpand.debug",
- org.eclipse.papyrus.gmf.internal.xpand.expression.parser;x-friends:="org.eclipse.gmf.tests.xpand,org.eclipse.papyrus.gmf.xpand.editor",
- org.eclipse.papyrus.gmf.internal.xpand.inactive;x-internal:=true,
- org.eclipse.papyrus.gmf.internal.xpand.model;
-  x-friends:="org.eclipse.papyrus.gmf.graphdef.codegen,
-   org.eclipse.gmf.tests.xpand,
-   org.eclipse.papyrus.gmf.xpand.editor,
-   org.eclipse.papyrus.gmf.common,
-   org.eclipse.papyrus.gmf.xpand.debug,
-   org.eclipse.papyrus.gmf.xpand.ant",
- org.eclipse.papyrus.gmf.internal.xpand.ocl;x-friends:="org.eclipse.gmf.tests.xpand",
- org.eclipse.papyrus.gmf.internal.xpand.parser;x-friends:="org.eclipse.gmf.tests.xpand",
- org.eclipse.papyrus.gmf.internal.xpand.util;
-  x-friends:="org.eclipse.papyrus.gmf.xpand.editor,
-   org.eclipse.gmf.tests.xpand,
-   org.eclipse.papyrus.gmf.graphdef.codegen,
-   org.eclipse.papyrus.gmf.codegen,
-   org.eclipse.papyrus.gmf.codegen.lite,
-   org.eclipse.papyrus.gmf.common,
-   org.eclipse.papyrus.gmf.xpand.debug,
-   org.eclipse.gmf.tests,
-   org.eclipse.papyrus.gmf.xpand.ant",
- org.eclipse.papyrus.gmf.internal.xpand.xtend.ast;
-  x-friends:="org.eclipse.papyrus.gmf.xpand.editor,
-   org.eclipse.gmf.tests.xpand,
-   org.eclipse.papyrus.gmf.xpand.debug,
-   org.eclipse.papyrus.gmf.xpand.ant"
-Bundle-Activator: org.eclipse.papyrus.gmf.internal.xpand.Activator
-Bundle-Localization: plugin
-Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.papyrus.gmf.internal.xpand.inactive"
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-RequiredExecutionEnvironment: JavaSE-11
-Eclipse-ExtensibleAPI: true
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.html b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.html
deleted file mode 100644
index ef2872f2845..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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>November 30, 2017</p>	
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;).  Unless otherwise 
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 2.0 (&quot;EPL&quot;).  A copy of the EPL is available 
-at <a href="https://www.eclipse.org/legal/epl-2.0/">https://www.eclipse.org/legal/epl-2.0/</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) 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/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.ini b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.ini
deleted file mode 100644
index 945d0616766..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.ini
+++ /dev/null
@@ -1,17 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%featureText
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=modeling32.png
-
-# Property "appName" contains name of the application (translated)
-appName=%featureName
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-welcomePage=$nl$/welcome.xml
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.mappings b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.mappings
deleted file mode 100644
index 529ce239e9d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@buildId@
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.properties
deleted file mode 100644
index df8ca24c3c0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/about.properties
+++ /dev/null
@@ -1,45 +0,0 @@
-############################################################################## 
-# Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved.   This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/ 
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Borland - Initial API and implementation
-#	Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-##############################################################################
-
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-featureName=Graphical Modeling Framework (GMF) Xpand
-
-featureText=Eclipse Graphical Modeling Framework (GMF) Xpand model-to-text component \n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2008.  All rights reserved.\n\
-\n\
-GMF is a framework for generating graphical applications based on EMF and GEF.\n\
-Visit http://www.eclipse.org/gmf
-
-# ==============================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# The above properties have been shipped for translation.
-# ==============================================================================
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/build.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/build.properties
deleted file mode 100644
index 0afeb3cd64a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               about.html,\
-               plugin.properties,\
-               about.ini,\
-               about.mappings,\
-               about.properties,\
-               modeling32.png
-src.includes = about.html
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/modeling32.png b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/modeling32.png
deleted file mode 100644
index 6b08de2ada7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/modeling32.png
+++ /dev/null
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/plugin.properties b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/plugin.properties
deleted file mode 100644
index f2ffba99054..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# Contributors:
-#   Borland Software Corporation - initial API and implementation
-#	Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-###############################################################################
-pluginName = Papyrus GMF Xpand Template Engine
-providerName = Eclipse Modeling Project
-xpand.problem=Xpand Problem
-xpand.builder=Xpand Template Builder
-contenttype.xpt=GMF Xpand File 
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/plugin.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/plugin.xml
deleted file mode 100644
index 614a2a9d576..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/plugin.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         id="xpandBuilder"
-         name="%xpand.builder"
-         point="org.eclipse.core.resources.builders">
-      <builder
-            hasNature="false">
-         <run class="org.eclipse.papyrus.gmf.internal.xpand.build.XpandBuilder"/>
-      </builder>
-   </extension>
-   
-   <extension
-         id="xpandProblem"
-         name="%xpand.problem"
-         point="org.eclipse.core.resources.markers">
-      <super type="org.eclipse.core.resources.problemmarker"/>
-      <super type="org.eclipse.core.resources.textmarker"/>
-      <persistent
-            value="true">
-      </persistent>
-   </extension>
-   <extension
-         point="org.eclipse.core.contenttype.contentTypes">
-      <content-type
-            base-type="org.eclipse.core.runtime.text"
-            default-charset="UTF-8"
-            describer="org.eclipse.papyrus.gmf.internal.xpand.inactive.ContentDescriber"
-            file-extensions="xpt"
-            id="org.eclipse.gmf.xpt"
-            name="%contenttype.xpt"
-            priority="normal">
-      </content-type>
-   </extension>
-
-   <extension
-         point="org.eclipse.m2m.qvt.oml.javaBlackboxUnits">
-         <unit
-               name="StreamOperations"
-               namespace="xpt">
-            <library
-                  class="org.eclipse.papyrus.gmf.internal.xpand.util.XpandStreamOperations">
-               <metamodel
-                     nsURI="http://www.eclipse.org/emf/2002/Ecore">
-               </metamodel>
-            </library>
-         </unit>
-   </extension>
-</plugin>
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/pom.xml b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/pom.xml
deleted file mode 100644
index 622379d36bb..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--*****************************************************************************
- * Copyright (c) 2011, 2020 PetalsLink, CEA LIST, Artal
- *  All rights reserved. This program and the accompanying materials
- *  are made available under the terms of the Eclipse Public License 2.0
- *  which accompanies this distribution, and is available at
- *  https://www.eclipse.org/legal/epl-2.0/
- *  
- *   Contributors:
- *      Mickael istria (PetalsLink)
- *      Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- ********************************************************************************
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.eclipse.papyrus.gmf-tooling.plugins</groupId>
-	<artifactId>org.eclipse.papyrus.gmf.xpand</artifactId>
-	<version>2.2.0-SNAPSHOT</version>
-	<packaging>eclipse-plugin</packaging>
-
-	<parent>
-		<groupId>org.eclipse.papyrus</groupId>
-		<artifactId>org.eclipse.papyrus.gmf-tooling</artifactId>
-		<version>0.0.1-SNAPSHOT</version>
-	</parent>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.eclipse.tycho</groupId>
-				<artifactId>tycho-source-plugin</artifactId>
-				<version>${tycho-version}</version>
-				<executions>
-					<execution>
-						<id>attach-source</id>
-						<goals>
-							<goal>plugin-source</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
-
-</project>
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/AbstractOutput.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/AbstractOutput.java
deleted file mode 100644
index a5e6f66f413..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/AbstractOutput.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Borland - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import org.eclipse.papyrus.gmf.internal.xpand.ast.TextStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Output;
-
-public abstract class AbstractOutput implements Output {
-	private boolean deleteLine = false;
-
-	public void enterStatement(SyntaxElement stmt) {
-		if (stmt instanceof TextStatement) {
-			deleteLine = ((TextStatement) stmt).isDeleteLine();
-		}
-	}
-
-	public void exitStatement(SyntaxElement stmt) {
-		deleteLine = false;
-	}
-
-	public void write(String text) {
-		if (deleteLine) {
-			int i = 0;
-			while (i < text.length()) {
-				char charAt = text.charAt(i);
-				if (Character.isWhitespace(charAt)) {
-					if ((charAt == '\r' || charAt == '\n') && (i+1 < text.length())) {
-						char nextToLF = text.charAt(++i);
-						if (nextToLF != charAt && (nextToLF == '\n' || nextToLF == '\r')) {
-							i++;
-						}
-						break;
-					}
-				}
-				i++;
-			}
-			doAppend(text.substring(i));
-			deleteLine = false;
-		} else {
-			doAppend(text);
-		}
-	}
-
-	protected abstract void doAppend(String text);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/Activator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/Activator.java
deleted file mode 100644
index 7a98495cae9..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/Activator.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.gmf.internal.xpand.RootManager.RootDescription;
-import org.eclipse.papyrus.gmf.internal.xpand.build.MetaModelSource;
-import org.eclipse.papyrus.gmf.internal.xpand.build.WorkspaceResourceManager;
-import org.osgi.framework.BundleContext;
-
-public class Activator extends Plugin {
-
-	private static Activator anInstance;
-
-	public Activator() {
-	}
-
-	@Override
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		anInstance = this;
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(myRootsTracker);
-	}
-
-	@Override
-	public void stop(BundleContext context) throws Exception {
-		ResourcesPlugin.getWorkspace().removeResourceChangeListener(myRootsTracker);
-		anInstance = null;
-		super.stop(context);
-	}
-
-	public static String getId() {
-		return anInstance == null ? String.valueOf(anInstance) : anInstance.getBundle().getSymbolicName();
-	}
-
-	public static void logWarn(String message) {
-		log(new Status(IStatus.WARNING, getId(), 0, message, null));
-	}
-
-	public static void logError(Exception e) {
-		if (e instanceof CoreException) {
-			log(((CoreException) e).getStatus());
-		} else {
-			log(new Status(IStatus.ERROR, getId(), 0, e.getMessage(), e));
-		}
-	}
-
-	public static void log(IStatus status) {
-		if (anInstance != null) {
-			anInstance.getLog().log(status);
-		} else {
-			System.err.println(status);
-		}
-	}
-
-	private final Map<IProject, RootManager> rootManagers = new HashMap<IProject, RootManager>();
-
-	public static RootManager getRootManager(IProject project) {
-		synchronized (anInstance.myRootsTracker) {
-			RootManager result = anInstance.rootManagers.get(project);
-			if (result == null) {
-				result = new RootManager(project);
-				anInstance.rootManagers.put(project, result);
-			}
-			return result;
-		}
-	}
-
-	public static WorkspaceResourceManager createWorkspaceResourceManager(IProject project, RootDescription rootDescription) {
-		return rootDescription != null ? new WorkspaceResourceManager(project, rootDescription.getRoots().toArray(new IPath[rootDescription.getRoots().size()]))
-				: new WorkspaceResourceManager(project);
-	}
-
-	private final IResourceChangeListener myRootsTracker = new IResourceChangeListener() {
-
-		public synchronized void resourceChanged(IResourceChangeEvent event) {
-			if (event == null || event.getDelta() == null) {
-				return;
-			}
-			Set<RootManager> affectedRootManagers = new HashSet<RootManager>();
-			IResourceDelta rootDelta = event.getDelta();
-			for (IResourceDelta projectDelta : rootDelta.getAffectedChildren()) {
-				IProject affectedProject = (IProject) projectDelta.getResource();
-				if (isRemovedOrClosed(projectDelta)) {
-					rootManagers.remove(affectedProject);
-				} else {
-					IResourceDelta configFileDelta = projectDelta.findMember(RootManager.PROJECT_RELATIVE_PATH_TO_CONFIG_FILE);
-					if (configFileDelta != null && rootManagers.containsKey(affectedProject) && affectsConfigFile(configFileDelta)) {
-						affectedRootManagers.add(getRootManager(affectedProject));
-					}
-				}
-			}
-			//Opening/closing or creating/deleting a project may affect roots with absolute paths.
-			for (IResourceDelta projectDelta : rootDelta.getAffectedChildren()) {
-				if (mayAffectOtherResourceManagers(projectDelta)) {
-					IPath projectPath = projectDelta.getFullPath();
-					for (RootManager nextManager : rootManagers.values()) {
-						if (nextManager.containsProject(projectPath)) {
-							affectedRootManagers.add(nextManager);
-						}
-					}
-				}
-			}
-			for (RootManager nextManager : affectedRootManagers) {
-				nextManager.rootsChanged();
-			}
-		}
-
-		private boolean affectsConfigFile(IResourceDelta configFileDelta) {
-			if ((configFileDelta.getKind() & (IResourceDelta.ADDED | IResourceDelta.REMOVED)) > 0) {
-				return true;
-			}
-			if ((configFileDelta.getFlags() & (IResourceDelta.CONTENT | IResourceDelta.ENCODING | IResourceDelta.SYNC | IResourceDelta.TYPE | IResourceDelta.REPLACED)) > 0) {
-				return true;
-			}
-			return false;
-		}
-
-		private boolean isRemovedOrClosed(IResourceDelta projectDelta) {
-			if (projectDelta.getKind() == IResourceDelta.REMOVED) {
-				return true;
-			}
-			if ((projectDelta.getFlags() & IResourceDelta.OPEN) > 0) {
-				return !projectDelta.getResource().isAccessible();
-			}
-			return false;
-		}
-
-		private boolean mayAffectOtherResourceManagers(IResourceDelta projectDelta) {
-			if ((projectDelta.getKind() & (IResourceDelta.REMOVED | IResourceDelta.ADDED)) > 0) {
-				return true;
-			}
-			if ((projectDelta.getFlags() & IResourceDelta.OPEN) > 0) {
-				return !projectDelta.getResource().isAccessible();
-			}
-			return false;
-		}
-	};
-
-	private final Set<MetaModelSource> modelSources = new LinkedHashSet<MetaModelSource>();
-
-	public static void registerModelSource(MetaModelSource modelSource) {
-		assert modelSource != null;
-		anInstance.modelSources.add(modelSource);
-	}
-
-	public static EPackage findMetaModel(String nsURI) {
-		if (anInstance == null) {
-			// this is for tests execution (which doesn't take place in plugin env)
-			return null;
-		}
-		for (MetaModelSource s : anInstance.modelSources) {
-			EPackage p = s.find(nsURI);
-			if (p != null) {
-				return p;
-			}
-		}
-		return EPackage.Registry.INSTANCE.getEPackage(nsURI);
-	}
-
-	/**
-	 * {@link EcorePlugin#computePlatformURIMap()} analog for GMF Xpand templates.
-	 * Fills supplied registry with metamodels available in the workspace, accessible both with platform:/resource/ and nsURI.
-	 * 
-	 * <p>For mymodel.ecore file in the workspace (which defines mymodelpackage EPackage) this method produces a map with two entries:<ul>
-	 * <li> nsURI -> mymodelpackage
-	 * <li> platform:/resource/.../mymodel.ecore -> mymodelpackage 
-	 * </ul>
-	 * 
-	 * <p>Clients that expect their templates to work with workspace (dynamic) model instances/metamodels shall make entries of the registry available in 
-	 * {@link ResourceSet} they use to load EMF object(s) they pass as template input, like that:
-	 * <pre><code>
-	 *   ResourceSet rs = new ResourceSetImpl();
-	 *   Activator.fillWorkspaceMetaModelsMap(rs.getPackageRegistry());
-	 * </code></pre>
-	 * alternately, you may supply you own PackageRegistry implementation, like:
-	 * <pre><code>
-	 *   EPackage.Registry registry = new EPackageRegistryImpl(EPackage.Registry.INSTANCE) { ... };
-	 *   rs.setPackageRegistry(Activator.fillWorkspaceMetaModelsMap(registry));
-	 * </code></pre>
-	 * With these precautions, loaded dynamic instances would result having the same metamodel, as available by nsURI, i.e.
-	 * <pre><code>
-	 *   EObject dynamicInstance = rs.getResource(URI.createURI("platform:/resource/.../mymodelinstance.xmi"), true).getContents().get(0);
-	 *   EPackage packageByNamespaceURI = rs.getPackageRegistry().getEPackage("mymodelpackage.nsURI");
-	 *   assert dynamicInstance.eClass().getEPackage() == packageByNamespaceURI;
-	 * </code></pre>
-	 * 
-	 * <p>Filled map represents a snapshot, and is not updated on subsequent workspace changes. 
-	 * 
-	 * @param registry - map to fill with platform:/resource/... and nsURI entries for workspace metamodels
-	 * @return passed argument for convenience
-	 */
-	public static EPackage.Registry fillWorkspaceMetaModelsMap(EPackage.Registry registry) {
-		if (anInstance == null) {
-			return registry;
-		}
-		for (MetaModelSource s : anInstance.modelSources) {
-			for (EPackage p : s.all()) {
-				if (p.eResource() != null && p.eResource().getURI() != null && p.eResource().getURI().isPlatformResource()) {
-					registry.put(p.getNsURI(), p);
-					registry.put(p.eResource().getURI().toString(), p);
-				}
-			}
-		}
-		return registry;
-	}
-
-	private ResourceSet workspaceMetamodelRS;
-
-	public static ResourceSet getWorkspaceMetamodelsResourceSet() {
-		if (anInstance != null && anInstance.workspaceMetamodelRS != null) {
-			return anInstance.workspaceMetamodelRS;
-		}
-		final ResourceSetImpl resourceSetImpl = new ResourceSetImpl() // 
-//		{
-//
-//			@Override
-//			public String toString() {
-//				return "Activator.getWorkspaceMetamodelsResourceSet(): " + super.toString();
-//			}
-//
-//			@Override
-//			public Resource getResource(URI uri, boolean loadOnDemand) {
-//				int sizeBefore = getResources().size();
-//				Resource result = super.getResource(uri, loadOnDemand);
-//				if (sizeBefore < getResources().size()) {
-//					logWarn("Activator.getWorkspaceMetamodelsResourceSet().: was: " + sizeBefore + //
-//							",\n now: " + getResources().size() + //
-//							",\n requested uri: " + uri + //
-//							",\n loaded: " + result + //
-//							",\n size: " + (result == null ? "null" : result.getContents().size()));
-//					if (!result.getContents().isEmpty()) {
-//						EObject first = result.getContents().get(0);
-//						if (first instanceof EPackage) {
-//							EPackage firstEPackage = (EPackage) first;
-//							logWarn("loaded: package:" + first + //
-//									",\n nsUri: " + firstEPackage.getNsURI() + //
-//									",\n identityHashCode: " + System.identityHashCode(firstEPackage));
-//						} else {
-//							logWarn("loaded: NOT a package:" + first);
-//						}
-//					}
-//				}
-//				return result;
-//			}
-//		}
-		;
-		resourceSetImpl.setURIResourceMap(new EPackageRegistryBasedURIResourceMap(resourceSetImpl.getURIConverter()));
-		// TODO: EcorePlugin.computePlatformURIMap() can return different maps
-		// if some of the project were opened/closed, so it is necessary to
-		// either update it or not keep any shared resourceSet for meta-models.
-		// In case of second solution we can better keep meta-model URIs and
-		// pre-load all necessary meta-models into the newly created ResourceSet
-		// just before Xpand execution (build or evaluation). 
-		resourceSetImpl.getURIConverter().getURIMap().putAll(EcorePlugin.computePlatformURIMap());
-		if (anInstance != null) {
-			anInstance.workspaceMetamodelRS = resourceSetImpl;
-		}
-		return resourceSetImpl;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/BufferOutput.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/BufferOutput.java
deleted file mode 100644
index 889536eac4a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/BufferOutput.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Borland - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandStreamsHolder;
-
-public class BufferOutput extends AbstractOutput {
-	/**
-	 * INV: size > 0
-	 */
-	private final Stack<StringBuilder> outletStack;
-
-	/**
-	 * INV: size == outletStack.size - 1
-	 */
-	private final Stack<String> outletNamesStack;
-
-	private final Map<String, StringBuilder> namedSlots;
-
-	private final XpandStreamsHolder streamsHolder;
-
-	private final boolean enforceReadOnlyAfterAccess;
-
-	public BufferOutput(StringBuilder buffer) {
-		this(buffer, null);
-	}
-
-	// XXX not map but config to show whether to append/overwrite content
-	public BufferOutput(StringBuilder buffer, Map<String, StringBuilder> namedSlots) {
-		this(buffer, namedSlots, false);
-	}
-
-	public BufferOutput(StringBuilder buffer, boolean enforceReadOnlyAfterRead) {
-		this(buffer, null, enforceReadOnlyAfterRead);
-	}
-
-	public BufferOutput(StringBuilder buffer, Map<String, StringBuilder> namedSlots, boolean enforceReadOnlyAfterRead) {
-		assert buffer != null;
-		outletStack = new Stack<StringBuilder>();
-		outletStack.push(buffer);
-		outletNamesStack = new Stack<String>();
-		streamsHolder = new XpandStreamsHolder();
-		if (namedSlots == null) {
-			this.namedSlots = new HashMap<String, StringBuilder>();
-		} else {
-			this.namedSlots = namedSlots;
-			for (Map.Entry<String, StringBuilder> next : namedSlots.entrySet()) {
-				streamsHolder.addNamedStream(next.getKey(), next.getValue());
-			}
-		}
-		this.enforceReadOnlyAfterAccess = enforceReadOnlyAfterRead;
-	}
-
-	public void closeFile() {
-		if (outletStack.size() == 1) {
-			String msg = "CLOSE FILE without previous openFile";
-			System.err.println("<<<" + msg);
-			throw new UnsupportedOperationException(msg);
-		}
-		checkAccessPermitted();
-		outletStack.pop();
-		outletNamesStack.pop();
-	}
-
-	/**
-	 * Throws an exception if the buffer has been configured not to allow write operations after reading and the stream 
-	 * has in fact been accessed.
-	 */
-	private void checkAccessPermitted() {
-		if (enforceReadOnlyAfterAccess && streamsHolder.isAccessed(outletNamesStack.peek())) {
-			throw new UnsupportedOperationException("Cannot write to a stream after its contents have been accessed");
-		}
-	}
-
-	public void openFile(String path, String outletName) {
-		if (!namedSlots.containsKey(outletName)) {
-//			String msg = "OPEN FILE ('" + path + "', " + outletName + ")";
-//			System.err.println(">>>" + msg);
-//			throw new UnsupportedOperationException(msg);
-			StringBuilder newSlot = new StringBuilder();
-			namedSlots.put(outletName, newSlot);
-			streamsHolder.addNamedStream(outletName, newSlot);
-		}
-		outletStack.push(namedSlots.get(outletName));
-		outletNamesStack.push(outletName);
-		checkAccessPermitted();
-		assert outletStack.peek() != null;
-	}
-
-	@Override
-	protected void doAppend(String text) {
-		outletStack.peek().append(text);
-	}
-
-	public StreamsHolder getNamedStreams() {
-		return streamsHolder;
-	}
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/BuiltinMetaModel.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/BuiltinMetaModel.java
deleted file mode 100644
index 2e41b7cf11b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/BuiltinMetaModel.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.Enumerator;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.ocl.TypeResolver;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.ocl.ecore.EcoreEnvironmentFactory;
-import org.eclipse.ocl.expressions.CollectionKind;
-import org.eclipse.ocl.types.OCLStandardLibrary;
-import org.eclipse.ocl.util.TypeUtil;
-import org.eclipse.ocl.utilities.UMLReflection;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinitionWrap;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandIterator;
-
-/**
- * XXX Guess, will need special support to recognize the fact
- * EJavaObject.isSupertypeOf(EObject)
- * 
- * @author artem
- */
-public class BuiltinMetaModel {
-
-	public final static String SET = "Set";
-
-	public final static String LIST = "List";
-
-	private static EPackage XECORE = EcoreFactory.eINSTANCE.createEPackage();
-
-	static {
-		XECORE.setName("xecore");
-		XECORE.setNsPrefix("xecore");
-		XECORE.setNsURI("uri:org.eclipse.modeling/m2t/xpand/xecore/1.0");
-	}
-
-	public static final EClass DEFINITION_TYPE = EcoreFactory.eINSTANCE.createEClass();
-
-	static {
-		DEFINITION_TYPE.setName("xpand2::Definition");
-		DEFINITION_TYPE.getESuperTypes().add(EcorePackage.eINSTANCE.getEClass()); // XXX perhaps, with OCL, some other superclassifier? 
-		EOperation proceedOp = EcoreFactory.eINSTANCE.createEOperation();
-		proceedOp.setName("proceed");
-		proceedOp.setEType(EcorePackage.eINSTANCE.getEObject()); // FIXME not sure what do I need as a type here
-		DEFINITION_TYPE.setInstanceClass(XpandDefinitionWrap.class);
-		DEFINITION_TYPE.getEOperations().add(proceedOp);
-		XECORE.getEClassifiers().add(DEFINITION_TYPE);
-	}
-
-	public static final EClass ITERATOR_TYPE = EcoreFactory.eINSTANCE.createEClass();
-
-	static {
-		ITERATOR_TYPE.setName("xpand2::Iterator");
-		ITERATOR_TYPE.getESuperTypes().add(EcorePackage.eINSTANCE.getEClass());
-		EOperation isFirstIteration = EcoreFactory.eINSTANCE.createEOperation();
-		isFirstIteration.setName("isFirstIteration");
-		isFirstIteration.setEType(EcorePackage.eINSTANCE.getEBoolean());
-		EOperation isLastIteration = EcoreFactory.eINSTANCE.createEOperation();
-		isLastIteration.setName("isLastIteration");
-		isLastIteration.setEType(EcorePackage.eINSTANCE.getEBoolean());
-		EOperation counter = EcoreFactory.eINSTANCE.createEOperation();
-		counter.setName("counter");
-		counter.setEType(EcorePackage.eINSTANCE.getELong());
-		EOperation elements = EcoreFactory.eINSTANCE.createEOperation();
-		elements.setName("elements");
-		elements.setEType(EcorePackage.eINSTANCE.getELong());
-		EOperation counter1 = EcoreFactory.eINSTANCE.createEOperation();
-		counter1.setName("counter1");
-		counter1.setEType(EcorePackage.eINSTANCE.getELong());
-		ITERATOR_TYPE.getEOperations().add(isFirstIteration);
-		ITERATOR_TYPE.getEOperations().add(isLastIteration);
-		ITERATOR_TYPE.getEOperations().add(counter);
-		ITERATOR_TYPE.getEOperations().add(counter1);
-		ITERATOR_TYPE.getEOperations().add(elements);
-		ITERATOR_TYPE.setInstanceClass(XpandIterator.class);
-		XECORE.getEClassifiers().add(ITERATOR_TYPE);
-	}
-
-	public static EClassifier getType(ExecutionContext ctx, Object obj) {
-		return getType(ctx.getOCLEnvironment(), obj);
-	}
-
-	public static EClassifier getType(EcoreEnvironment env, Object obj) {
-		// XXX (1) not sure how Collections are handled
-		// FIXME (2) need to support own types (IteratorType and DefinitionType)
-		//		if (obj instanceof Collection) {
-		//		EClassifier type = null;
-		//		if (!((Collection) obj).isEmpty()) {
-		//			// FIXME respect all! elements in the collection, not only the first one
-		//			type = getType(((Collection) obj).iterator().next());
-		//		}
-		//		if (obj instanceof Set) {
-		//			return collectionTypes.getSetType(type);
-		//		}
-		//		if (obj instanceof List) {
-		//			return collectionTypes.getListType(type);
-		//		}
-		//		return collectionTypes.getCollectionType(type);
-		//	}
-		//	if (obj instanceof XpandDefinitionWrap) {
-		//		return DEFINITION_TYPE;
-		//	}
-		//	if (obj instanceof XpandIterator) {
-		//		return ITERATOR_TYPE;
-		//	}
-		if (obj instanceof Collection<?>) {
-			EClassifier firstElementType = ((Collection<?>) obj).isEmpty() ? null : getType(env, ((Collection<?>) obj).iterator().next());
-			TypeResolver<EClassifier, EOperation, EStructuralFeature> tr = env.getTypeResolver();
-			OCLStandardLibrary<EClassifier> stdLib = env.getOCLStandardLibrary();
-			if (obj instanceof Set<?>) {
-				// XXX odd TypeResolver - CollectionType returned is EDataType for Ecore, need to cast nevertheless
-				return (EClassifier) tr.resolveCollectionType(CollectionKind.SET_LITERAL, firstElementType == null ? stdLib.getOclVoid() : firstElementType);
-			}
-			if (obj instanceof List<?>) {
-				return (EClassifier) tr.resolveCollectionType(CollectionKind.SEQUENCE_LITERAL, firstElementType == null ? stdLib.getOclVoid() : firstElementType);
-			}
-			return (EClassifier) tr.resolveCollectionType(CollectionKind.COLLECTION_LITERAL, firstElementType == null ? stdLib.getOclVoid() : firstElementType);
-		}
-		/**
-		 * It's not possible to determine a type (meta-object) of Enumeration
-		 * instance, so returning EEnumerator from here wich will be specially
-		 * processed in getRelationship()  method
-		 */
-		if (obj instanceof Enumerator) {
-			return EcorePackage.eINSTANCE.getEEnumerator();
-		}
-		/**
-		 * Workaround for current implementation of
-		 * EcoreEnvironmentFactory.oclType(obj) - for now it returns OclAny
-		 * instead of OclVoid if null was passed as a parameter
-		 */
-		if (obj == null) {
-			return env.getOCLStandardLibrary().getOclVoid();
-		}
-		if (obj == env.getOCLStandardLibrary().getInvalid()) {
-			return env.getOCLStandardLibrary().getOclInvalid();
-		}
-		return EcoreEnvironmentFactory.INSTANCE.createEvaluationEnvironment().getType(obj);
-		//		return TypeUtil.resolveType(ctx.getOCLEnvironment(), ee.getType(obj));
-	}
-
-	/**
-	 * @param ctx 
-	 * @return true if first argument is more general and second is more
-	 *         specific, think Object and String
-	 * @see AbstractTypeImpl.isAssignableFrom(this, t)
-	 */
-	public static boolean isAssignableFrom(ExecutionContext ctx, EClassifier t1, EClassifier t2) {
-		return 0 != (UMLReflection.SUBTYPE & getRelationship(ctx.getOCLEnvironment(), t1, t2));
-	}
-
-	public static int getRelationship(EcoreEnvironment env, EClassifier t1, EClassifier t2) {
-		/**
-		 * Special processing for EEnumerator returned as a type for any
-		 * enumeration instances - see above
-		 */
-		if (t1 instanceof EEnum && t2 == EcorePackage.eINSTANCE.getEEnumerator()) {
-			return UMLReflection.SUBTYPE; // HACK - any enumerator instance can be assigned to any enum attribute. 
-		}
-		return TypeUtil.getRelationship(env, t2, t1);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/EPackageRegistryBasedURIResourceMap.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/EPackageRegistryBasedURIResourceMap.java
deleted file mode 100644
index 596707d8d70..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/EPackageRegistryBasedURIResourceMap.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import java.io.IOException;
-import java.util.HashMap;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.xml.sax.Attributes;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-public class EPackageRegistryBasedURIResourceMap extends HashMap<URI, Resource> {
-
-	private static final long serialVersionUID = -3716798352459745813L;
-
-	private URIConverter uriConverter;
-
-	private SAXParser parser;
-
-	public EPackageRegistryBasedURIResourceMap(URIConverter uriConverter) {
-		this.uriConverter = uriConverter;
-	}
-
-	@Override
-	public Resource get(Object key) {
-		if (containsKey(key)) {
-			return super.get(key);
-		}
-		if (key instanceof URI) {
-			initializePlatformPluginToRegistryMapEntry((URI) key);
-		}
-		return super.get(key);
-	}
-
-	private void initializePlatformPluginToRegistryMapEntry(URI uri) {
-		if (!uri.isPlatformPlugin()) {
-			return;
-		}
-		try {
-			Handler handler = new Handler();
-			try {
-				getParser().parse(new InputSource(uriConverter.createInputStream(uri)), handler);
-			} catch (SAXException e) {
-				if (handler.getNsURI() != null && EPackage.Registry.INSTANCE.getEPackage(handler.getNsURI()) != null) {
-					put(uri, EPackage.Registry.INSTANCE.getEPackage(handler.getNsURI()).eResource());
-				}
-			}
-		} catch (IOException e) {
-			/* Skipping */
-		} catch (ParserConfigurationException e) {
-			Activator.logError(e);
-		}
-	}
-
-	private SAXParser getParser() throws ParserConfigurationException, SAXException {
-		if (parser == null) {
-			SAXParserFactory parserFactory = SAXParserFactory.newInstance();
-			parserFactory.setNamespaceAware(true);
-			parser = parserFactory.newSAXParser();
-		}
-		return this.parser;
-	}
-
-	private class Handler extends DefaultHandler {
-
-		private String nsURI;
-
-		@Override
-		public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {
-			if ("EPackage".equals(localName) && "http://www.eclipse.org/emf/2002/Ecore".equals(uri)) {
-				nsURI = attributes.getValue("nsURI");
-			}
-			throw new SAXException("Done");
-		}
-
-		public String getNsURI() {
-			return nsURI;
-		}
-
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ResourceManager.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ResourceManager.java
deleted file mode 100644
index 953fde33b8b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ResourceManager.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Alexander Shatalin (Borland) - initial API and implementation
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandResource;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtResource;
-
-
-/**
- * FIXME no much sense to depend on File here, it's only builder who cares about files
- * TODO describe contract - when returns null
- */
-public interface ResourceManager {
-
-    XpandResource loadXpandResource(String fullyQualifiedName);
-    
-    QvtResource loadQvtResource(String fullyQualifiedName);
-    
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ResourceMarker.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ResourceMarker.java
deleted file mode 100644
index 29bdaeb9eaf..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ResourceMarker.java
+++ /dev/null
@@ -1,16 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- */
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-public interface ResourceMarker {
-    String[] getImportedNamespaces();
-    String[] getImportedExtensions();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/RootManager.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/RootManager.java
deleted file mode 100644
index 5cf9bb8d2f0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/RootManager.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    bblajer - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-
-/**
- * Tracks template roots for a given project.
- */
-public class RootManager {
-	static final IPath PROJECT_RELATIVE_PATH_TO_CONFIG_FILE = new Path(".xpand-root");	//$NON-NLS-1$
-	private final IFile myConfig;
-	private List<RootDescription> myRoots;
-	private List<IRootChangeListener> myListeners = new ArrayList<IRootChangeListener>(2);
-
-	public RootManager(IProject project) {
-		myConfig = project.getFile(PROJECT_RELATIVE_PATH_TO_CONFIG_FILE);
-	}
-
-	public void addRootChangeListener(IRootChangeListener l) {
-		if (l != null && !myListeners.contains(l)) {
-			myListeners.add(l);
-		}
-	}
-
-	public void removeRootChangeListener(IRootChangeListener l) {
-		myListeners.remove(l);
-	}
-
-	void rootsChanged() {
-		myRoots = null;
-		for (IRootChangeListener next : myListeners) {
-			next.rootsChanged(this);
-		}
-	}
-
-	protected IProject getProject() {
-		return myConfig.getProject();
-	}
-
-	public RootDescription getRootDescription(IFile file) {
-		for (RootDescription nextDescription : getRoots()) {
-			if (nextDescription.contains(file)) {
-				return nextDescription;
-			}
-		}
-		return null;
-	}
-
-	public List<RootDescription> getRoots() {
-		if (myRoots == null) {
-			reloadRoots();
-		}
-		return myRoots;
-	}
-
-	private void reloadRoots() {
-		if (!myConfig.exists()) {
-			myRoots = Collections.singletonList(new RootDescription(DEFAULT_ROOTS));
-			return;
-		}
-		final ArrayList<RootDescription> read = new ArrayList<RootDescription>();
-		BufferedReader in = null;
-		try {
-			in = new BufferedReader(new InputStreamReader(myConfig.getContents(), myConfig.getCharset()));
-			String line;
-			while((line = in.readLine()) != null) {
-				line = line.trim();
-				if (line.length() > 0 && line.charAt(0) != '#') {
-					String[] split = line.split(",");
-					ArrayList<IPath> nextPaths = new ArrayList<IPath>(split.length);
-					for (String nextPath : split) {
-						nextPath = nextPath.trim();
-						if (nextPath.length() > 0) {
-							IPath toAdd = new Path(nextPath);
-							//Absolute paths specify resources relative to workbench and/or 
-							if (toAdd.isAbsolute() && toAdd.segmentCount() < 2) {
-								continue;
-							}
-							nextPaths.add(toAdd);
-						}
-					}
-					read.add(new RootDescription(nextPaths));
-				}
-			}
-		} catch (CoreException ex) {
-			// IGNORE
-		} catch (IOException ex) {
-			// IGNORE
-		} finally {
-			if (in != null) {
-				try {
-					in.close();
-				} catch (IOException ex) {
-					/* IGNORE */
-				}
-			}
-		}
-		myRoots = read;
-	}
-
-	public Set<IProject> getReferencedProjects() {
-		Set<IProject> result = new LinkedHashSet<IProject>();
-		for (RootDescription nextDescription : getRoots()) {
-			result.addAll(nextDescription.getReferencedProjects());
-		}
-		return result;
-	}
-
-	boolean containsProject(IPath projectPath) {
-		if (myRoots == null) {
-			return false;
-		}
-		for (RootDescription nextRoots : myRoots) {
-			for (IPath next : nextRoots.getRoots()) {
-				if (next.isAbsolute() && projectPath.isPrefixOf(next)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	private static final List<IPath> DEFAULT_ROOTS = Collections.<IPath>singletonList(new Path("templates"));	//$NON-NLS-1$
-
-	public interface IRootChangeListener {
-		public void rootsChanged(RootManager rootManager);
-	}
-
-	// TODO: make this class static?
-	public class RootDescription {
-		private final List<IPath> myRoots;
-		private Set<IProject> myReferencedProjects;
-		
-		public RootDescription(List<IPath> roots) {
-			myRoots = roots;
-		}
-
-		public Set<IProject> getReferencedProjects() {
-			if (myReferencedProjects == null) {
-				myReferencedProjects = new LinkedHashSet<IProject>();
-				for (IPath next : getRoots()) {
-					if (next.isAbsolute() && next.segmentCount() > 1) {
-						IProject candidate = ResourcesPlugin.getWorkspace().getRoot().getProject(next.segment(0));
-						if (candidate.isAccessible()) {
-							myReferencedProjects.add(candidate);
-						}
-					}
-				}
-			}
-			return myReferencedProjects;
-		}
-
-		public List<IPath> getRoots() {
-			return myRoots;
-		}
-
-		public boolean contains(IResource resource) {
-			if (resource == null) {
-				return false;
-			}
-			for (IPath nextRoot : myRoots) {
-				if (nextRoot.isAbsolute()) {
-					if (nextRoot.isPrefixOf(resource.getFullPath())) {
-						return true;
-					}
-				} else {
-					if (resource.getProject().equals(getProject()) && nextRoot.isPrefixOf(resource.getProjectRelativePath())) {
-						return true;
-					}
-				}
-			}
-			return false;
-		}
-
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/StreamsHolder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/StreamsHolder.java
deleted file mode 100644
index 9d7587034b5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/StreamsHolder.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    bblajer - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import java.util.List;
-
-/**
- * @author bblajer
- */
-public interface StreamsHolder {
-	public String getStreamContents(String slotName);
-
-	public List<String> getSlotNames();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/StringHelper.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/StringHelper.java
deleted file mode 100644
index b1c4156bb71..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/StringHelper.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006,2020 committers of openArchitectureWare, CEA LIST, Artal and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Arno Haase - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-/**
- * This class is a collection of helper functions for string handling.
- *
- * @author Arno Haase
- */
-public class StringHelper {
-
-    /**
-     * replaces special characters that affect formatting with non-formatting character sequences.
-     * <ul>
-     * <li> \ -> \\
-     * <li> &lt;tab&gt; -> \t
-     * <li> &lt;CR&gt; -> \r
-     * <li> &lt;Newline&gt; -> \n
-     * </ul>
-     */
-    public static String escape (String src) {
-        String result = src.replace ("\\", "\\\\");
-        result = result.replace("\t", "\\t");
-        result = result.replace("\r", "\\r");
-        result = result.replace("\n", "\\n");
-        result = result.replace("\"", "\\\"");
-        result = result.replace("\'", "\\\'");
-        return result;
-    }
-
-
-    /**
-     * undoes the operations of <code>escape</code>
-     */
-    public static String unescape (String src) {
-        if (src == null) {
-			return null;
-		}
-
-        final StringBuffer result = new StringBuffer ();
-        for (int i = 0; i < src.length (); i++) {
-            final char curChar = src.charAt (i);
-
-            if (curChar != '\\') {
-                result.append (curChar);
-                continue;
-            }
-
-            i++;
-            if (i >= src.length ()) {
-				throw new IllegalArgumentException ("String ends with '\\'");
-			}
-
-            result.append (unescapeChar (src.charAt (i)));
-        }
-
-        return result.toString ();
-    }
-
-    private static char unescapeChar (char escapedChar) {
-        switch (escapedChar) {
-            case '\\':
-                return '\\';
-            case 'n':
-                return '\n';
-            case 'r':
-                return '\r';
-            case 't':
-                return '\t';
-            case '"':
-                return '"';
-            case '\'':
-                return '\'';
-        }
-        throw new IllegalArgumentException ("unsupported string format: '\\" + escapedChar + "' is not supported.");
-    }
-
-    /**
-     * removes a number of characters from the beginning and the end of a string
-     */
-    public static String strip (String s, int numStart, int numEnd) {
-        if (s == null) {
-			return s;
-		}
-
-        return s.substring(numStart, s.length () - numEnd);
-    }
-
-    public static String firstUpper (String str) {
-        if ((str == null) || (str.length () == 0)) {
-			return str;
-		}
-        char[] arr = str.toCharArray();
-        arr[0] = Character.toUpperCase(arr[0]);
-        return new String(arr);
-    }
-
-    public static String firstLower (String str) {
-        if ((str == null) || (str.length () == 0)) {
-			return str;
-		}
-        char[] arr = str.toCharArray();
-        arr[0] = Character.toLowerCase(arr[0]);
-        return new String(arr);
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/XpandFacade.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/XpandFacade.java
deleted file mode 100644
index 6d6276f3a4b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/XpandFacade.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.xpand;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AmbiguousDefinitionException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContextImpl;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Scope;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandResource;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-
-/**
- * @author Sven Efftinge
- */
-public class XpandFacade {
-	private final Scope scope;
-	private ExecutionContext ctx;
-
-	public XpandFacade(Scope scope) {
-		assert scope != null;
-		this.scope = scope;
-	}
-
-	public XpandFacade(ExecutionContext ctx) {
-		this(ctx.getScope());
-		this.ctx = ctx;
-	}
-
-	public void evaluate(final String definitionName, final Object targetObject, Object[] params) throws AmbiguousDefinitionException {
-		params = params == null ? new Object[0] : params;
-		final EClassifier targetType = BuiltinMetaModel.getType(getContext(), targetObject);
-		final EClassifier[] paramTypes = new EClassifier[params.length];
-		for (int i = 0; i < paramTypes.length; i++) {
-			paramTypes[i] = BuiltinMetaModel.getType(getContext(), params[i]);
-		}
-
-		final XpandDefinition def = getContext().findDefinition(definitionName, targetType, paramTypes);
-		if (def == null) {
-			// TODO: throw DefinitionNotFoundException from here (just like AmbiguousDefinitionException)
-			throw new EvaluationException("No Definition " + definitionName + getParamString(paramTypes) + " for " + targetType.getName() + " could be found!");
-		}
-		
-		ExecutionContext ctx = new ExecutionContextImpl(scope);
-		ctx = ctx.cloneWithResource(def.getOwner());
-		ctx = ctx.cloneWithVariable(new Variable(ExecutionContext.IMPLICIT_VARIABLE, def.getTargetType().getTypeForName(ctx), targetObject));
-		for (int i = 0; i < params.length; i++) {
-			DeclaredParameter declaredParameter = def.getParams()[i];
-			ctx = ctx.cloneWithVariable(new Variable(declaredParameter.getVarName(), declaredParameter.getTypeForName(ctx), params[i]));
-		}
-
-		def.evaluate(ctx);
-	}
-
-	// FIXME Actually, we don't need the whole context, just currentResource(),
-	// but that would be another story to fix.
-	private ExecutionContext getContext() {
-		if (ctx == null) {
-			ctx = new ExecutionContextImpl(scope);
-		}
-		return ctx;
-	}
-
-	private String getParamString(final EClassifier[] paramTypes) {
-		if (paramTypes.length == 0) {
-			return "";
-		}
-		final StringBuilder buff = new StringBuilder("(");
-		for (int i = 0; i < paramTypes.length; i++) {
-			final EClassifier t = paramTypes[i];
-			buff.append(t.getName());
-			if (i + 1 < paramTypes.length) {
-				buff.append(",");
-			}
-		}
-		buff.append(")");
-		return buff.toString();
-	}
-
-	public AnalysationIssue[] analyze(final String templateName) {
-		final Set<AnalysationIssue> issues = new HashSet<AnalysationIssue>();
-		final XpandResource tpl = scope.findTemplate(templateName);
-		tpl.analyze(new ExecutionContextImpl(scope, tpl, null), issues);
-		return issues.toArray(new AnalysationIssue[issues.size()]);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AbstractAstVisitor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AbstractAstVisitor.java
deleted file mode 100644
index d0ae73b718e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AbstractAstVisitor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAdvice;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-public abstract class AbstractAstVisitor implements AstVisitor {
-
-	public boolean visit(Template template) {
-		return true;
-	}
-
-	public boolean visit(XpandAdvice advice) {
-		if (advice instanceof AbstractDefinition) {
-			return visit((AbstractDefinition) advice);
-		}
-		return true;
-	}
-
-	public boolean visit(XpandDefinition definition) {
-		if (definition instanceof AbstractDefinition) {
-			return visit((AbstractDefinition) definition);
-		}
-		return true;
-	}
-
-	protected boolean visit(AbstractDefinition definition) {
-		return true;
-	}
-
-	public boolean visit(ErrorStatement statement) {
-		visitExpressionHelper(statement.getMessage());
-		return true;
-	}
-
-	public boolean visit(ExpandStatement statement) {
-		for (ExpressionHelper parameter : statement.getParameters()) {
-			visitExpressionHelper(parameter);
-		}
-		if (statement.getSeparator() != null) {
-			visitExpressionHelper(statement.getSeparator());
-		}
-		if (statement.getTarget() != null) {
-			visitExpressionHelper(statement.getTarget());
-		}
-		return true;
-	}
-
-	public boolean visit(ExpressionStatement statement) {
-		visitExpressionHelper(statement.getExpression());
-		return true;
-	}
-
-	public boolean visit(FileStatement statement) {
-		visitExpressionHelper(statement.getTargetFileName());
-		return true;
-	}
-
-	public boolean visit(ForEachStatement statement) {
-		if (statement.getSeparator() != null) {
-			visitExpressionHelper(statement.getSeparator());
-		}
-		visitExpressionHelper(statement.getTarget());
-		return true;
-	}
-
-	public boolean visit(IfStatement statement) {
-		if (statement.getCondition() != null) {
-			visitExpressionHelper(statement.getCondition());
-		}
-		return true;
-	}
-
-	public boolean visit(LetStatement statement) {
-		visitExpressionHelper(statement.getVarValue());
-		return true;
-	}
-
-	public boolean visit(ProtectStatement statement) {
-		visitExpressionHelper(statement.getCommentStart());
-		visitExpressionHelper(statement.getCommentEnd());
-		visitExpressionHelper(statement.getId());
-		return true;
-	}
-
-	public boolean visit(TextStatement statement) {
-		return true;
-	}
-
-	public boolean visit(Statement statement) {
-		return true;
-	}
-
-	protected void visitExpressionHelper(ExpressionHelper expressionHelper) {
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AbstractDefinition.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AbstractDefinition.java
deleted file mode 100644
index ed8b3e64508..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AbstractDefinition.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005,2008 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.ocl.cst.TypeCS;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAnalyzable;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandEvaluatable;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.TypeHelper;
-
-public abstract class AbstractDefinition extends SyntaxElement implements XpandAnalyzable, XpandEvaluatable {
-
-    protected final TypeHelper type;
-
-    protected final DeclaredParameter[] params;
-
-    private final Statement[] body;
-
-    protected Template owner = null;
-
-    public AbstractDefinition(final int start, final int end, final int line, final TypeCS type, final DeclaredParameter[] params, final Statement[] body) {
-        super(start, end, line);
-        this.type = new TypeHelper(type);
-        this.params = params;
-        this.body = body;
-    }
-
-    /**
-	 * FIXME used only in tests, should I keep it?
-	 */
-	public Statement[] getBody() {
-		return body;
-	}
-
-	public void setOwner(final Template owner) {
-        this.owner = owner;
-    }
-
-    public void analyze(ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-        final EClassifier thisType = type.getTypeForName(ctx);
-        if (thisType == null) {
-            issues.add(new AnalysationIssue(AnalysationIssue.Type.TYPE_NOT_FOUND, "Couldn't find " + type.getName(), this));
-        }
-        ctx = ctx.cloneWithVariable(new Variable(ExecutionContext.IMPLICIT_VARIABLE, thisType, null));
-        Variable[] vars = new Variable[params.length];
-        for (int i = 0; i < params.length; i++) {
-            EClassifier paramType = params[i].getTypeForName(ctx);
-            if (paramType == null) {
-                issues.add(new AnalysationIssue(AnalysationIssue.Type.TYPE_NOT_FOUND, "Couldn't find "
-                        + params[i].getTypeName(), this /* FIXME: was: params[i].getType()*/));
-                paramType = EcorePackage.eINSTANCE.getEObject();
-            }
-            final String name = params[i].getVarName();
-            vars[i] = new Variable(name, paramType, null);
-        }
-        ctx = ctx.cloneWithVariable(vars);
-        for (int i = 0; i < body.length; i++) {
-            body[i].analyze(ctx, issues);
-        }
-    }
-
-    public void evaluate(ExecutionContext ctx) {
-        ctx = ctx.cloneWithResource(owner);
-        for (int i = 0; i < body.length; i++) {
-            body[i].evaluate(ctx);
-        }
-    }
-    
-    public TypeHelper getType() {
-    	return type;
-    }
-    
-    public DeclaredParameter[] getParemeters() {
-    	return params;
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Advice.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Advice.java
deleted file mode 100644
index 393d84a3f52..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Advice.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.cst.TypeCS;
-import org.eclipse.papyrus.gmf.internal.xpand.BuiltinMetaModel;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.Identifier;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAdvice;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-import org.eclipse.papyrus.gmf.internal.xpand.util.TypeNameUtil;
-
-/**
- * @author Sven Efftinge
- */
-public class Advice extends AbstractDefinition implements XpandAdvice {
-
-    public final static String DEF_VAR_NAME = "targetDef";
-
-    private final Identifier pointCut;
-
-    private final boolean wildParams;
-
-    public Advice(final int start, final int end, final int line, final Identifier pointCut, final TypeCS type,
-            final DeclaredParameter[] params, final boolean wildParams, final Statement[] body) {
-        super(start, end, line, type, params, body);
-        this.pointCut = pointCut;
-        this.wildParams = wildParams;
-    }
-
-    public Identifier getPointCut() {
-        return pointCut;
-    }
-
-    @Override
-    public String toString() {
-        return owner.getFullyQualifiedName() + " " + pointCut.getValue() + getParamString() + " FOR " + type.toString();
-    }
-
-    @Override
-    public void analyze(ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-        ctx = ctx.cloneWithVariable(new Variable(DEF_VAR_NAME, BuiltinMetaModel.DEFINITION_TYPE, null));
-        super.analyze(ctx, issues);
-    }
-
-    private String getParamString() {
-        if ((params == null) || (params.length == 0)) {
-			return wildParams ? "(*)" : "";
-		}
-        final StringBuilder buff = new StringBuilder("(");
-        for (int i = 0; i < params.length; i++) {
-            final DeclaredParameter p = params[i];
-            buff.append(p.getVarName()).append(" ").append(p.getTypeName());
-            if (i + 1 < params.length) {
-                buff.append(",");
-            }
-        }
-        if (wildParams) {
-            buff.append(",*");
-        }
-        return buff.append(")").toString();
-    }
-
-    private Pattern p = null;
-
-    public boolean matches(final XpandDefinition def, ExecutionContext ctx) {
-        if (p == null) {
-            p = Pattern.compile(pointCut.getValue().replaceAll("\\*", ".*"));
-        }
-        // 1) AROUND simpleName
-        final Matcher m1 = p.matcher(def.getName());
-        // 2) AROUND fully::qualified::name
-        final Matcher m2 = p.matcher(def.getOwner().getFullyQualifiedName() + TypeNameUtil.NS_DELIM + def.getName());
-        if (m1.matches() || m2.matches()) {
-            ctx = ctx.cloneWithResource(def.getOwner());
-            final EClassifier t = def.getTargetType().getTypeForName(ctx);
-            final EClassifier[] paramTypes = new EClassifier[def.getParams().length];
-            for (int i = 0; i < paramTypes.length; i++) {
-                paramTypes[i] = def.getParams()[i].getTypeForName(ctx);
-            }
-            // FIXME next check can be done earlier
-            if ((params.length == paramTypes.length) || (wildParams && (params.length <= paramTypes.length))) {
-
-                ctx = ctx.cloneWithResource(this.owner);	//need to resolve in the context of the aspect
-                final EClassifier at = type.getTypeForName(ctx);
-                if (BuiltinMetaModel.isAssignableFrom(ctx, at, t)) {
-                    for (int i = 0; i < params.length; i++) {
-                        final EClassifier pt = params[i].getTypeForName(ctx);
-                        if (!BuiltinMetaModel.isAssignableFrom(ctx, pt, paramTypes[i])) {
-							return false;
-						}
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AstIterator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AstIterator.java
deleted file mode 100644
index 1de1c78b0f4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AstIterator.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAdvice;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-
-public class AstIterator {
-
-	private AstVisitor myVisitor;
-
-	AstIterator(AstVisitor visitor) {
-		myVisitor = visitor;
-	}
-
-	public void iterate(Template template) {
-		if (!myVisitor.visit(template)) {
-			return;
-		}
-		for (XpandDefinition definition : template.getDefinitions()) {
-			iterate(definition);
-		}
-
-		for (XpandAdvice advice : template.getAdvices()) {
-			iterate(advice);
-		}
-	}
-
-	public void iterate(XpandDefinition definition) {
-		if (!myVisitor.visit(definition)) {
-			return;
-		}
-		if (definition instanceof AbstractDefinition) {
-			iterate(((AbstractDefinition) definition).getBody());
-		}
-	}
-
-	public void iterate(XpandAdvice advice) {
-		if (!myVisitor.visit(advice)) {
-			return;
-		}
-		if (advice instanceof AbstractDefinition) {
-			iterate(((AbstractDefinition) advice).getBody());
-		}
-	}
-
-	public void iterate(Statement[] body) {
-		for (Statement statement : body) {
-			if (statement instanceof ErrorStatement) {
-				iterate((ErrorStatement) statement);
-			} else if (statement instanceof ExpandStatement) {
-				iterate((ExpandStatement) statement);
-			} else if (statement instanceof ExpressionStatement) {
-				iterate((ExpressionStatement) statement);
-			} else if (statement instanceof FileStatement) {
-				iterate((FileStatement) statement);
-			} else if (statement instanceof ForEachStatement) {
-				iterate((ForEachStatement) statement);
-			} else if (statement instanceof IfStatement) {
-				iterate((IfStatement) statement);
-			} else if (statement instanceof LetStatement) {
-				iterate((LetStatement) statement);
-			} else if (statement instanceof ProtectStatement) {
-				iterate((ProtectStatement) statement);
-			} else if (statement instanceof TextStatement) {
-				iterate((TextStatement) statement);
-			} else {
-				iterate(statement);
-			}
-		}
-	}
-
-	public void iterate(Statement statement) {
-		myVisitor.visit(statement);
-	}
-
-	public void iterate(TextStatement statement) {
-		myVisitor.visit(statement);
-	}
-
-	public void iterate(ProtectStatement statement) {
-		if (!myVisitor.visit(statement)) {
-			return;
-		}
-		iterate(statement.getBody());
-	}
-
-	public void iterate(LetStatement statement) {
-		if (!myVisitor.visit(statement)) {
-			return;
-		}
-		iterate(statement.getBody());
-	}
-
-	public void iterate(IfStatement statement) {
-		if (!myVisitor.visit(statement)) {
-			return;
-		}
-		iterate(statement.getThenPart());
-		if (statement.getElseIf() != null) {
-			iterate(statement.getElseIf());
-		}
-	}
-
-	public void iterate(ForEachStatement statement) {
-		if (!myVisitor.visit(statement)) {
-			return;
-		}
-		iterate(statement.getBody());
-	}
-
-	public void iterate(FileStatement statement) {
-		if (!myVisitor.visit(statement)) {
-			return;
-		}
-		iterate(statement.getBody());
-	}
-
-	public void iterate(ExpressionStatement statement) {
-		myVisitor.visit(statement);
-	}
-
-	public void iterate(ExpandStatement statement) {
-		myVisitor.visit(statement);
-	}
-
-	public void iterate(ErrorStatement statement) {
-		myVisitor.visit(statement);
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AstVisitor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AstVisitor.java
deleted file mode 100644
index 1c41b9de0e8..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/AstVisitor.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAdvice;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-
-public interface AstVisitor {
-
-	boolean visit(Template template);
-
-	boolean visit(XpandAdvice advice);
-
-	boolean visit(XpandDefinition definition);
-
-	boolean visit(ErrorStatement statement);
-
-	boolean visit(ExpandStatement statement);
-
-	boolean visit(ExpressionStatement statement);
-
-	boolean visit(FileStatement statement);
-
-	boolean visit(ForEachStatement statement);
-
-	boolean visit(IfStatement statement);
-
-	boolean visit(LetStatement statement);
-
-	boolean visit(ProtectStatement statement);
-
-	boolean visit(TextStatement statement);
-
-	boolean visit(Statement statement);
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/CompositeAstVisitor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/CompositeAstVisitor.java
deleted file mode 100644
index 5b9bc35687b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/CompositeAstVisitor.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAdvice;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-
-public class CompositeAstVisitor implements AstVisitor {
-
-	private AstVisitor[] myVisitors;
-
-	public CompositeAstVisitor(AstVisitor... visitors) {
-		myVisitors = visitors;
-	}
-
-	public boolean visit(Template template) {
-		return visitAll(template, Template.class);
-	}
-
-	public boolean visit(XpandAdvice advice) {
-		return visitAll(advice, XpandAdvice.class);
-	}
-
-	public boolean visit(XpandDefinition definition) {
-		return visitAll(definition, XpandDefinition.class);
-	}
-
-	public boolean visit(ErrorStatement statement) {
-		return visitAll(statement, ErrorStatement.class);
-	}
-
-	public boolean visit(ExpandStatement statement) {
-		return visitAll(statement, ExpandStatement.class);
-	}
-
-	public boolean visit(ExpressionStatement statement) {
-		return visitAll(statement, ExpressionStatement.class);
-	}
-
-	public boolean visit(FileStatement statement) {
-		return visitAll(statement, FileStatement.class);
-	}
-
-	public boolean visit(ForEachStatement statement) {
-		return visitAll(statement, ForEachStatement.class);
-	}
-
-	public boolean visit(IfStatement statement) {
-		return visitAll(statement, IfStatement.class);
-	}
-
-	public boolean visit(LetStatement statement) {
-		return visitAll(statement, LetStatement.class);
-	}
-
-	public boolean visit(ProtectStatement statement) {
-		return visitAll(statement, ProtectStatement.class);
-	}
-
-	public boolean visit(TextStatement statement) {
-		return visitAll(statement, TextStatement.class);
-	}
-
-	public boolean visit(Statement statement) {
-		return visitAll(statement, Statement.class);
-	}
-
-	private boolean visitAll(Object astElement, Class<?> parameterType) {
-		try {
-			Method visitMethod = AstVisitor.class.getMethod("visit", parameterType);
-			boolean breakIteration = true;
-			for (AstVisitor visitor : myVisitors) {
-				Object result = visitMethod.invoke(visitor, astElement);
-				assert result instanceof Boolean;
-				breakIteration = breakIteration && !((Boolean) result);
-			}
-			return !breakIteration;
-		} catch (SecurityException e) {
-		} catch (NoSuchMethodException e) {
-		} catch (IllegalArgumentException e) {
-		} catch (IllegalAccessException e) {
-		} catch (InvocationTargetException e) {
-		}
-		assert false : "incorrect parameter type passed";
-		return false;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Definition.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Definition.java
deleted file mode 100644
index 15cc5fa22c0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Definition.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import org.eclipse.ocl.cst.TypeCS;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.Identifier;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.TypeHelper;
-import org.eclipse.papyrus.gmf.internal.xpand.util.TypeNameUtil;
-
-/**
- * @author Sven Efftinge
- */
-public class Definition extends AbstractDefinition implements XpandDefinition {
-    private final Identifier name;
-
-    public Definition(final int start, final int end, final int line, final Identifier name, final TypeCS type,
-            final DeclaredParameter[] params, final Statement[] body) {
-        super(start, end, line, type, params, body);
-        this.name = name;
-    }
-
-    public String getName() {
-        return name.getValue();
-    }
-
-    public TypeHelper getTargetType() {
-    	return type;
-    }
-
-	public final Template getOwner() {
-		return owner;
-	}
-
-	public final DeclaredParameter[] getParams() {
-		return params;
-	}
-
-    @Override
-    public String toString() {
-        return getOwner().getFullyQualifiedName() + TypeNameUtil.NS_DELIM + getName() + getParamString() + " FOR " + type.getName();
-    }
-
-    private String getParamString() {
-        if ((params == null) || (params.length == 0)) {
-			return "";
-		}
-        final StringBuilder buff = new StringBuilder("(");
-        for (int i = 0; i < params.length; i++) {
-            final DeclaredParameter p = params[i];
-            buff.append(p.getVarName()).append(" ").append(p.getTypeName());
-            if (i + 1 < params.length) {
-                buff.append(",");
-            }
-        }
-        return buff.append(")").toString();
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ErrorStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ErrorStatement.java
deleted file mode 100644
index 5096e4628ba..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ErrorStatement.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.text.MessageFormat;
-import java.util.Set;
-
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class ErrorStatement extends Statement {
-
-	private final ExpressionHelper message;
-
-    public ErrorStatement(final int start, final int end, final int line, final OCLExpressionCS msg) {
-        super(start, end, line);
-        message = new ExpressionHelper(msg, this);
-    }
-
-    public void analyze(final ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-    	message.analyze(ctx, issues);
-    }
-
-    @Override
-    public void evaluateInternal(final ExecutionContext ctx) {
-		String result = String.valueOf(message.evaluate(ctx));
-        throw new RuntimeException(MessageFormat.format("Error in {0}:{1}: {2}", getFileName(), getLine(), result));
-    }
-
-    ExpressionHelper getMessage() {
-    	return message;
-    }
-    
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ExpandStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ExpandStatement.java
deleted file mode 100644
index d9b4d079006..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ExpandStatement.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.ocl.cst.PathNameCS;
-import org.eclipse.ocl.ecore.CollectionType;
-import org.eclipse.papyrus.gmf.internal.xpand.XpandFacade;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AmbiguousDefinitionException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.TypeHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class ExpandStatement extends Statement {
-
-    private final boolean isForeach;
-
-    private final ExpressionHelper[] parameters;
-
-    private final ExpressionHelper separator;
-
-    private final ExpressionHelper target;
-
-    private final String definition;
-
-    public ExpandStatement(final int start, final int end, final int line, final PathNameCS definition,
-            final OCLExpressionCS target, final OCLExpressionCS separator, final OCLExpressionCS[] parameters, final boolean foreach) {
-        super(start, end, line);
-        this.definition = TypeHelper.toString(definition);
-        this.target = target == null ? null : new ExpressionHelper(target, this);
-        this.separator = separator == null ? null : new ExpressionHelper(separator, this);
-        if (parameters == null) {
-        	this.parameters = new ExpressionHelper[0];
-        } else {
-        	this.parameters = new ExpressionHelper[parameters.length];
-        	for (int i = 0; i < parameters.length; i++) {
-        		this.parameters[i] = new ExpressionHelper(parameters[i], this);
-        	}
-        }
-        this.isForeach = foreach;
-    }
-
-    public void analyze(final ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-        final EClassifier[] paramTypes = new EClassifier[parameters.length];
-        for (int i = 0; i < parameters.length; i++) {
-            paramTypes[i] = parameters[i].analyze(ctx, issues);
-
-        }
-        EClassifier targetType = null;
-        if (isForeach) {
-            targetType = target.analyze(ctx, issues);
-            if (targetType instanceof CollectionType) {
-                targetType = ((CollectionType) targetType).getElementType();
-            } else {
-                issues.add(new AnalysationIssue(AnalysationIssue.Type.INCOMPATIBLE_TYPES, "Collection type expected!", target));
-                return;
-            }
-        } else {
-            final Variable var = ctx.getImplicitVariable();
-            if (var == null) {
-                issues.add(new AnalysationIssue(AnalysationIssue.Type.INTERNAL_ERROR, "No implicite variable 'this/self' could be found!", target));
-                return;
-            }
-            targetType = var.getType();
-            if (target != null) {
-                targetType = target.analyze(ctx, issues);
-            }
-        }
-        if ((targetType == null) || Arrays.asList(paramTypes).contains(null)) {
-			return;
-		}
-        try {
-	        final XpandDefinition def = ctx.findDefinition(definition, targetType, paramTypes);
-	        if (def == null) {
-	            issues.add(new AnalysationIssue(AnalysationIssue.Type.DEFINITION_NOT_FOUND,
-	                    "Couldn't find definition " + definition + getParamTypeString(paramTypes)
-	                            + " for type " + targetType.getName(), this));
-	        }
-        } catch (AmbiguousDefinitionException e) {
-			issues.add(new AnalysationIssue(AnalysationIssue.Type.DEFINITION_NOT_FOUND, e.getMessage(), this));
-        }
-    }
-
-    @Override
-    public void evaluateInternal(final ExecutionContext ctx) {
-        final Object[] params = new Object[parameters.length];
-        for (int i = 0; i < parameters.length; i++) {
-            params[i] = parameters[i].evaluate(ctx);
-        }
-        final String sep = (String) (separator != null ? separator.evaluate(ctx) : null);
-        Object targetObject = null;
-        XpandFacade xpandFacade = new XpandFacade(ctx);
-        try {
-	        if (isForeach) {
-	            targetObject = target.evaluate(ctx);
-	            if (!(targetObject instanceof Collection)) {
-					throw new EvaluationException("Collection expected (was: " + targetObject.getClass().getName() + ")!", target);
-				}
-	
-	            final Collection<?> col = (Collection<?>) targetObject;
-	            for (final Iterator<?> iter = col.iterator(); iter.hasNext();) {
-	                
-					xpandFacade.evaluate(definition, iter.next(), params);
-	                if ((sep != null) && iter.hasNext()) {
-	                    ctx.getScope().getOutput().write(sep);
-	                }
-	            }
-	
-	        } else {
-	            if (target != null) {
-	                targetObject = target.evaluate(ctx);
-	            } else {
-	                final Variable var = ctx.getImplicitVariable();
-	                targetObject = var.getValue();
-	            }
-	            if (targetObject != null) {
-					xpandFacade.evaluate(definition, targetObject, params);
-	            } else {
-	            	// XXX logInfo that feature value is null or conditionally fail?
-	            	// perhaps, could check if target is feature and multiplicity of the feature is at least 1 and fail then?
-	            	// though all these checks are not template's tasks
-	            }
-	        }
-		} catch (AmbiguousDefinitionException e) {
-			throw new EvaluationException(e.getMessage(), this);
-		}
-
-    }
-
-    private String getParamTypeString(final EClassifier[] paramTypes) {
-        if (paramTypes.length == 0) {
-			return "";
-		}
-        final StringBuffer buff = new StringBuffer("(");
-        for (int i = 0; i < paramTypes.length; i++) {
-            final EClassifier type = paramTypes[i];
-            buff.append(type.getName());
-            if (i + 1 < paramTypes.length) {
-                buff.append(", ");
-            }
-        }
-        return buff.append(")").toString();
-    }
-
-    private String getParamString() {
-        if (parameters.length == 0) {
-			return "";
-		}
-        final StringBuffer buff = new StringBuffer("(");
-        for (int i = 0; i < parameters.length; i++) {
-            buff.append(parameters[i]);
-            if (i + 1 < parameters.length) {
-                buff.append(", ");
-            }
-        }
-        return buff.append(")").toString();
-    }
-
-    @Override
-    public String toString() {
-        return "EXPAND " + definition + getParamString()
-                + (target != null ? (isForeach ? " FOREACH " : " FOR ") + target : "")
-                + (separator != null ? " SEPARATOR " + separator : "");
-    }
-    
-    ExpressionHelper getTarget() {
-    	return target;
-    }
-    
-    ExpressionHelper getSeparator() {
-    	return separator;
-    }
-    
-    ExpressionHelper[] getParameters() {
-    	return parameters;
-    }
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ExpressionStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ExpressionStatement.java
deleted file mode 100644
index c7906544c42..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ExpressionStatement.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Set;
-
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class ExpressionStatement extends org.eclipse.papyrus.gmf.internal.xpand.ast.Statement {
-
-    private final ExpressionHelper expression;
-
-    public ExpressionStatement(final int start, final int end, final int line, final OCLExpressionCS exprCS) {
-        super(start, end, line);
-        this.expression = new ExpressionHelper(exprCS, this);
-    }
-
-    public void analyze(final ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-    	expression.analyze(ctx, issues);
-    }
-
-    @Override
-    public void evaluateInternal(final ExecutionContext ctx) {
-    	Object val = expression.evaluate(ctx);
-        if (val != null) {
-            ctx.getScope().getOutput().write(val.toString());
-        }
-    }
-    
-    ExpressionHelper getExpression() {
-    	return expression;
-    }
-    
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/FileStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/FileStatement.java
deleted file mode 100644
index 2b8ce97cf75..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/FileStatement.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2009 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.Identifier;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class FileStatement extends Statement {
-
-    private final ExpressionHelper fileName;
-
-    private final Statement[] body;
-
-    private final Identifier mode;
-
-    public FileStatement(final int start, final int end, final int line, final OCLExpressionCS fileNameCS, final Statement[] body, final Identifier mode) {
-        super(start, end, line);
-        this.fileName = new ExpressionHelper(fileNameCS, this);
-        this.body = body;
-        this.mode = mode;
-    }
-
-    /**
-	 * FIXME next 3 methods are for tests only, shouldn't I refactor tests to avoid exposing internals?
-	 */
-    public ExpressionHelper getTargetFileName() {
-    	return fileName;
-    }
-	public Statement[] getBody() {
-		return body;
-	}
-	public Identifier getMode() {
-		return mode;
-	}
-
-    public void analyze(final ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-        final EClassifier result = fileName.analyze(ctx, issues);
-        if (ctx.getOCLEnvironment().getOCLStandardLibrary().getString() != result) {
-            issues.add(new AnalysationIssue(AnalysationIssue.Type.INCOMPATIBLE_TYPES, "String expected!", fileName));
-        }
-        for (Statement element : body) {
-            element.analyze(ctx, issues);
-        }
-    }
-
-    @Override
-    public void evaluateInternal(final ExecutionContext ctx) {
-        final Object result = fileName.evaluate(ctx);
-        if (result == null) {
-			throw new EvaluationException("Nullevaluation", fileName);
-		}
-        final String fileName = result.toString();
-        String modeVal = null;
-        if (mode != null) {
-            modeVal = mode.getValue();
-        }
-        ctx.getScope().getOutput().openFile(fileName, modeVal);
-        for (Statement element : body) {
-            element.evaluate(ctx);
-        }
-        ctx.getScope().getOutput().closeFile();
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ForEachStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ForEachStatement.java
deleted file mode 100644
index 0ce37699866..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ForEachStatement.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.ocl.ecore.CollectionType;
-import org.eclipse.papyrus.gmf.internal.xpand.BuiltinMetaModel;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.Identifier;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandIterator;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class ForEachStatement extends Statement {
-
-	public static final String ITERATOR_VAR_NAME = "iterator";
-
-	private final Statement[] body;
-
-	private final ExpressionHelper target;
-
-	private final ExpressionHelper separator;
-
-	private final Identifier variable;
-
-	private final Identifier iteratorName;
-
-	public ForEachStatement(final int start, final int end, final int line, final Identifier variable, final OCLExpressionCS target, final Statement[] body, final OCLExpressionCS separator, final Identifier iterator) {
-		super(start, end, line);
-		this.variable = variable;
-		this.target = new ExpressionHelper(target, this);
-		this.body = body;
-		this.separator = separator == null ? null : new ExpressionHelper(separator, this);
-		iteratorName = iterator;
-	}
-
-	public void analyze(ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-		EClassifier t = target.analyze(ctx, issues);
-		if (separator != null) {
-			final EClassifier sepT = separator.analyze(ctx, issues);
-			if (ctx.getOCLEnvironment().getOCLStandardLibrary().getString() != sepT) {
-				issues.add(new AnalysationIssue(AnalysationIssue.Type.INCOMPATIBLE_TYPES, "String expected!", target));
-			}
-		}
-		if (t != null) {
-			if (t instanceof CollectionType) {
-				t = ((CollectionType) t).getElementType();
-			} else {
-				issues.add(new AnalysationIssue(AnalysationIssue.Type.INCOMPATIBLE_TYPES, "Collection type expected!", target));
-				return;
-			}
-		}
-		// XXX odd - is t == null ok here?
-		ctx = ctx.cloneWithVariable(new Variable(variable.getValue(), t, null));
-		if (iteratorName != null) {
-			ctx = ctx.cloneWithVariable(new Variable(iteratorName.getValue(), BuiltinMetaModel.ITERATOR_TYPE, null));
-		}
-		for (Statement statement : body) {
-			statement.analyze(ctx, issues);
-		}
-	}
-
-	@Override
-	public void evaluateInternal(ExecutionContext ctx) {
-		Set<AnalysationIssue> issues = new HashSet<AnalysationIssue>();
-		EClassifier targetType = target.analyze(ctx, issues);
-		if (issues.size() > 0 || false == targetType instanceof CollectionType) {
-			throw new EvaluationException("Can't evaluate FOREACH expression: target collection type cannot be defined", target);
-		}
-		EClassifier targetElementType = ((CollectionType) targetType).getElementType();
-		final Object o = target.evaluate(ctx);
-
-		if (!(o instanceof Collection<?>)) {
-			throw new EvaluationException("Collection expected (was: " + o.getClass().getName() + ")!", target);
-		}
-		final Collection<?> col = (Collection<?>) o;
-		final String sep = (String) (separator != null ? separator.evaluate(ctx) : null);
-		final XpandIterator iterator = new XpandIterator(col.size());
-
-		if (iteratorName != null) {
-			ctx = ctx.cloneWithVariable(new Variable(iteratorName.getValue(), BuiltinMetaModel.ITERATOR_TYPE, iterator));
-		}
-		for (final Iterator<?> iter = col.iterator(); iter.hasNext();) {
-			final Object element = iter.next();
-			if (!BuiltinMetaModel.isAssignableFrom(ctx, targetElementType, BuiltinMetaModel.getType(ctx, element))) {
-				throw new EvaluationException("Can't evaluate FOREACH expression: actual collection element type is not assignable to declared collection element type", this);
-			}
-			ctx = ctx.cloneWithVariable(new Variable(variable.getValue(), targetElementType, element));
-			for (int i = 0; i < body.length; i++) {
-				body[i].evaluate(ctx);
-			}
-			if ((sep != null) && iter.hasNext()) {
-				ctx.getScope().getOutput().write(sep);
-			}
-			iterator.increment();
-		}
-	}
-	
-	ExpressionHelper getSeparator() {
-		return separator;
-	}
-	
-	ExpressionHelper getTarget() {
-		return target;
-	}
-	
-	Statement[] getBody() {
-		return body;
-	}
-	
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/IfStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/IfStatement.java
deleted file mode 100644
index 096926d0859..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/IfStatement.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class IfStatement extends Statement {
-
-    private final ExpressionHelper condition;
-
-    private final Statement[] thenPart;
-
-    private IfStatement elseIf;
-
-    public IfStatement(final int start, final int end, final int line, final OCLExpressionCS condition,
-            final Statement[] thenPart, final IfStatement elseIf) {
-        super(start, end, line);
-        this.condition = condition == null ? null : new ExpressionHelper(condition, this);
-        this.thenPart = thenPart;
-        this.elseIf = elseIf;
-    }
-
-    /**
-	 * FIXME used in tests only, should I keep it?
-	 */
-	public ExpressionHelper getCondition() {
-		return condition;
-	}
-
-	public IfStatement getElseIf() {
-		return elseIf;
-	}
-
-    // XXX modifiable AST
-    public void setElseIf(final IfStatement elseIf) {
-        this.elseIf = elseIf;
-    }
-
-    public void analyze(final ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-        if (condition != null) {
-            final EClassifier conType = condition.analyze(ctx, issues);
-            if (conType != ctx.getOCLEnvironment().getOCLStandardLibrary().getBoolean()) {
-                issues.add(new AnalysationIssue(AnalysationIssue.Type.INCOMPATIBLE_TYPES, "Boolean expected!", condition));
-            }
-        }
-        for (int i = 0; i < thenPart.length; i++) {
-            thenPart[i].analyze(ctx, issues);
-        }
-        if (elseIf != null) {
-            elseIf.analyze(ctx, issues);
-        }
-    }
-
-    @Override
-    public void evaluateInternal(final ExecutionContext ctx) {
-        if (condition != null) {
-            final Object result = condition.evaluate(ctx);
-            if (result == null) {
-				throw new EvaluationException("Nullevaluation!", condition);
-			}
-            if (!(result instanceof Boolean)) {
-				throw new EvaluationException("Boolean expected (was: " + result.getClass().getName() + ")!", condition);
-			}
-            if (((Boolean) result).booleanValue()) {
-                for (int i = 0; i < thenPart.length; i++) {
-                    thenPart[i].evaluate(ctx);
-                }
-            } else if (elseIf != null) {
-                elseIf.evaluate(ctx);
-            }
-        } else {
-            for (int i = 0; i < thenPart.length; i++) {
-                thenPart[i].evaluate(ctx);
-            }
-        }
-    }
-    
-    Statement[] getThenPart() {
-    	return thenPart;
-    }
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ImportDeclaration.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ImportDeclaration.java
deleted file mode 100644
index 8387bbe97ea..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ImportDeclaration.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
-  *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import org.eclipse.ocl.cst.PathNameCS;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.TypeHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class ImportDeclaration extends SyntaxElement {
-
-    private final String importString;
-
-    public ImportDeclaration(final int start, final int end, final int line, final PathNameCS importString) {
-        super(start, end, line);
-        this.importString = TypeHelper.toString(importString);
-    }
-
-    public String getImportString() {
-        return importString;
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/LetStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/LetStatement.java
deleted file mode 100644
index 0e74f0c7f0f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/LetStatement.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.papyrus.gmf.internal.xpand.BuiltinMetaModel;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.Identifier;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class LetStatement extends Statement {
-
-	private final Identifier varName;
-
-	private final ExpressionHelper varValue;
-
-	private final Statement[] body;
-
-	public LetStatement(final int start, final int end, final int line, final Identifier varName, final OCLExpressionCS value, final Statement[] body) {
-		super(start, end, line);
-		this.varName = varName;
-		this.varValue = new ExpressionHelper(value, this);
-		this.body = body;
-	}
-
-	public void analyze(ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-		ctx = ctx.cloneWithVariable(new Variable(varName.getValue(), getVarType(ctx, issues), null));
-		for (Statement statement : body) {
-			statement.analyze(ctx, issues);
-		}
-	}
-
-	@Override
-	public void evaluateInternal(ExecutionContext ctx) {
-		Set<AnalysationIssue> issues = new HashSet<AnalysationIssue>();
-		EClassifier varType = getVarType(ctx, issues);
-		if (issues.size() > 0) {
-			throw new EvaluationException("Can't evaluate LET expression: variable type cannot be defined", varValue);	
-		}
-		Object evaluatedVarValue = varValue.evaluate(ctx);
-		if (!BuiltinMetaModel.isAssignableFrom(ctx, varType, BuiltinMetaModel.getType(ctx, evaluatedVarValue))) {
-			throw new EvaluationException("Can't evaluate LET expression: actual variable type is not assignable to declared one", this);
-		}
-		ctx = ctx.cloneWithVariable(new Variable(varName.getValue(), varType, evaluatedVarValue));
-		for (Statement statement : body) {
-			statement.evaluate(ctx);
-		}
-	}
-	
-	private EClassifier getVarType(ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-		EClassifier t = varValue.analyze(ctx, issues);
-		return t == null ? t = EcorePackage.eINSTANCE.getEObject() : t;
-	}
-	
-	ExpressionHelper getVarValue() {
-		return varValue;
-	}
-	
-	Statement[] getBody() {
-		return body;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/NamespaceImport.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/NamespaceImport.java
deleted file mode 100644
index 9f1d4a51ecc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/NamespaceImport.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 committers of openArchitectureWare, CEA LIST, Artal and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import org.eclipse.ocl.cst.StringLiteralExpCS;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-
-// XXX XpandAnalyzable to check if metamodel is accessible
-public class NamespaceImport extends SyntaxElement {
-	private final String importString;
-
-	public NamespaceImport(int start, int end, int line, StringLiteralExpCS importCS) {
-		super(start, end, line);
-		// FIXME for complete care, look at AbstractOCLAnalyzer#processStringEscapes
-		importString = importCS.getUnescapedStringSymbol();
-	}
-
-	public String getImportString() {
-		return importString;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ProtectStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ProtectStatement.java
deleted file mode 100644
index 7944c53d569..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/ProtectStatement.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Set;
-
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * @author Sven Efftinge
- */
-public class ProtectStatement extends Statement {
-
-    private final ExpressionHelper commentStart;
-
-    private final ExpressionHelper commentEnd;
-
-    private final Statement[] body;
-
-    private final ExpressionHelper id;
-
-    private final boolean disable;
-
-    public ProtectStatement(final int start, final int end, final int line, final OCLExpressionCS commentStart,
-            final OCLExpressionCS commentEnd, final Statement[] body, final OCLExpressionCS id, final boolean disable) {
-        super(start, end, line);
-        this.commentStart = new ExpressionHelper(commentStart, this);
-        this.commentEnd = new ExpressionHelper(commentEnd, this);
-        this.body = body;
-        this.id = new ExpressionHelper(id, this);
-        this.disable = disable;
-    }
-
-    public void analyze(final ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-        commentStart.analyze(ctx, issues);
-        commentEnd.analyze(ctx, issues);
-        id.analyze(ctx, issues);
-
-        for (int i = 0; i < body.length; i++) {
-            body[i].analyze(ctx, issues);
-        }
-    }
-
-    @Override
-    public void evaluateInternal(final ExecutionContext ctx) {
-    	// FIXME REVISIT!!!
-        final String cStart = nullSave(commentStart.evaluate(ctx));
-        if (cStart == null) {
-        	// Never will be here
-			throw new EvaluationException("NullEvaluation!", commentStart);
-		}
-        final String cEnd = nullSave(commentEnd.evaluate(ctx));
-        if (cEnd == null) {
-        	// Never will be here
-			throw new EvaluationException("NullEvaluation!", commentEnd);
-		}
-        final String idv = nullSave(id.evaluate(ctx));
-        if (idv == null) {
-        	// Never will be here
-			throw new EvaluationException("NullEvaluation!", id);
-		}
-
-//        ProtectedRegion region = null;
-//        if (ctx.getProtectedRegionResolver() != null) {
-//            region = ctx.getProtectedRegionResolver().getProtectedRegion(idv);
-//        } else {
-//            throw new RuntimeException("No protected region resolver configured!");
-//        }
-//
-//        if (region == null) {
-//            region = ctx.getProtectedRegionResolver().createProtectedRegion(idv, disable);
-//            ctx.getOutput().write(region.getStartString(cStart, cEnd));
-//            for (int i = 0; i < body.length; i++) {
-//                body[i].evaluate(ctx);
-//            }
-//            ctx.getOutput().write(region.getEndString(cStart, cEnd));
-//        } else {
-//            ctx.getOutput().write(region.getStartString(cStart, cEnd));
-//            try {
-//                ctx.getOutput().write(region.getBody(cStart, cEnd));
-//            } catch (final ProtectedRegionSyntaxException e) {
-//                throw new EvaluationException(e.getMessage(), this, id.getCST());
-//            }
-//            ctx.getOutput().write(region.getEndString(cStart, cEnd));
-//        }
-
-    }
-
-    // FIXME STUPID CODE?! never returns null while each use of the method checks for null
-    private String nullSave(final Object string) {
-        return string != null ? string.toString() : "";
-    }
-    
-    ExpressionHelper getCommentStart() {
-    	return commentStart;
-    }
-    
-    ExpressionHelper getCommentEnd() {
-    	return commentEnd;
-    }
-    
-    ExpressionHelper getId() {
-    	return id;
-    }
-    
-    Statement[] getBody() {
-    	return body;
-    }
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Statement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Statement.java
deleted file mode 100644
index 1cd507170c1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Statement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import org.eclipse.papyrus.gmf.internal.xpand.eval.EvaluationListener;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAnalyzable;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandEvaluatable;
-
-public abstract class Statement extends SyntaxElement implements XpandAnalyzable, XpandEvaluatable {
-    public Statement(final int start, final int end, final int line) {
-        super(start, end, line);
-    }
-
-    public final void evaluate(final ExecutionContext ctx) {
-        try {
-        	notifyEnter(ctx);
-            ctx.getScope().getOutput().enterStatement(this);
-        	evaluateInternal(ctx);
-            ctx.getScope().getOutput().exitStatement(null);
-        } finally {
-        	notifyLeave(ctx);
-        }
-    }
-
-    protected abstract void evaluateInternal(ExecutionContext ctx);
-
-    private void notifyEnter(ExecutionContext ctx) {
-    	EvaluationListener l = ctx.getScope().getEvaluationListener();
-    	if (l != null) {
-    		l.enter(this, ctx);
-    	}
-    }
-
-    private void notifyLeave(ExecutionContext ctx) {
-    	EvaluationListener l = ctx.getScope().getEvaluationListener();
-    	if (l != null) {
-    		l.leave(this, ctx);
-    	}
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Template.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Template.java
deleted file mode 100644
index 4378c32996c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/Template.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EPackage.Registry;
-import org.eclipse.m2m.internal.qvt.oml.expressions.Module;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.analyze.UnusedMetamodelsCollector;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.analyze.UnusedModulesCollector;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAdvice;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandResource;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtResource;
-
-/**
- * XXX why it's SyntaxElement? What does 'getLine()' means?
- * 
- * @author Sven Efftinge
- */
-public class Template extends SyntaxElement implements XpandResource {
-
-	private final NamespaceImport[] imports;
-
-	private final Definition[] definitions;
-
-	private final ImportDeclaration[] extensions;
-
-	private final Advice[] advices;
-
-	private String qualifiedName;
-
-	private String[] importStrings = null;
-
-	private String[] importedExtensions = null;
-
-	public Template(final int start, final int end, final int line, final NamespaceImport[] imports, final ImportDeclaration[] extensions, final Definition[] definitions, final Advice[] advices) {
-		super(start, end, line);
-		this.imports = imports;
-		this.extensions = extensions;
-		for (Definition element : definitions) {
-			element.setOwner(this);
-		}
-		this.definitions = definitions;
-		for (Advice element : advices) {
-			element.setOwner(this);
-		}
-		this.advices = advices;
-	}
-
-	public String getFullyQualifiedName() {
-		// XXX what's the reason to have both file name and qualified name?
-		return qualifiedName == null ? getFileName() : qualifiedName;
-	}
-
-	public void setFullyQualifiedName(String name) {
-		qualifiedName = name;
-	}
-
-	public XpandDefinition[] getDefinitions() {
-		return definitions;
-	}
-
-	public void analyze(ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-		ctx = ctx.cloneWithResource(this);
-		// for (ImportDeclaration importDeclaration : extensions) {
-		// QvtResource extension =
-		// ctx.getScope().findExtension(importDeclaration.getImportString());
-		// if (extension == null) {
-		// issues.add(new
-		// AnalysationIssue(AnalysationIssue.Type.EXTENSION_NOT_FOUND,
-		// "Couldn't find " + importDeclaration.getImportString(),
-		// importDeclaration));
-		// } else {
-		// for (Module module : extension.getModules()) {
-
-		// }
-		// }
-		// }
-		//		
-		for (Definition element : definitions) {
-			element.analyze(ctx, issues);
-		}
-		for (Advice element : advices) {
-			element.analyze(ctx, issues);
-		}
-
-		Map<Module, ImportDeclaration> module2ImportDeclarationMap = new LinkedHashMap<Module, ImportDeclaration>();
-		for (ImportDeclaration importDeclaration : extensions) {
-			QvtResource extension = ctx.getScope().findExtension(importDeclaration.getImportString());
-			if (extension == null) {
-				issues.add(new AnalysationIssue(AnalysationIssue.Type.EXTENSION_NOT_FOUND, "Couldn't find " + importDeclaration.getImportString(), importDeclaration));
-			} else {
-				for (Module module : extension.getModules()) {
-					module2ImportDeclarationMap.put(module, importDeclaration);
-				}
-			}
-		}
-
-		Map<EPackage, NamespaceImport> ePackage2NapespaceImportMap = new LinkedHashMap<EPackage, NamespaceImport>();
-		Registry packageRegistry = ctx.getScope().createPackageRegistry(getImportedNamespaces());
-		for (NamespaceImport namespaceImport : imports) {
-			if (!packageRegistry.containsKey(namespaceImport.getImportString())) {
-				issues.add(new AnalysationIssue(AnalysationIssue.Type.NAMESPACE_NOT_FOUND, "Couldn't find " + namespaceImport.getImportString(), namespaceImport));
-			} else {
-				ePackage2NapespaceImportMap.put(packageRegistry.getEPackage(namespaceImport.getImportString()), namespaceImport);
-			}
-		}
-		
-		addWarnings(module2ImportDeclarationMap, ePackage2NapespaceImportMap, ctx, issues);
-	}
-
-	private void addWarnings(Map<Module, ImportDeclaration> module2ImportDeclarationMap, Map<EPackage, NamespaceImport> ePackage2NapespaceImportMap, ExecutionContext ctx, Set<AnalysationIssue> issues) {
-		UnusedModulesCollector unusedModulesCollector = new UnusedModulesCollector(module2ImportDeclarationMap.keySet());
-		UnusedMetamodelsCollector unusedMetamodelsCollector = new UnusedMetamodelsCollector(ePackage2NapespaceImportMap.keySet(), ctx);
-		new AstIterator(new CompositeAstVisitor(unusedModulesCollector, unusedMetamodelsCollector)).iterate(this);
-		for (Module unusedModule : unusedModulesCollector.getUnusedModules()) {
-			ImportDeclaration importDeclaration = module2ImportDeclarationMap.get(unusedModule);
-			issues.add(new AnalysationIssue(AnalysationIssue.Type.UNUSED_IMPORT, "Extension " + importDeclaration.getImportString() + " is never used", importDeclaration, true));
-		}
-		for (EPackage unusedEPackage : unusedMetamodelsCollector.getUnusedEPackages()) {
-			NamespaceImport namespaceImport = ePackage2NapespaceImportMap.get(unusedEPackage);
-			issues.add(new AnalysationIssue(AnalysationIssue.Type.UNUSED_IMPORT, "Import " + namespaceImport.getImportString() + " is never used", namespaceImport, true));
-		}
-	}
-
-	// XXX is it really worth it to kepp imports as ast nodes?
-	// Is it performance gain to duplicate them here with string[]?
-	public String[] getImportedNamespaces() {
-		if (importStrings == null) {
-			importStrings = new String[imports.length];
-			for (int i = 0; i < importStrings.length; i++) {
-				importStrings[i] = imports[i].getImportString();
-			}
-		}
-		return importStrings;
-	}
-
-	public String[] getImportedExtensions() {
-		if (importedExtensions == null) {
-			importedExtensions = new String[extensions.length];
-			for (int i = 0; i < extensions.length; i++) {
-				importedExtensions[i] = extensions[i].getImportString();
-			}
-		}
-		return importedExtensions;
-	}
-
-	public XpandAdvice[] getAdvices() {
-		return advices;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/TextStatement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/TextStatement.java
deleted file mode 100644
index 6d7f530ab83..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/TextStatement.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast;
-
-import java.util.Set;
-
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-
-/**
- * @author Sven Efftinge
- */
-public class TextStatement extends Statement {
-    private final String value;
-
-    private final boolean deleteLine;
-
-    public TextStatement(final int start, final int end, final int line, final String text, final boolean nonl) {
-        super(start, end, line);
-        deleteLine = nonl;
-        value = text;
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    public boolean isDeleteLine() {
-        return deleteLine;
-    }
-
-    public void analyze(final ExecutionContext ctx, final Set<AnalysationIssue> issues) {
-        // Nothing to check here
-    }
-
-    @Override
-    public void evaluateInternal(final ExecutionContext ctx) {
-        ctx.getScope().getOutput().write(getValue());
-    }
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/analyze/UnusedMetamodelsCollector.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/analyze/UnusedMetamodelsCollector.java
deleted file mode 100644
index 5854aae861a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/analyze/UnusedMetamodelsCollector.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast.analyze;
-
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.ocl.ecore.TypeExp;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.AbstractAstVisitor;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.AbstractDefinition;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-public class UnusedMetamodelsCollector extends AbstractAstVisitor {
-
-	private LinkedHashSet<EPackage> myUnusedEPackages;
-
-	private ExecutionContext myContext;
-
-	public UnusedMetamodelsCollector(Set<EPackage> ePackages, ExecutionContext context) {
-		myUnusedEPackages = new LinkedHashSet<EPackage>(ePackages);
-		myContext = context;
-	}
-
-	public Set<EPackage> getUnusedEPackages() {
-		return myUnusedEPackages;
-	}
-
-	@Override
-	protected boolean visit(AbstractDefinition definition) {
-		if (myUnusedEPackages.size() == 0) {
-			return false;
-		}
-		EClassifier type = definition.getType().getTypeForName(myContext);
-		if (type != null) {
-			myUnusedEPackages.remove(type.getEPackage());
-		}
-		for (DeclaredParameter parameter : definition.getParemeters()) {
-			type = parameter.getTypeForName(myContext);
-			if (type != null) {
-				myUnusedEPackages.remove(type.getEPackage());
-			}
-		}
-		return super.visit(definition);
-	}
-
-	@Override
-	protected void visitExpressionHelper(ExpressionHelper expressionHelper) {
-		if (myUnusedEPackages.size() == 0) {
-			return;
-		}
-		if (expressionHelper.getOCLExpression() != null) {
-			purgeUsedEPackages(expressionHelper.getOCLExpression());
-			for (Iterator<EObject> it = expressionHelper.getOCLExpression().eAllContents(); it.hasNext();) {
-				purgeUsedEPackages(it.next());
-			}
-		}
-	}
-
-	private void purgeUsedEPackages(EObject oclAstElement) {
-		if (oclAstElement instanceof TypeExp) {
-			TypeExp typeExpression = (TypeExp) oclAstElement;
-			if (typeExpression.getReferredType() != null) {
-				myUnusedEPackages.remove(typeExpression.getReferredType().getEPackage());
-			}
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/analyze/UnusedModulesCollector.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/analyze/UnusedModulesCollector.java
deleted file mode 100644
index 55aca45802b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ast/analyze/UnusedModulesCollector.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ast.analyze;
-
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.m2m.internal.qvt.oml.expressions.Module;
-import org.eclipse.ocl.ecore.OperationCallExp;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.AbstractAstVisitor;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-public class UnusedModulesCollector extends AbstractAstVisitor {
-
-	private Set<Module> myUnusedModules;
-
-	public UnusedModulesCollector(Set<Module> allModules) {
-		myUnusedModules = new LinkedHashSet<Module>(allModules);
-	}
-
-	public Set<Module> getUnusedModules() {
-		return myUnusedModules;
-	}
-
-	@Override
-	protected void visitExpressionHelper(ExpressionHelper expressionHelper) {
-		if (myUnusedModules.size() == 0) {
-			return;
-		}
-		if (expressionHelper.getOCLExpression() != null) {
-			purgeUsedModule(expressionHelper.getOCLExpression());
-			for (Iterator<EObject> it = expressionHelper.getOCLExpression().eAllContents(); it.hasNext();) {
-				purgeUsedModule(it.next());
-			}
-		}
-	}
-
-	private void purgeUsedModule(EObject oclAstElement) {
-		if (oclAstElement instanceof OperationCallExp) {
-			OperationCallExp opCall = (OperationCallExp) oclAstElement;
-			EOperation referredOperation = opCall.getReferredOperation();
-			if (referredOperation != null) {
-				EObject eContainer = referredOperation.eContainer();
-				if (eContainer instanceof Module) {
-					myUnusedModules.remove(eContainer);
-				}
-			}
-		}
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/EcoreModelResourceVisitor.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/EcoreModelResourceVisitor.java
deleted file mode 100644
index a55ecd2f3fe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/EcoreModelResourceVisitor.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Artem Tikhomirov (Borland) - Initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.build;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-
-class EcoreModelResourceVisitor implements IResourceVisitor, IResourceDeltaVisitor {
-	private static String ECORE_FILE_EXT = "ecore";
-
-	private final IProgressMonitor monitor;
-	private final Set<IFile> newEcoreModelFiles = new HashSet<IFile>();
-	private final Set<IFile> changedEcoreModelFiles = new HashSet<IFile>();
-	private final Set<IFile> removedEcoreModelFiles = new HashSet<IFile>();
-
-	public EcoreModelResourceVisitor(IProgressMonitor progress) {
-		monitor = progress;
-	}
-
-	public Set<IFile> getNewModelFiles() {
-		return Collections.unmodifiableSet(newEcoreModelFiles);
-	}
-
-	public Set<IFile> getChangedModelFiles() {
-		return Collections.unmodifiableSet(changedEcoreModelFiles);
-	}
-
-	public Set<IFile> getRemovedModelFiles() {
-		return Collections.unmodifiableSet(removedEcoreModelFiles);
-	}
-
-	private void handleNewResource(IFile file) {
-		newEcoreModelFiles.add(file);
-	}
-
-	private void handleChangedResource(IFile file) {
-		changedEcoreModelFiles.add(file);
-	}
-
-	private void handleRemoved(IFile file) {
-		removedEcoreModelFiles.add(file);
-	}
-
-	public boolean visit(IResource resource) throws CoreException {
-		if (resource.isDerived()) {
-			return false;
-		}
-		if (resource.getType() == IResource.FILE && isEcoreModel(resource)) {
-			handleNewResource((IFile) resource);
-			monitor.worked(1);
-			return false;
-		}
-		return true;
-	}
-
-	public boolean visit(IResourceDelta delta) throws CoreException {
-		final IResource resource = delta.getResource();
-		if (resource.isDerived()) {
-			return false;
-		}
-		if (resource.getType() == IResource.FILE && isEcoreModel(resource)) {
-			switch (delta.getKind()) {
-			case IResourceDelta.ADDED:
-				handleNewResource((IFile) resource);
-				break;
-			case IResourceDelta.REMOVED:
-				handleRemoved((IFile) resource);
-				break;
-			case IResourceDelta.CHANGED:
-				handleChangedResource((IFile) resource);
-				break;
-			}
-			monitor.worked(1);
-			return false;
-		}
-		return true;
-	}
-
-	private static boolean isEcoreModel(IResource file) {
-		return ECORE_FILE_EXT.equals(file.getFileExtension());
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/MetaModelSource.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/MetaModelSource.java
deleted file mode 100644
index 0048e262e20..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/MetaModelSource.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Artem Tikhomirov (Borland) - Initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.build;
-
-import org.eclipse.emf.ecore.EPackage;
-
-public interface MetaModelSource {
-
-	public EPackage find(String nsURI);
-	public EPackage[] all();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/WorkspaceModelRegistry.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/WorkspaceModelRegistry.java
deleted file mode 100644
index fce0523cc6f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/WorkspaceModelRegistry.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.build;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-
-/**
- * FIXME with the recent move of the context project knowledge into this class, there's no much value in
- * having this registry instantiated and invoked by builder. Instead, make it workspace-wide (though may filter project
- * based on xpandBuilder presence) and builder-independent (listen to changes, employ IResourceProxy)
- * 
- * @author artem
- */
-class WorkspaceModelRegistry implements MetaModelSource {
-
-	/**
-	 * 
-	 * It had been found that having gmfgraph.ecore / gmfgen.ecore from the workspace loaded tp this registry (by platform:resource URIs)
-	 * leads to problems with binding QVTO utility calls, because the xPand code (from this class) supplies the EClass'es from workspace resources 
-	 * while QVTO compiler expects the same-named classes from typed GMFGraphPackageImpl/GmfGenPackageImpl. 
-	 * 
-	 * While we are investigating the problem, as a workaround, we will allow to block all metamodles from given workspace 
-	 * project to be loaded into this registry.
-	 * 
-	 * That is, {@link WorkspaceModelRegistry} in 3.0 release will IGNORE all workspace metamodels from the projects that has the settings file with this name.
-	 * @see #380069  
-	 */
-	private static final String SETTINGS_IGNORE_PROJECT_METAMODELS = ".settings/org.eclipse.papyrus.gmf.xpand.build.ignore-all-local-metamodels.txt";
-
-	private static class Descriptor {
-
-		final String workspacePath;
-
-		final String nsURI;
-
-		final Resource resource;
-
-		public Descriptor(String workspacePath, String nsURI, Resource res) {
-			assert workspacePath != null && nsURI != null && res != null;
-			this.workspacePath = workspacePath;
-			this.nsURI = nsURI;
-			this.resource = res;
-		}
-	}
-
-	private final Map<String, Descriptor> pathToDescriptor = new TreeMap<String, Descriptor>();
-
-	private final Map<String, Descriptor> uriToDescriptor = new TreeMap<String, Descriptor>();
-
-	private final IProject project;
-
-	private boolean isInFullBuild;
-
-	private boolean doneFullBuild;
-
-	//	void DEBUG_DUMP() {
-	//		System.err.println(">>> " + WorkspaceModelRegistry.class.getSimpleName());
-	//		for (Map.Entry<String, Descriptor> e : uriToDescriptor.entrySet()) {
-	//			assert e.getKey().equals(e.getValue().nsURI);
-	//			System.err.println(e.getKey() + " ==> " + e.getValue().workspacePath);
-	//		}
-	//		System.err.println("<<< " + WorkspaceModelRegistry.class.getSimpleName());
-	//	}
-
-	public WorkspaceModelRegistry(IProject project, ResourceSet resolutionResourceSet) {
-		assert project != null;
-		this.project = project;
-		resourceSet = resolutionResourceSet;
-	}
-
-	public WorkspaceModelRegistry(IProject project) {
-		this(project, new ResourceSetImpl());
-		resourceSet.getURIConverter().getURIMap().putAll(EcorePlugin.computePlatformURIMap());
-	}
-
-	private Map<String, EPackage> myReturnedResults = new HashMap<String, EPackage>();
-
-	public EPackage find(String nsURI) {
-		Descriptor d = uriToDescriptor.get(nsURI);
-		return d == null ? null : (EPackage) d.resource.getContents().get(0);
-	}
-
-	public EPackage[] all() {
-		if (!doneFullBuild) {
-			try {
-				// full build never ran, need to initialize data first.
-				build(new NullProgressMonitor());
-			} catch (CoreException ex) {
-				Activator.log(ex.getStatus());
-			}
-		}
-		EPackage[] rv = new EPackage[pathToDescriptor.size()];
-		int i = 0;
-		for (Descriptor d : pathToDescriptor.values()) {
-			rv[i++] = (EPackage) d.resource.getContents().get(0);
-		}
-		return rv;
-	}
-
-	public void build(IProgressMonitor monitor) throws CoreException {
-		if (isInFullBuild) {
-			return;
-		}
-		try {
-			isInFullBuild = true;
-			EcoreModelResourceVisitor visitor = new EcoreModelResourceVisitor(monitor);
-			project.accept(visitor);
-			handleCollectedData(visitor);
-			doneFullBuild = true;
-		} finally {
-			isInFullBuild = false;
-		}
-	}
-
-	public void build(IResourceDelta delta, IProgressMonitor monitor) throws CoreException {
-		assert delta.getResource().getProject() == project;
-		if (isInFullBuild) {
-			return;
-		}
-		EcoreModelResourceVisitor visitor = new EcoreModelResourceVisitor(monitor);
-		delta.accept(visitor);
-		handleCollectedData(visitor);
-	}
-
-	private void handleCollectedData(EcoreModelResourceVisitor visitor) {
-		for (IFile f : visitor.getRemovedModelFiles()) {
-			String workspacePath = getKeyPath(f);
-			Descriptor d = pathToDescriptor.remove(workspacePath);
-			if (d != null) {
-				Descriptor d2 = uriToDescriptor.remove(d.nsURI);
-				assert d2 == d;
-				delist(d);
-			}
-		}
-		Set<IFile> filesToAdd = new HashSet<IFile>(visitor.getNewModelFiles());
-		for (IFile f : visitor.getChangedModelFiles()) {
-			Descriptor d = pathToDescriptor.remove(getKeyPath(f));
-			if (d != null) {
-				Descriptor d2 = uriToDescriptor.remove(d.nsURI); // uri might be changed, let alone Descriptor is not modifyable
-				assert d2 == d;
-				delist(d);
-			}
-			filesToAdd.add(f);
-		}
-		for (IFile f : filesToAdd) {
-			if (shouldIgnoreWorkspaceMetamodel(f)) {
-				continue;
-			}
-			try {
-				Resource r = attemptLoad(f);
-				if (r != null && hasSuitableContent(r)) {
-					Descriptor d = createDescriptor(f, r);
-					assert d != null;
-					pathToDescriptor.put(d.workspacePath, d);
-					uriToDescriptor.put(d.nsURI, d);
-				}
-			} catch (Exception ex) {
-				ex.printStackTrace();
-				// ignore
-			}
-		}
-	}
-
-	private boolean shouldIgnoreWorkspaceMetamodel(IFile metamodelFile) {
-		if (metamodelFile == null) {
-			return false;
-		}
-		IFile ignoreProjectMetamodelsSettings = metamodelFile.getProject().getFile(SETTINGS_IGNORE_PROJECT_METAMODELS);
-		return ignoreProjectMetamodelsSettings != null && ignoreProjectMetamodelsSettings.exists();
-	}
-
-	// TODO per-project?
-	private final ResourceSet resourceSet;
-
-	private Resource attemptLoad(IFile file) throws IOException {
-		URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), false);
-		Resource res = getResourceSet(file).getResource(uri, true);
-		if (res == null) {
-			throw new FileNotFoundException("Can't load model from " + file.getFullPath());
-		}
-		return res;
-	}
-
-	private ResourceSet getResourceSet(IFile file) {
-		return resourceSet;
-	}
-
-	// works in pair with #createDescriptor - may extract these as interface to support models other than Ecore
-	private boolean hasSuitableContent(Resource r) {
-		assert r != null;
-		return r.getContents().get(0) instanceof EPackage;
-	}
-
-	private Descriptor createDescriptor(IFile f, Resource res) {
-		final String path = getKeyPath(f);
-		EPackage p = (EPackage) res.getContents().get(0);
-		final String nsURI = p.getNsURI();
-		if (nsURI == null) {
-			throw new IllegalArgumentException("Invalid model file (missed nsURI) " + path);
-		}
-		return new Descriptor(path, nsURI, res);
-	}
-
-	private void delist(Descriptor d) {
-		d.resource.unload();
-		d.resource.getResourceSet().getResources().remove(d.resource);
-	}
-
-	private String getKeyPath(IFile f) {
-		return f.getFullPath().toString();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/WorkspaceResourceManager.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/WorkspaceResourceManager.java
deleted file mode 100644
index 5e8f9375a44..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/WorkspaceResourceManager.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Artem Tikhomirov (Borland)
- *     Boris Blajer (Borland) - support for composite resources
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.build;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.m2m.internal.qvt.oml.compiler.UnitResolver;
-import org.eclipse.m2m.internal.qvt.oml.project.builder.WorkspaceUnitResolver;
-import org.eclipse.papyrus.gmf.internal.xpand.inactive.StreamDecoder;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandResource;
-import org.eclipse.papyrus.gmf.internal.xpand.util.BundleUnitResolver;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ResourceManagerImpl;
-import org.eclipse.papyrus.gmf.internal.xpand.util.StreamConverter;
-import org.eclipse.papyrus.gmf.internal.xpand.util.TypeNameUtil;
-import org.osgi.framework.Bundle;
-
-// FIXME package-local?, refactor Activator.getResourceManager uses
-public class WorkspaceResourceManager extends ResourceManagerImpl {
-	
-	private static final IPath[] EMPTY_PATH = new IPath[0];
-	
-	private final IProject contextProject;
-	private final IPath[] myConfiguredRoots;
-
-	/**
-	 * Fall-back constructor can be used for stand alone XPand resources
-	 */
-	public WorkspaceResourceManager(IProject context) {
-		this(context, EMPTY_PATH);
-	}
-	
-	public WorkspaceResourceManager(IProject context, IPath[] configuredRoots) {
-		this.contextProject = context;
-		myConfiguredRoots = configuredRoots;
-	}
-
-	public XpandResource loadXpandResource(IFile file) throws CoreException, IOException, ParserException {
-		String fullyQualifiedName;
-		if (file == null || (fullyQualifiedName = toFullyQualifiedName(file)) == null) {
-			return null;
-		}
-		// try file directly, to get IO/Parse exceptions, if any.
-		Reader r = new StreamConverter().toContentsReader(file);
-		XpandResource[] loadXpandResources = loadXpandResources(new Reader[] { r }, fullyQualifiedName);
-		assert loadXpandResources.length == 1 && loadXpandResources[0] != null;
-		return loadXpandResources[0];
-	}
-
-	@Override
-	protected void handleParserException(ParserException ex) {
-		// may get here only when some referenced template/xtend file is
-		// broken. Since it's expected to get compiled anyway (either prior
-		// to compilation of its use or afterwards), error messages should get
-		// into problems view sooner or later.
-	}
-
-	@Override
-	protected boolean shouldCache() {
-		/*
-		 * WorkspanceResourceManager was refactored to cache all resources.
-		 * 
-		 * From now this resource manager should be:
-		 * 
-		 * 1. created
-		 * 
-		 * 2. used during the session of compilation/code completion
-		 * 
-		 * 3. forgotten to free corresponding memory resources.
-		 */
-		return true;
-	}
-
-	public void forget(IFile resource) {
-		// implement when caching
-	}
-
-	@Override
-	protected Reader[] resolveMultiple(String fqn, String ext) throws IOException {
-		IPath fp = new Path(fqn.replaceAll(TypeNameUtil.NS_DELIM, "/")).addFileExtension(ext);
-		IPath[] resolutions = getResolutions(fp);
-		ArrayList<Reader> result = new ArrayList<Reader>(resolutions.length);
-		for (IPath p : getResolutions(fp)) {
-			Reader nextReader = getReader(p);
-			if (nextReader != null) {
-				result.add(nextReader);
-			}
-		}
-		if (result.isEmpty()) {
-			throw new FileNotFoundException(fp.toString());
-		}
-		return result.toArray(new Reader[result.size()]);
-	}
-
-	private Reader getReader(IPath p) throws IOException {
-		if (p.isAbsolute()) {
-			assert p.segmentCount() > 1;
-			//Try workspace-relative first.
-			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(p.segment(0));
-			if (project.isAccessible()) {
-				return getWorkspaceFileReader(project, p.removeFirstSegments(1));
-			}
-			//Fallback to platform location
-			Bundle platformBundle = Platform.getBundle(p.segment(0));
-			if (platformBundle != null) {
-				URL url = platformBundle.getEntry(p.removeFirstSegments(1).toString());
-				if (url != null) {
-					InputStream is = url.openStream();
-					// FIXME for now, go with legacy encoding as a default
-					return new StreamDecoder(is, StreamDecoder.LEGACY_ENCODING).getReader();
-				}
-			}
-		} else {
-			return getWorkspaceFileReader(contextProject, p);
-		}
-		return null;
-	}
-
-	private Reader getWorkspaceFileReader(IProject project, IPath path) throws IOException {
-		IResource r = project.findMember(path);
-		if (r instanceof IFile) {
-			try {
-				return new StreamConverter().toContentsReader((IFile) r);
-			} catch (CoreException ex) {
-				IOException wrap = new IOException(ex.getStatus().getMessage());
-				wrap.initCause(ex);
-				throw wrap;
-			}
-		}
-		return null;
-	}
-
-	private IPath[] getResolutions(IPath p) {
-		IPath[] rv = new IPath[myConfiguredRoots.length];
-		for (int i = 0; i < myConfiguredRoots.length; i++) {
-			rv[i] = myConfiguredRoots[i].append(p);
-		}
-		return rv;
-	}
-	private String toFullyQualifiedName(IFile file) {
-		for (IPath nextRoot : myConfiguredRoots) {
-			if (!nextRoot.isAbsolute()) {
-				if (file.getProject().equals(contextProject) && nextRoot.isPrefixOf(file.getProjectRelativePath())) {
-					return toFullyQualifiedName(file.getProjectRelativePath().removeFirstSegments(nextRoot.segmentCount()));
-				}
-			} else {
-				if (nextRoot.isPrefixOf(file.getFullPath())) {
-					return toFullyQualifiedName(file.getFullPath().removeFirstSegments(nextRoot.segmentCount()));
-				}
-			}
-		}
-		return null;
-	}
-
-	private static String toFullyQualifiedName(IPath filePath) {
-		return filePath.removeFileExtension().toString().replace("/", TypeNameUtil.NS_DELIM);
-	}
-
-	@Override
-	protected String resolveCFileFullPath(String fullyQualifiedName, String fileExtension) {
-		IPath fp = new Path(fullyQualifiedName.replaceAll(TypeNameUtil.NS_DELIM, "/")).addFileExtension(fileExtension);
-		IPath[] resolutions = getResolutions(fp);
-		for (IPath resolvedPath : resolutions) {
-			IFile file = resolvedPath.isAbsolute() ? ResourcesPlugin.getWorkspace().getRoot().getFile(resolvedPath) : contextProject.getFile(resolvedPath);
-			if (file.exists()) {
-				return file.getLocation().toOSString();
-			}
-		}
-		// TODO: use file located in main Path in this case?
-		return fullyQualifiedName + "." + fileExtension;
-	}
-	
-	@Override
-	protected UnitResolver getQVTUnitResolver() {
-		List<URL> bundleRootURLs = new ArrayList<URL>();
-		for (IPath rootPath : myConfiguredRoots) {
-			if (rootPath.isAbsolute()) {
-				if (!rootPath.hasTrailingSeparator()) {
-					rootPath = rootPath.addTrailingSeparator();
-				}
-				Bundle platformBundle = Platform.getBundle(rootPath.segment(0));
-				if (platformBundle != null) {
-					URL url = platformBundle.getEntry(rootPath.removeFirstSegments(1).toString());
-					if (url != null) {
-						bundleRootURLs.add(url);
-					}
-				}
-			}
-		}
-		
-		final UnitResolver bundleDelegate = BundleUnitResolver.createResolver(bundleRootURLs, true);
-		
-		List<IContainer> resolverPaths = new LinkedList<IContainer>();
-		for (IPath rootPath : myConfiguredRoots) {
-			if(!rootPath.isAbsolute()) {
-				rootPath = contextProject.getFullPath().append(rootPath);
-			}
-			
-			IResource member = ResourcesPlugin.getWorkspace().getRoot().findMember(rootPath);
-			if (member != null && (member instanceof IContainer)) {
-				IContainer container = (IContainer) member;
-				if (container.exists()) {
-					resolverPaths.add(container);
-				}
-			}
-		}
-		return new WorkspaceUnitResolver(resolverPaths) {
-			@Override
-			protected UnitResolver getParent() {
-				return bundleDelegate;
-			}
-		};
-	}
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/XpandBuilder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/XpandBuilder.java
deleted file mode 100644
index 97acea19e55..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/build/XpandBuilder.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.build;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceDelta;
-import org.eclipse.core.resources.IResourceDeltaVisitor;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-import org.eclipse.papyrus.gmf.internal.xpand.RootManager;
-import org.eclipse.papyrus.gmf.internal.xpand.RootManager.RootDescription;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContextImpl;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Scope;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandResource;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException.ErrorLocationInfo;
-import org.eclipse.papyrus.gmf.internal.xpand.util.XpandMarkerManager;
-
-public class XpandBuilder extends IncrementalProjectBuilder implements RootManager.IRootChangeListener {
-	private RootManager myRootManager;
-
-	private WorkspaceModelRegistry modelRegistry;
-
-	private boolean myRootsChanged = true;
-
-	public static final String getBUILDER_ID() {
-		return Activator.getId() + ".xpandBuilder";
-	}
-
-	@Override
-	protected void startupOnInitialize() {
-		super.startupOnInitialize();
-		myRootManager = Activator.getRootManager(getProject());
-		myRootManager.addRootChangeListener(this);
-		modelRegistry = new WorkspaceModelRegistry(getProject(), Activator.getWorkspaceMetamodelsResourceSet());
-		// TODO: unregister modelRegistry from Activator on closing the project
-		// associated with this builder. Keeping modelRegistry registered inside
-		// Activator produce incorrect meta-model resolution - meta-model loaded
-		// from closed project will be returned instead of the one from
-		// PackageRegistry.     
-		Activator.registerModelSource(modelRegistry);
-	}
-
-	@SuppressWarnings("unchecked")
-	@Override
-	protected IProject[] build(final int kind, final Map args, final IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask("Building " + getProject().getName() + " xpand project", 11);
-		Map<RootDescription, Collection<IFile>> resourcesToBuild = collectResourcesToBuild(kind, new SubProgressMonitor(monitor, 1));
-		checkCanceled(monitor);
-		doBuild(resourcesToBuild, new SubProgressMonitor(monitor, 10));
-
-		myRootsChanged = false;
-		Set<IProject> referencedProjects = myRootManager.getReferencedProjects();
-		referencedProjects.remove(getProject());
-		return referencedProjects.toArray(new IProject[referencedProjects.size()]);
-	}
-
-	private Map<RootDescription, Collection<IFile>> collectResourcesToBuild(int kind, IProgressMonitor monitor) throws CoreException {
-		if ((kind == FULL_BUILD) || haveRootsChangedSinceLastBuild()) {
-			return fullBuild(monitor);
-		} else {
-			// TODO: modify this logic - only current project resources should
-			// be built, but those having dependencies to the modified
-			// "external" resources (resources from referenced projects) should
-			// be rebuilt here
-			Set<IProject> referencedProjects = myRootManager.getReferencedProjects();
-			referencedProjects.remove(getProject());
-			Collection<IResourceDelta> deltas = new ArrayList<IResourceDelta>(referencedProjects.size());
-			IResourceDelta projectDelta = getDelta(getProject());
-			if (projectDelta == null) {
-				return fullBuild(monitor);
-			}
-			for (IProject next : referencedProjects) {
-				final IResourceDelta delta = getDelta(next);
-				if (delta == null) {
-					return fullBuild(monitor);
-				}
-				deltas.add(delta);
-			}
-			return incrementalBuild(projectDelta, deltas, monitor);
-		}
-	}
-
-	private void doBuild(Map<RootDescription, Collection<IFile>> resourcesToBuild, IProgressMonitor monitor) {
-		monitor.beginTask("Building " + getProject().getName() + " xpand project", resourcesToBuild.size());
-		for (RootDescription rootDescription : resourcesToBuild.keySet()) {
-			WorkspaceResourceManager resourceManager = Activator.createWorkspaceResourceManager(getProject(), rootDescription);
-			Scope scope = new Scope(resourceManager, null, null);
-			checkCanceled(monitor);
-			doBuid(resourceManager, scope, resourcesToBuild.get(rootDescription), new SubProgressMonitor(monitor, 1));
-		}
-	}
-
-	private void doBuid(WorkspaceResourceManager resourceManager, Scope scope, Collection<IFile> xpandFiles, IProgressMonitor monitor) {
-		monitor.beginTask("Building " + getProject().getName() + " xpand project", xpandFiles.size() * 2);
-		for (IFile xpandFile : xpandFiles) {
-			monitor.setTaskName("Building " + xpandFile.getProjectRelativePath().toOSString());
-			try {
-				XpandResource xpandResource = resourceManager.loadXpandResource(xpandFile);
-				checkCanceled(monitor);
-				monitor.worked(1);
-				ExecutionContext context = new ExecutionContextImpl(scope);
-				final Set<AnalysationIssue> issues = new HashSet<AnalysationIssue>();
-				try {
-					xpandResource.analyze(context, issues);
-					checkCanceled(monitor);
-					monitor.worked(1);
-					updateMarkers(xpandFile, issues);
-				} catch (RuntimeException ex) {
-					Activator.logError(ex);
-					XpandMarkerManager.addMarkers(xpandFile, new ParserException.ErrorLocationInfo(ex.toString()));
-				}
-
-			} catch (ParserException ex) {
-				updateMarkers(xpandFile, ex.getParsingErrors());
-			} catch (IOException ex) {
-				updateMarkers(xpandFile, ex);
-			} catch (CoreException ex) {
-				updateMarkers(xpandFile, ex);
-			}
-				}
-			}
-
-	public void rootsChanged(RootManager rootManager) {
-		myRootsChanged = true;
-	}
-
-	private boolean haveRootsChangedSinceLastBuild() {
-		return myRootsChanged;
-	}
-
-	private RootDescription getRootDescription(IFile file) {
-		return myRootManager.getRootDescription(file);
-	}
-
-	// TODO: do not build all referenced projects on building this one - only
-	// calls to external elements should be analyzed here.
-	protected Map<RootDescription, Collection<IFile>> fullBuild(final IProgressMonitor monitor) throws CoreException {
-		Set<IProject> referencedProjects = myRootManager.getReferencedProjects();
-		referencedProjects.add(getProject());
-		XpandMarkerManager.deleteMarkers(getProject());	//to delete markers from obsolete roots.
-		monitor.beginTask(null, 1 + referencedProjects.size());
-		Map<RootDescription, Collection<IFile>> result = new HashMap<RootDescription, Collection<IFile>>();
-		try {
-			// TODO: way to optimize it - visit not all the resources in this
-			// project, but only those located below actual template roots
-			for (IProject next : referencedProjects) {
-				checkCanceled(monitor);
-				next.accept(new XpandResourceVisitor(result, new SubProgressMonitor(monitor, 1)));
-			}
-			checkCanceled(monitor);
-			modelRegistry.build(new SubProgressMonitor(monitor, 1));
-		} finally {
-			monitor.done();
-		}
-		return result;
-	}
-
-
-	protected Map<RootDescription, Collection<IFile>> incrementalBuild(final IResourceDelta projectDelta, final Collection<IResourceDelta> referencedProjectDeltas, final IProgressMonitor monitor) throws CoreException {
-		monitor.beginTask(null, 2 + referencedProjectDeltas.size());
-		Map<RootDescription, Collection<IFile>> result = new HashMap<RootDescription, Collection<IFile>>();
-		try {
-			for (IResourceDelta delta : referencedProjectDeltas) {
-				checkCanceled(monitor);
-				delta.accept(new XpandResourceVisitor(result, new SubProgressMonitor(monitor, 1)));
-			}
-			checkCanceled(monitor);
-			projectDelta.accept(new XpandResourceVisitor(result, new SubProgressMonitor(monitor, 1)));
-			checkCanceled(monitor);
-			modelRegistry.build(projectDelta, new SubProgressMonitor(monitor, 1));
-		} finally {
-			monitor.done();
-		}
-		return result;
-	}
-
-
-	private void checkCanceled(final IProgressMonitor monitor) {
-		if (monitor.isCanceled()) {
-			throw new OperationCanceledException();
-		}
-	}
-
-
-	private static void updateMarkers(IFile resource, Set<AnalysationIssue> issues) {
-        XpandMarkerManager.deleteMarkers(resource);
-        XpandMarkerManager.addMarkers(resource, issues.toArray(new AnalysationIssue[issues.size()]));
-	}
-
-	private static void updateMarkers(IFile resource, Exception exception) {
-		Activator.logError(exception);
-		// perhaps, depending on exception type (Core|IO) we can decide to keep
-		// old markers?
-		XpandMarkerManager.deleteMarkers(resource);
-		XpandMarkerManager.addErrorMarker(resource, exception.getMessage(), -1, -1);
-	}
-	
-	private static void updateMarkers(IFile resource, ErrorLocationInfo[] parsingErrors) {
-        XpandMarkerManager.deleteMarkers(resource);
-        XpandMarkerManager.addMarkers(resource, parsingErrors);
-	}
-
-	private static boolean isXpand(final IFile resource) {
-		return XpandResource.TEMPLATE_EXTENSION.equals(resource.getFileExtension());
-	}
-
-	private class XpandResourceVisitor implements IResourceVisitor, IResourceDeltaVisitor {
-		private final IProgressMonitor monitor;
-		private Map<RootDescription, Collection<IFile>> description2ResourcesMap;
-
-		public XpandResourceVisitor(Map<RootDescription, Collection<IFile>> description2ResourcesMap, final IProgressMonitor monitor) {
-			this.monitor = monitor;
-			this.description2ResourcesMap = description2ResourcesMap;
-		}
-
-		public boolean visit(final IResource resource) {
-			if (!resource.isDerived() && (resource instanceof IFile) && isFileOfInterest((IFile) resource)) {
-				reloadResource((IFile) resource);
-			}
-			monitor.worked(1);
-			return true;
-		}
-
-		public boolean visit(final IResourceDelta delta) throws CoreException {
-			final IResource resource = delta.getResource();
-			if (resource.isDerived()) {
-				return false;
-			}
-			if ((resource instanceof IFile)) {
-				IFile file = (IFile) resource;
-				if (!isFileOfInterest(file)) {
-					return false;
-				}
-				switch (delta.getKind()) {
-				case IResourceDelta.ADDED:
-					reloadResource(file);
-					break;
-				case IResourceDelta.REMOVED:
-					handleRemovement(file);
-					break;
-				case IResourceDelta.CHANGED:
-					reloadResource(file);
-					break;
-				}
-			} else if (resource instanceof IProject) {
-				// forget about project in resource manager
-				if (delta.getKind() == IResourceDelta.REMOVED) {
-					System.err.println("Project removed:" + resource.getName());
-				}
-				if (delta.getKind() == IResourceDelta.OPEN) {
-					System.err.println("Project open:" + ((IProject) resource).isOpen());
-				}
-			}
-			monitor.worked(1);
-			return true;
-		}
-		
-		private void handleRemovement(IFile resource) {
-			XpandMarkerManager.deleteMarkers(resource);
-		}
-		
-		/**
-		 * Should be called only for resources which are {@link XpandResourceVisitor#isFileOfInterest(IFile)}
-		 */
-		private void reloadResource(IFile resource) {
-			assert resource.exists();
-			// TODO: remove this if unless we do compile other resources here
-			// (QVTO)
-			if (isXpand(resource)) {
-				RootDescription rootDescription = getRootDescription(resource);
-				Collection<IFile> resources = description2ResourcesMap.get(rootDescription);
-				if (resources == null) {
-					resources = new ArrayList<IFile>();
-					description2ResourcesMap.put(rootDescription, resources);
-				}
-				resources.add(resource);
-			}
-		}
-		
-		private boolean isFileOfInterest(IFile file) {
-			if (!isXpand(file)) {
-				return false;
-			}
-			if (getRootDescription(file) == null) {
-				return false;
-			}
-			return true;
-		}
-		
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/eval/EvaluationListener.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/eval/EvaluationListener.java
deleted file mode 100644
index 49cfdfd318b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/eval/EvaluationListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.eval;
-
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Statement;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-
-public class EvaluationListener {
-
-	public void enter(Statement stmt, ExecutionContext context) {
-	}
-	public void leave(Statement stmt, ExecutionContext context) {
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/ast/Identifier.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/ast/Identifier.java
deleted file mode 100644
index 48a0fbb9da6..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/ast/Identifier.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005-2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.expression.ast;
-
-/**
- * @author Sven Efftinge
- * @author Arno Haase
- */
-public class Identifier extends SyntaxElement {
-    private final String value;
-
-    public Identifier(final int start, final int end, final int line, final String value) {
-        super(start, end, line);
-        this.value = value;
-    }
-
-    public Identifier append(final Identifier t) {
-    	return new Identifier(this.start, t.end, this.line, value + t.value);
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return value;
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/ast/SyntaxElement.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/ast/SyntaxElement.java
deleted file mode 100644
index e3ab30a7f4d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/ast/SyntaxElement.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005-2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.expression.ast;
-
-public abstract class SyntaxElement {
-    protected final int start;
-
-    protected final int end;
-
-    protected final int line;
-
-    public SyntaxElement(final int start, final int end, final int line) {
-        this.start = start;
-        this.end = end;
-        this.line = line;
-    }
-
-    public int getLine() {
-        return line;
-    }
-
-    public int getEnd() {
-        return end;
-    }
-
-    public int getStart() {
-        return start;
-    }
-
-    private String fileName;
-
-    public void setFileName(final String fileName) {
-        this.fileName = fileName;
-    }
-
-    public String getFileName() {
-        return fileName;
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/KeywordTemplateF.gi b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/KeywordTemplateF.gi
deleted file mode 100644
index ca2a4764c67..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/KeywordTemplateF.gi
+++ /dev/null
@@ -1,121 +0,0 @@
---
--- An LPG Lexer Template Using lpg.jar
---
--- An instance of this template must have a $Export section and the export_terminals option
--- There must be only one non-terminal, the start symbol, for the keywords
--- The action for each keyword should be a call to $setResult(terminal_symbol)
---
--- Macro that may be redefined in an instance of this template
---
---     $eof_char
---
--- B E G I N N I N G   O F   T E M P L A T E   KeywordTemplateD
---
-%Options Programming_Language=java,margin=4
-%Options table
-%options action-block=("*.java", "/.", "./")
-%options ParseTable=lpg.runtime.ParseTable
-%Options prefix=Char_
-
---
--- This template requires that the name of the EOF token be set
--- to EOF and that the prefix be "Char_" to be consistent with
--- LexerTemplateD.
---
-%Eof
-    EOF
-%End
-
-%Define
-    --
-    -- Macro that may be respecified in an instance of this template
-    --
-    $eof_char /.Char_EOF./
-
-    --
-    -- Macros useful for specifying actions
-    --
-    $setResult /.keywordKind[$rule_number] = ./
-
-    $Header
-    /.
-            //
-            // Rule $rule_number:  $rule_text
-            //./
-
-    $BeginAction /.$Header./
-
-    $EndAction /../
-
-    $BeginCode /.$BeginAction./
-
-    $EndCode /.$EndAction./
-%End
-
-%Globals
-%End
-
-%Headers
-    /.
-    public class $action_type extends $prs_type implements $exp_type
-    {
-        private char[] inputChars;
-        private final int keywordKind[] = new int[$num_rules + 1];
-
-        public int[] getKeywordKinds() { return keywordKind; }
-
-        public int lexer(int curtok, int lasttok)
-        {
-            int current_kind = getKind(inputChars[curtok]),
-                act;
-
-            for (act = tAction(START_STATE, current_kind);
-                 act > NUM_RULES && act < ACCEPT_ACTION;
-                 act = tAction(act, current_kind))
-            {
-                curtok++;
-                current_kind = (curtok > lasttok
-                                       ? $eof_char
-                                       : getKind(inputChars[curtok]));
-            }
-
-            if (act > ERROR_ACTION)
-            {
-                curtok++;
-                act -= ERROR_ACTION;
-            }
-
-            return keywordKind[act == ERROR_ACTION  || curtok <= lasttok ? 0 : act];
-        }
-
-        public void setInputChars(char[] inputChars) { this.inputChars = inputChars; }
-
-    ./
-%End
-
-%Rules
-    /.
-
-        public $action_type(char[] inputChars, int identifierKind)
-        {
-            this.inputChars = inputChars;
-            keywordKind[0] = identifierKind;
-    ./
-%End
-
-%Trailers
-    /.
-
-            for (int i = 0; i < keywordKind.length; i++)
-            {
-                if (keywordKind[i] == 0)
-                    keywordKind[i] = identifierKind;
-            }
-        }
-    }
-    ./
-%End
-
---
--- E N D   O F   T E M P L A T E
---
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/LexerBasicMapF.gi b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/LexerBasicMapF.gi
deleted file mode 100644
index dfd758e773c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/LexerBasicMapF.gi
+++ /dev/null
@@ -1,3 +0,0 @@
--- Intentionally left empty
--- relevant pieces moved to own LexerTemplateD.g
--- while this file is to be included by OCLLexer.g (which I can't modify) when we import it.
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/LexerTemplateF.gi b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/LexerTemplateF.gi
deleted file mode 100644
index fcbab5381a1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/LexerTemplateF.gi
+++ /dev/null
@@ -1,396 +0,0 @@
---
--- An instance of this template must have a $Export section and the export_terminals option
---
--- Macros that may be redefined in an instance of this template
---
---     $eof_token
---     $additional_interfaces
---     $super_stream_class -- subclass com.ibm.lpg.LpgLexStream for getKind
---     $prs_stream_class -- use /.PrsStream./ if not subclassing
---
--- B E G I N N I N G   O F   T E M P L A T E   LexerTemplateD
---
-%Options programming_language=java,margin=4
-%Options table
-%options action-block=("*.java", "/.", "./")
-%options ParseTable=lpg.runtime.ParseTable
-%Options prefix=Char_
-
---
--- This template requires that the name of the EOF token be set
--- to EOF and that the prefix be "Char_" to be consistent with
--- KeywordTemplateD.
---
-%Eof
-    EOF
-%End
-
---
--- This template also requires that the name of the parser EOF
--- Token to be exported be set to EOF_TOKEN
---
-%Export
-    EOF_TOKEN
-%End
-
-%Define
-    --
-    -- Macros that are be needed in an instance of this template
-    --
-    $eof_token /.$_EOF_TOKEN./
-    
-    $additional_interfaces /../
-    $super_stream_class /.LpgLexStream./
-    $prs_stream_class /.PrsStream./
-
-    $prs_stream /. // macro prs_stream is deprecated. Use function getPrsStream
-                  getPrsStream()./
-    $setSym1 /. // macro setSym1 is deprecated. Use function setResult
-               lexParser.setSym1./
-    $setResult /. // macro setResult is deprecated. Use function setResult
-                 lexParser.setSym1./
-    $getSym /. // macro getSym is deprecated. Use function getLastToken
-              lexParser.getSym./
-    $getToken /. // macro getToken is deprecated. Use function getToken
-                lexParser.getToken./
-    $getLeftSpan /. // macro getLeftSpan is deprecated. Use function getLeftSpan
-                   lexParser.getFirstToken./
-    $getRightSpan /. // macro getRightSpan is deprecated. Use function getRightSpan
-                    lexParser.getLastToken./
-
-    --
-    -- Macros useful for specifying actions
-    --
-    $Header
-    /.
-                //
-                // Rule $rule_number:  $rule_text
-                //./
-
-    $DefaultAction
-    /. $Header
-                case $rule_number: { ./
-
-    $BeginAction /.$DefaultAction./
-
-    $EndAction
-    /.          break;
-                }./
-
-    $BeginCode
-    /.$BeginAction
-                $symbol_declarations./
-
-    $EndCode /.$EndAction./
-
-    $NoAction
-    /. $Header
-                case $rule_number:
-                    break; ./
-
-    $BeginActions
-    /.
-        public void ruleAction( int ruleNumber) {
-            switch(ruleNumber) {./
-
-    $SplitActions
-    /.
-	            default:
-	                ruleAction$rule_number(ruleNumber);
-	                break;
-	        }
-	        return;
-	    }
-	
-	    public void ruleAction$rule_number(int ruleNumber) {
-	        switch (ruleNumber) {./
-
-    $EndActions
-    /.
-                default:
-                    break;
-            }
-            return;
-        }./
-
-    -- Macros to provide different implementation of non-ascii char handing in getKind(int) method
-    -- Default implementation always tells it's general non-ascii char
-    $getNonASCIICharKindMethodImpl /.return Char_AfterASCII;./
-%End
-
-%Globals
-    /.import lpg.runtime.*;
-    ./
-%End
-
--- INJECTED COPY OF LexerBasicMap.g, instead of $Include
--- The reasons to do that are:
---          once we started to import OCLLexer, we happen to get wrong LexerBasicMap.g
---          we need custom handling of LG/RG chars in addition to OCL's Acute handling
---          there's no apparent reason to keep methods in two separate files (as they are tightly related, anyway)
--- CHANGES to copied LexerBasicMap.g:
---          methods referencing Options class were removed
---          printValues and boolean attribute to control that were removed
---          getKind() extracted into separate overridable macro $getNonASCIICharKindMethodImpl
-
-%Headers
-    /.
-    public class $action_type extends $super_stream_class implements $exp_type, $sym_type, RuleAction$additional_interfaces {
-        private static ParseTable prs = new $prs_type();
-        private $prs_stream_class prsStream;
-        private final LexParser lexParser = new LexParser(this, prs, this);
-
-        private $kw_lexer_class kwLexer;
-
-        public $prs_stream_class getPrsStream() { return prsStream; }
-        public int getToken(int i) { return lexParser.getToken(i); }
-        public int getRhsFirstTokenIndex(int i) { return lexParser.getFirstToken(i); }
-        public int getRhsLastTokenIndex(int i) { return lexParser.getLastToken(i); }
-
-        public int getLeftSpan() { return lexParser.getFirstToken(); }
-        public int getRightSpan() { return lexParser.getLastToken(); }
-  
-        public $action_type(char[] input_chars, String filename, int tab) {
-            super(input_chars, filename, tab);
-        }
-
-        public $action_type(char[] input_chars, String filename) {
-            this(input_chars, filename, 4);
-        }
-
-        public String[] orderedExportedSymbols() { return $exp_type.orderedTerminalSymbols; }
-        public LexStream getLexStream() { return (LexStream) this; }
-
-        public int [] getKeywordKinds() { return kwLexer.getKeywordKinds(); }
-
-        public void lexer($prs_stream_class prsStream) {
-            lexer(null, prsStream);
-        }
-        
-        public void lexer(Monitor monitor, $prs_stream_class prsStream) {
-            if (getInputChars() == null) {
-                throw new NullPointerException("LexStream was not initialized");
-            }
-
-            this.prsStream = prsStream;
-            resetErrors();
-
-            prsStream.makeToken(0, 0, 0); // Token list must start with a bad token
-                
-            lexParser.parseCharacters(monitor);  // Lex the input characters
-                
-            int i = getStreamIndex();
-            prsStream.makeToken(i, i, $eof_token); // and end with the end of file token
-            prsStream.setStreamLength(prsStream.getSize());
-                
-            return;
-        }
-
-		@Override
-        public void initialize(char [] content, String filename) {
-            super.initialize(content, filename);
-            if (this.kwLexer == null) {
-                 this.kwLexer = new $kw_lexer_class(getInputChars(), $_IDENTIFIER);
-            } else {
-            	this.kwLexer.setInputChars(getInputChars());
-            }
-        }
-        
-        final void makeToken(int kind) {
-            int startOffset = getLeftSpan(),
-                endOffset = getRightSpan();
-            makeToken(startOffset, endOffset, kind);
-        }
-
-        final void makeComment(int kind) {
-            int startOffset = getLeftSpan(),
-                endOffset = getRightSpan();
-            super.getPrsStream().makeAdjunct(startOffset, endOffset, kind);
-        }
-
-        final void skipToken() {
-        }
-        
-        final void checkForKeyWord() {
-            int startOffset = getLeftSpan(),
-                endOffset = getRightSpan(),
-            kwKind = kwLexer.lexer(startOffset, endOffset);
-            makeToken(startOffset, endOffset, kwKind);
-        }
-
-        // aux data for getKind method        
-        private final int tokenKind[] = {
-            Char_CtlCharNotWS,    // 000    0x00
-            Char_CtlCharNotWS,    // 001    0x01
-            Char_CtlCharNotWS,    // 002    0x02
-            Char_CtlCharNotWS,    // 003    0x03
-            Char_CtlCharNotWS,    // 004    0x04
-            Char_CtlCharNotWS,    // 005    0x05
-            Char_CtlCharNotWS,    // 006    0x06
-            Char_CtlCharNotWS,    // 007    0x07
-            Char_CtlCharNotWS,    // 008    0x08
-            Char_HT,              // 009    0x09
-            Char_LF,              // 010    0x0A
-            Char_CtlCharNotWS,    // 011    0x0B
-            Char_FF,              // 012    0x0C
-            Char_CR,              // 013    0x0D
-            Char_CtlCharNotWS,    // 014    0x0E
-            Char_CtlCharNotWS,    // 015    0x0F
-            Char_CtlCharNotWS,    // 016    0x10
-            Char_CtlCharNotWS,    // 017    0x11
-            Char_CtlCharNotWS,    // 018    0x12
-            Char_CtlCharNotWS,    // 019    0x13
-            Char_CtlCharNotWS,    // 020    0x14
-            Char_CtlCharNotWS,    // 021    0x15
-            Char_CtlCharNotWS,    // 022    0x16
-            Char_CtlCharNotWS,    // 023    0x17
-            Char_CtlCharNotWS,    // 024    0x18
-            Char_CtlCharNotWS,    // 025    0x19
-            Char_CtlCharNotWS,    // 026    0x1A
-            Char_CtlCharNotWS,    // 027    0x1B
-            Char_CtlCharNotWS,    // 028    0x1C
-            Char_CtlCharNotWS,    // 029    0x1D
-            Char_CtlCharNotWS,    // 030    0x1E
-            Char_CtlCharNotWS,    // 031    0x1F
-            Char_Space,           // 032    0x20
-            Char_Exclamation,     // 033    0x21
-            Char_DoubleQuote,     // 034    0x22
-            Char_Sharp,           // 035    0x23
-            Char_DollarSign,      // 036    0x24
-            Char_Percent,         // 037    0x25
-            Char_Ampersand,       // 038    0x26
-            Char_SingleQuote,     // 039    0x27
-            Char_LeftParen,       // 040    0x28
-            Char_RightParen,      // 041    0x29
-            Char_Star,            // 042    0x2A
-            Char_Plus,            // 043    0x2B
-            Char_Comma,           // 044    0x2C
-            Char_Minus,           // 045    0x2D
-            Char_Dot,             // 046    0x2E
-            Char_Slash,           // 047    0x2F
-            Char_0,               // 048    0x30
-            Char_1,               // 049    0x31
-            Char_2,               // 050    0x32
-            Char_3,               // 051    0x33
-            Char_4,               // 052    0x34
-            Char_5,               // 053    0x35
-            Char_6,               // 054    0x36
-            Char_7,               // 055    0x37
-            Char_8,               // 056    0x38
-            Char_9,               // 057    0x39
-            Char_Colon,           // 058    0x3A
-            Char_SemiColon,       // 059    0x3B
-            Char_LessThan,        // 060    0x3C
-            Char_Equal,           // 061    0x3D
-            Char_GreaterThan,     // 062    0x3E
-            Char_QuestionMark,    // 063    0x3F
-            Char_AtSign,          // 064    0x40
-            Char_A,               // 065    0x41
-            Char_B,               // 066    0x42
-            Char_C,               // 067    0x43
-            Char_D,               // 068    0x44
-            Char_E,               // 069    0x45
-            Char_F,               // 070    0x46
-            Char_G,               // 071    0x47
-            Char_H,               // 072    0x48
-            Char_I,               // 073    0x49
-            Char_J,               // 074    0x4A
-            Char_K,               // 075    0x4B
-            Char_L,               // 076    0x4C
-            Char_M,               // 077    0x4D
-            Char_N,               // 078    0x4E
-            Char_O,               // 079    0x4F
-            Char_P,               // 080    0x50
-            Char_Q,               // 081    0x51
-            Char_R,               // 082    0x52
-            Char_S,               // 083    0x53
-            Char_T,               // 084    0x54
-            Char_U,               // 085    0x55
-            Char_V,               // 086    0x56
-            Char_W,               // 087    0x57
-            Char_X,               // 088    0x58
-            Char_Y,               // 089    0x59
-            Char_Z,               // 090    0x5A
-            Char_LeftBracket,     // 091    0x5B
-            Char_BackSlash,       // 092    0x5C
-            Char_RightBracket,    // 093    0x5D
-            Char_Caret,           // 094    0x5E
-            Char__,               // 095    0x5F
-            Char_BackQuote,       // 096    0x60
-            Char_a,               // 097    0x61
-            Char_b,               // 098    0x62
-            Char_c,               // 099    0x63
-            Char_d,               // 100    0x64
-            Char_e,               // 101    0x65
-            Char_f,               // 102    0x66
-            Char_g,               // 103    0x67
-            Char_h,               // 104    0x68
-            Char_i,               // 105    0x69
-            Char_j,               // 106    0x6A
-            Char_k,               // 107    0x6B
-            Char_l,               // 108    0x6C
-            Char_m,               // 109    0x6D
-            Char_n,               // 110    0x6E
-            Char_o,               // 111    0x6F
-            Char_p,               // 112    0x70
-            Char_q,               // 113    0x71
-            Char_r,               // 114    0x72
-            Char_s,               // 115    0x73
-            Char_t,               // 116    0x74
-            Char_u,               // 117    0x75
-            Char_v,               // 118    0x76
-            Char_w,               // 119    0x77
-            Char_x,               // 120    0x78
-            Char_y,               // 121    0x79
-            Char_z,               // 122    0x7A
-            Char_LeftBrace,       // 123    0x7B
-            Char_VerticalBar,     // 124    0x7C
-            Char_RightBrace,      // 125    0x7D
-            Char_Tilde,           // 126    0x7E
-                                  // [artem] As I understand, there's no need to specify characters other than those
-                                  //  we'll try to access by index from getKind method (iow, this array is auxilary
-                                  // as I indicated in its comment). Thus, there seems to be no reason to specify
-                                  // Char_Acute here as it's done in OCL's LexerBasicMap.g
-            Char_AfterASCII,      // for all chars in range 128..65534
-            Char_EOF              // for '\uffff' or 65535 
-        };
-
-        // Classify character at ith location
-        @Override
-        public final int getKind(int i) {
-            char c = (i >= getStreamLength() ? '\uffff' : getCharValue(i));
-            return (c < 128 // ASCII Character
-                ? tokenKind[c]
-                : c == '\uffff'
-                    ? Char_EOF
-                    : getNonAsciiKind(c));
-                    
-        }
-
-        private final static int getNonAsciiKind(char c) {
-            $getNonASCIICharKindMethodImpl
-        }
-    ./
-%End
-
-%Define
-	$tokenStartOffset /.leftToken./
-	$tokenEndOffset /.rightToken./
-%Include
-	errorHandling.g
-%End
-
-%Rules
-    /.$BeginActions./
-%End
-
-%Trailers
-    /.
-        $EndActions
-    }
-    ./
-%End
-
---
--- E N D   O F   T E M P L A T E
---
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/dtParserTemplateD.g b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/dtParserTemplateD.g
deleted file mode 100644
index 279bcbede95..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/dtParserTemplateD.g
+++ /dev/null
@@ -1,240 +0,0 @@
---
--- In a parser using this template, the following macro may be redefined:
---
---     $additional_interfaces
---     $ast_class
---     $initialization_code [+; artem]
---
--- B E G I N N I N G   O F   T E M P L A T E   dtParserTemplateD
---
-%Options programming_language=java,margin=4
-%Options table,error_maps,scopes
-%options prefix=TK_,
-%options action-block=("*.java", "/.", "./")
-%options ParseTable=lpg.runtime.ParseTable
-
---
--- This template requires that the name of the EOF token be set
--- to EOF_TOKEN to be consistent with LexerTemplateD and LexerTemplateE
---
-%EOF
-    EOF_TOKEN
-%End
-
-%ERROR
-    ERROR_TOKEN
-%End
-
-%Define
-    $Header
-    /.
-                //
-                // Rule $rule_number:  $rule_text
-                //./
-
-    $BeginAction
-    /. $Header
-                case $rule_number: {./
-
-    $EndAction
-    /.          break;
-                }./
-
-    $BeginJava
-    /.$BeginAction
-                    $symbol_declarations./
-
-    $EndJava /.$EndAction./
-
-    $NoAction
-    /. $Header
-                case $rule_number:
-                    break;./
-
-    $BadAction
-    /. $Header
-                case $rule_number:
-                    throw new Error("No action specified for rule " + $rule_number);./
-
-    $NullAction
-    /. $Header
-                case $rule_number:
-                    setResult(null);
-                    break;./
-
-    $BeginActions
-    /.
-        public void ruleAction(int ruleNumber) {
-            switch (ruleNumber) {./
-
-    $SplitActions
-    /.
-	            default:
-	                ruleAction$rule_number(ruleNumber);
-	                break;
-	        }
-	        return;
-	    }
-	
-	    public void ruleAction$rule_number(int ruleNumber)
-	    {
-	        switch (ruleNumber)
-	        {./
-
-    $EndActions
-    /.
-                default:
-                    break;
-            }
-            return;
-        }./
-
-    $additional_interfaces /../
-    $ast_class /.$ast_type./
-    $initialization_code /../
-
-%End
-
-%Globals
-    /.import lpg.runtime.*;
-    ./
-%End
-
-%Headers
-    /.
-    public class $action_type extends PrsStream implements RuleAction$additional_interfaces {
-        private static ParseTable prs = new $prs_type();
-        private DeterministicParser dtParser;
-
-        public DeterministicParser getParser() { return dtParser; }
-        private void setResult(Object object) { dtParser.setSym1(object); }
-        public Object getRhsSym(int i) { return dtParser.getSym(i); }
-
-        public int getRhsTokenIndex(int i) { return dtParser.getToken(i); }
-        public IToken getRhsIToken(int i) { return super.getIToken(getRhsTokenIndex(i)); }
-        
-        public int getRhsFirstTokenIndex(int i) { return dtParser.getFirstToken(i); }
-        public IToken getRhsFirstIToken(int i) { return super.getIToken(getRhsFirstTokenIndex(i)); }
-
-        public int getRhsLastTokenIndex(int i) { return dtParser.getLastToken(i); }
-        public IToken getRhsLastIToken(int i) { return super.getIToken(getRhsLastTokenIndex(i)); }
-
-        public int getLeftSpan() { return dtParser.getFirstToken(); }
-        public IToken getLeftIToken()  { return super.getIToken(getLeftSpan()); }
-
-        public int getRightSpan() { return dtParser.getLastToken(); }
-        public IToken getRightIToken() { return super.getIToken(getRightSpan()); }
-
-        public int getRhsErrorTokenIndex(int i) {
-            int index = dtParser.getToken(i);
-            IToken err = super.getIToken(index);
-            return (err instanceof ErrorToken ? index : 0);
-        }
-        public ErrorToken getRhsErrorIToken(int i) {
-            int index = dtParser.getToken(i);
-            IToken err = super.getIToken(index);
-            return (ErrorToken) (err instanceof ErrorToken ? err : null);
-        }
-
-        public $action_type(LexStream lexStream) {
-            super(lexStream);
-            $initialization_code
-
-            try {
-                super.remapTerminalSymbols(orderedTerminalSymbols(), $prs_type.EOFT_SYMBOL);
-            }
-            catch(NullExportedSymbolsException e) {
-            }
-            catch(NullTerminalSymbolsException e) {
-            }
-            catch(UnimplementedTerminalsException e) {
-                java.util.ArrayList<?> unimplemented_symbols = e.getSymbols();
-                System.out.println("The Lexer will not scan the following token(s):");
-                for (int i = 0; i < unimplemented_symbols.size(); i++)
-                {
-                    Integer id = (Integer) unimplemented_symbols.get(i);
-                    System.out.println("    " + $sym_type.orderedTerminalSymbols[id.intValue()]);               
-                }
-                System.out.println();                        
-            }
-            catch(UndefinedEofSymbolException e) {
-                throw new Error(new UndefinedEofSymbolException
-                                    ("The Lexer does not implement the Eof symbol " +
-                                     $sym_type.orderedTerminalSymbols[$prs_type.EOFT_SYMBOL]));
-            } 
-        }
- 
-        public String[] orderedTerminalSymbols() { return $sym_type.orderedTerminalSymbols; }
-        public String getTokenKindName(int kind) { return $sym_type.orderedTerminalSymbols[kind]; }            
-        public int getEOFTokenKind() { return $prs_type.EOFT_SYMBOL; }
-        public PrsStream getParseStream() { return (PrsStream) this; }
-
-        public $ast_class parser() {
-            return parser(null, 0);
-        }
-            
-        public $ast_class parser(Monitor monitor) {
-            return parser(monitor, 0);
-        }
-            
-        public $ast_class parser(int error_repair_count) {
-            return parser(null, error_repair_count);
-        }
-            
-        public $ast_class parser(Monitor monitor, int error_repair_count) {
-            try {
-            	resetErrors();
-                dtParser = new DeterministicParser(monitor, (TokenStream)this, prs, (RuleAction)this);
-            }
-            catch (NotDeterministicParseTableException e) {
-                throw new Error(new NotDeterministicParseTableException
-                                    ("Regenerate $prs_type.java with -NOBACKTRACK option"));
-            }
-            catch (BadParseSymFileException e) {
-                throw new Error(new BadParseSymFileException("Bad Parser Symbol File -- $sym_type.java. Regenerate $prs_type.java"));
-            }
-
-            try {
-                return ($ast_class) dtParser.parse();
-            }
-            catch (BadParseException e) {
-                reset(e.error_token); // point to error token
-
-                DiagnoseParser diagnoseParser = new DiagnoseParser(this, prs);
-                diagnoseParser.diagnose(e.error_token);
-            }
-
-            return null;
-        }
-
-    ./
-
-%End
-
-%Define
-	$tokenStartOffset /.getStartOffset(leftToken)./
-	$tokenEndOffset /.getEndOffset(rightToken)./
-
-%Include
-	errorHandling.g
-%End
-
-%Rules
-    /.$BeginActions./
-%End
-
-%Trailers
-    /.
-        $EndActions
-    }
-    ./
-%End
-
-
--- XXX EssentialOCL.g has both $Rules section with BeginActions
--- and $Trailers with EndActions, hence no need duplicate here
-
-
---
--- E N D   O F   T E M P L A T E
---
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/errorHandling.g b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/errorHandling.g
deleted file mode 100644
index d2c01c329f0..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/expression/parser/errorHandling.g
+++ /dev/null
@@ -1,49 +0,0 @@
--- this grammar include file overrides TokenStream#reportError()... methods to introduce 
--- better error handling than plain system.err dump
---
--- Depending on whether this file is being included into LexStream or PrsStream, following definition 
--- should be specified:
---		$tokenStartOffset
---		$tokenEndOffset
--- Definitions may access 'leftToken' and 'rightToken' variables (token indexes)
-
-%Globals
-	/.import java.util.LinkedList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException.ErrorLocationInfo;
-./
-%End
-
-%Headers
-	/.
-		public ErrorLocationInfo[] getErrors() {
-			return errors.toArray(new ErrorLocationInfo[errors.size()]);
-		}
-
-		private void resetErrors() {
-			errors.clear();
-		}
-
-		private final List<ErrorLocationInfo> errors = new LinkedList<ErrorLocationInfo>();
-		
-		@Override
-		public void reportError(int errorCode, int leftToken, int errorToken, int rightToken, String errorInfo[]) {
-			StringBuilder sb = new StringBuilder("(");
-			sb.append(errorCode);
-			sb.append(") ");
-			if (errorInfo != null) {
-				for (int i = 0; i < errorInfo.length; i++) {
-					if (sb.length() > 0) {
-						sb.append("; ");
-					}
-					sb.append(errorInfo[i]);
-				}
-			}
-			errors.add(new ErrorLocationInfo(sb.toString(), getLine(leftToken), getColumn(leftToken), getEndLine(rightToken), getEndColumn(rightToken)));
-		}
-	./
-%End
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/inactive/ContentDescriber.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/inactive/ContentDescriber.java
deleted file mode 100644
index 63681498d50..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/inactive/ContentDescriber.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.inactive;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.CharBuffer;
-import java.nio.charset.Charset;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.core.runtime.QualifiedName;
-import org.eclipse.core.runtime.content.IContentDescription;
-import org.eclipse.core.runtime.content.ITextContentDescriber;
-
-/**
- * Major difference from platform's default content describer (which uses BOM) is that we
- * supply ISO-8859-1 encoding for legacy template files (those with 0xAB and 0xBB), but keep
- * exposing UTF-8 as our default encoding. Besides, we do recognize UTF-8 encoding even if
- * there's no BOM in the file (looking for 0xC2 0xAB and 0xC2 0xBB sequences)
- * 
- * Another important aspect of this detector is that it is confident (i.e. VALID) about GMF-Xpand 
- * content type when there's no IMPORT statement in the template that looks like OAW Xpand. 
- * @author artem
- */
-public class ContentDescriber implements ITextContentDescriber {
-	private final Pattern myImportClause;
-	
-	public ContentDescriber() {
-		myImportClause = Pattern.compile("IMPORT\\s+");
-	}
-	
-	public int describe(Reader contents, IContentDescription description) throws IOException {
-		// no idea what I can tell here, but if I do not implement ITextContentDescriber, attempt to save
-		// existing! UTF-8 xpt file under template folder with ISO encoding results in error "can't convert UTF to ISO"
-		// - for some stupid reason Eclipse TextEditor tries to come up with new encoding for existing file
-		final char[] lookahead = new char[1024];
-		int count = contents.read(lookahead);
-		if (count == 0 || count == -1) {
-			return INDETERMINATE;
-		}
-		return checkSpecificToGMF(CharBuffer.wrap(lookahead, 0, count));
-	}
-
-	public int describe(InputStream contents, IContentDescription description) throws IOException {
-		contents = StreamDecoder.ensureMarkSupported(contents);
-		int check = INDETERMINATE;
-		try {
-			final char[] lookahead = new char[1024];
-			contents.mark(lookahead.length + 1);
-			// use US-ASCII as keywords we are looking for got codes < 127
-			int count = new InputStreamReader(contents, Charset.forName("US-ASCII")).read(lookahead); //$NON-NLS-1$
-			if (count == 0 || count == -1) {
-				return INDETERMINATE;
-			}
-			check = checkSpecificToGMF(CharBuffer.wrap(lookahead, 0, count));
-			if (check == INVALID) {
-				return INVALID;
-			}
-		} finally {
-			contents.reset();
-		}
-		StreamDecoder sd = new StreamDecoder(contents, null);
-		if (sd.getEncoding() == null) {
-			return check;
-		}
-		if (description != null) {
-			description.setProperty(IContentDescription.CHARSET, sd.getEncoding().name());
-		}
-		// XXX alternatively, may return 'check' result, but which content type
-		// would get assigned to empty (just created) files then?
-		return VALID;
-	}
-
-	public QualifiedName[] getSupportedOptions() {
-		return null; // none
-	}
-
-	// uses INVALID, VALID and INDETERMINATE constants to indicate
-	// whether template is "definitely not GMF's", "definitely GMF's" and "can't tell" respectively 
-	private int checkSpecificToGMF(CharSequence s) throws IOException {
-		Matcher m = myImportClause.matcher(s);
-		if (m.find()) {
-			if (m.hitEnd() || m.end() >= s.length()) {
-				return INDETERMINATE; // found IMPORT, but can't tell what's after that
-			}
-			char firstNonSpace = s.charAt(m.end());
-			return firstNonSpace == '"' || firstNonSpace == '\'' ? VALID : INVALID;
-		}
-		return INDETERMINATE;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/inactive/StreamDecoder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/inactive/StreamDecoder.java
deleted file mode 100644
index 9996d6e5699..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/inactive/StreamDecoder.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.inactive;
-
-import java.io.BufferedInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.nio.charset.Charset;
-
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-
-/**
- * FIXME tests!!! (especially that C2AB and C2BB without BOM give UTF8)
- * @author artem
- */
-public class StreamDecoder {
-
-	public static final Charset LEGACY_ENCODING = Charset.forName("ISO-8859-1"); //$NON-NLS-1$
-
-	private final InputStream myInputStream;
-	private final Charset myDefaultEncoding;
-	private Reader myResult;
-	private Charset myEncoding;
-
-	/**
-	 * @param is can't be null
-	 * @param defaultEncoding may be null
-	 */
-	public StreamDecoder(InputStream is, Charset defaultEncoding) {
-		assert is != null;
-		myInputStream = ensureMarkSupported(is);
-		myDefaultEncoding = defaultEncoding;
-	}
-
-	public Reader getReader() {
-		if (myResult == null) {
-			myResult = createReader(myInputStream, getEncoding());
-		}
-		return myResult;
-	}
-
-	/**
-	 * @return defaultEncoding, if can't detect
-	 */
-	public Charset getEncoding() {
-		if (myEncoding == null) {
-			myEncoding = detectEncoding(myInputStream);
-		}
-		return myEncoding;
-	}
-
-	// is passed supports marks
-	protected Charset detectEncoding(InputStream is) {
-		assert is.markSupported();
-		final int markLimit = 1024;
-		is.mark(markLimit); // pure guess, most templates, even those with EPL comment header, got smth that far  
-		try {
-			int b1 = is.read();
-			int b2 = is.read();
-			if (b1 == -1 || b2 == -1) {
-				return myDefaultEncoding;
-			}
-			if (b1 == 0xFE && b2 == 0xFF) {
-				return Charset.forName("UTF-16BE");
-			}
-			if (b1 == 0xFF && b2 == 0xFE) {
-				return Charset.forName("UTF-16LE");
-			}
-			int b3 = is.read();
-			if (b3 == -1) {
-				return myDefaultEncoding;
-			}
-			if (b1 == 0xEF && b2 == 0xBB && b3 == 0xBF) {
-				return Charset.forName("UTF-8");
-			}
-			is.reset(); // all over again
-			boolean foundC2, foundAB, foundBB, foundC2AB, foundC2BB;
-			foundC2 = foundAB = foundBB = foundC2AB = foundC2BB = false;
-			for (int i = markLimit; i > 0; i--) {
-				int b = is.read();
-				if (b == -1) {
-					break;
-				}
-				if (!foundAB && !foundC2AB) {
-					foundAB = b == 0xAB;
-					foundC2AB = foundC2 && foundAB;
-				}
-				if (!foundBB && !foundC2BB) {
-					foundBB = b == 0xBB;
-					foundC2BB = foundC2 && foundBB;
-				}
-				foundC2 = b == 0xC2; // keeps knowledge whether current byte is C2 for the next iteration
-			}
-			if (foundC2AB && foundC2BB) {
-				return Charset.forName("UTF-8");
-			}
-			if (foundAB && foundBB) {
-				return LEGACY_ENCODING;
-			}
-		} catch (IOException ex) {
-			// IGNORE
-		} finally {
-			try {
-				is.reset();
-			} catch (IOException ex) {
-				// XXX actually, should avoid using Activator as it may trigger plugin initialization
-				// but as long as it can barely happen here...
-				Activator.logError(ex);
-			}
-		}
-		return myDefaultEncoding;
-	}
-
-	protected Reader createReader(InputStream is, Charset encoding) {
-		return encoding != null ? new InputStreamReader(is, encoding) : new InputStreamReader(is);
-	}
-
-	/**
-	 * @return same or wrapped input stream that has {@link InputStream#markSupported()} == true
-	 */
-	public static InputStream ensureMarkSupported(InputStream is) {
-		return is.markSupported() ? is : new BufferedInputStream(is);
-	}
-//	public static Reader ensureMarkSupported(Reader r) {
-//		return r.markSupported() ? r : new BufferedReader(r);
-//	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AdvicedDefinition.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AdvicedDefinition.java
deleted file mode 100644
index 2f6c12fd10c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AdvicedDefinition.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 committers of openArchitectureWare, CEA LIST, Artal and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import org.eclipse.papyrus.gmf.internal.xpand.BuiltinMetaModel;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Advice;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.TypeHelper;
-
-public class AdvicedDefinition implements XpandDefinition {
-
-    private XpandAdvice advice;
-
-    private XpandDefinition definition;
-
-    public AdvicedDefinition(final XpandAdvice adv, final XpandDefinition def) {
-        advice = adv;
-        definition = def;
-    }
-
-    public XpandResource getOwner() {
-        return definition.getOwner();
-    }
-
-    public void evaluate(final ExecutionContext ctx) {
-        final ExecutionContext ctx1 = ctx.cloneWithVariable(new Variable(Advice.DEF_VAR_NAME, BuiltinMetaModel.DEFINITION_TYPE, new XpandDefinitionWrap(definition, ctx)));
-        advice.evaluate(ctx1);
-    }
-
-    public DeclaredParameter[] getParams() {
-        return definition.getParams();
-    }
-
-    public TypeHelper getTargetType() {
-        return definition.getTargetType();
-    }
-
-    public String getName() {
-        return definition.getName();
-    }
-
-    @Override
-    public String toString() {
-        return definition.toString() + " adviced by " + advice.toString();
-    }
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AmbiguousDefinitionException.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AmbiguousDefinitionException.java
deleted file mode 100644
index b270725881e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AmbiguousDefinitionException.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-public class AmbiguousDefinitionException extends Exception {
-
-	private XpandDefinition definition1;
-
-	private XpandDefinition definition2;
-	
-	public AmbiguousDefinitionException(XpandDefinition candidate1, XpandDefinition candidate2) {
-		super("Ambiguous definitions " + candidate1.toString() + " and " + candidate2.toString());
-		definition1 = candidate1;
-		definition2 = candidate2;
-	}
-
-	public XpandDefinition getDefinition1() {
-		return definition1;
-	}
-
-	public XpandDefinition getDefinition2() {
-		return definition2;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AnalysationIssue.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AnalysationIssue.java
deleted file mode 100644
index 4120881640d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/AnalysationIssue.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * FIXME: refactor - hide enum type into factory method, check all types are still in use, get rid of isWarningNotError
- * @author Sven Efftinge
- * @author Arno Haase
- */
-public class AnalysationIssue {
-
-    public enum Type {
-        INCOMPATIBLE_TYPES("Incompatible types"),
-        UNNECESSARY_CAST("Unnecessary cast"),
-        FEATURE_NOT_FOUND("Callable not found"),
-        TYPE_NOT_FOUND ("Type not found"),
-        INTERNAL_ERROR("Internal error"),
-        JAVA_TYPE_NOT_FOUND("Java Type not found"),
-        SYNTAX_ERROR("Syntax error"),
-        DEFINITION_NOT_FOUND("Definition not found"),
-        EXTENSION_NOT_FOUND("Extension not found"),
-        NAMESPACE_NOT_FOUND("Namespace not found"),
-        UNUSED_IMPORT("Unused import");
-
-        private String name;
-
-        private Type(final String name) {
-            this.name = name;
-        }
-
-        @Override
-        public String toString() {
-            return name;
-        }
-    }
-
-    private final Type type;
-
-    private final String message;
-
-    private final boolean isWarningNotError;
-
-	private final int start;
-
-	private final int end;
-
-	private final int line;
-
-    public AnalysationIssue(final Type type, final String message, final SyntaxElement element) {
-    	this(type, message, element, false);
-    }
-    
-    public AnalysationIssue(final Type type, final String message, final SyntaxElement element, boolean isWarning) {
-    	this(type, message, element.getStart(), element.getEnd(), element.getLine(), isWarning);
-    }
-
-    public AnalysationIssue(final Type type, final String message, final ExpressionHelper exprHelper) {
-    	this(type, message, exprHelper.getStart(), exprHelper.getEnd(), -1, false);
-    }
-
-    private AnalysationIssue(final Type type, final String message, final int start, int end, int line, boolean isWarningNotError) {
-        this.type = type;
-        this.message = message;
-        this.isWarningNotError = isWarningNotError;
-        this.start = start;
-        this.end = end;
-        this.line = line;
-    }
-
-    public boolean isWarningNotError() {
-    	return isWarningNotError;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public Type getType() {
-        return type;
-    }
-    
-    public int getStart() {
-    	return start;
-    }
-    
-    public int getEnd() {
-    	return end;
-    }
-    
-    public int getLine() {
-    	return line;
-    }
-    
-    @Override
-    public String toString() {
-        return "[" + type.name + "] - " + message;
-    }
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/EvaluationException.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/EvaluationException.java
deleted file mode 100644
index 4e2ee00fdc4..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/EvaluationException.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.ExpressionHelper;
-
-/**
- * @author Sven Efftinge
- * @author Arno Haase
- */
-public class EvaluationException extends RuntimeException {
-
-	private static final long serialVersionUID = 542684666287282979L;
-	private final String location;
-
-    public EvaluationException(final String msg, final SyntaxElement element) {
-        super(msg);
-        location = location(element);
-    }
-    
-    // TODO: review all usages
-    public EvaluationException(final String msg) {
-        super(msg);
-        location = "";
-    }
-
-    public EvaluationException(final Throwable ex) {
-        super(ex);
-        location = "";
-    }
-
-    public EvaluationException(final AmbiguousDefinitionException e) {
-    	super(e.getMessage());
-    	location = location(e);
-	}
-
-	public EvaluationException(final String message, ExpressionHelper expressionHelper) {
-		super(message);
-		location = location(expressionHelper);
-	}
-	
-	private String location(AmbiguousDefinitionException e) {
-		// TODO: log line number here?
-		String fileName = null;
-		if (e.getDefinition1() != null) {
-			fileName = e.getDefinition1().getOwner().getFullyQualifiedName();
-		} else if (e.getDefinition2() != null) {
-			fileName = e.getDefinition2().getOwner().getFullyQualifiedName();
-		}
-		if (fileName != null) {
-			return ":in " + fileName;
-		}
-		return "";
-	}
-
-	private static String location(ExpressionHelper expressionHelper) {
-		if (expressionHelper == null) {
-			return "";
-		}
-		return ":in " + expressionHelper.getFileName() + ", line " + expressionHelper.getLine();
-	}
-
-	private static String location(SyntaxElement element) {
-    	if (element == null) {
-    		return "";
-    	}
-    	return ":in " + element.getFileName() + ", line " + element.getLine();
-    }
-
-    @Override
-    public String getMessage() {
-        return super.getMessage() + location;
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/ExecutionContext.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/ExecutionContext.java
deleted file mode 100644
index aab11c8d68e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/ExecutionContext.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.m2m.internal.qvt.oml.evaluator.QvtOperationalEvaluationVisitor;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceMarker;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtExtension;
-
-/**
- * @author Sven Efftinge
- * @author Arno Haase
- * XXX would be great to have some cancellation behavior available from environment (i.e. for debuger to be able to stop execution)
- */
-public interface ExecutionContext {
-
-	// FIXME replace with Variable constructor without a name
-	public final static String IMPLICIT_VARIABLE = "this";
-
-	ExecutionContext cloneWithVariable(Variable... v);
-
-	ExecutionContext cloneWithResource(ResourceMarker ns);
-
-	Variable getImplicitVariable();
-
-	Set<QvtExtension> getAllExtensions();
-
-	// may return null if no definition found
-	XpandDefinition findDefinition(String name, EClassifier target, EClassifier[] paramTypes) throws AmbiguousDefinitionException;
-	
-	EcoreEnvironment getOCLEnvironment();
-	QvtOperationalEvaluationVisitor createEvaluationVisitor();
-
-	Scope getScope();
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/ExecutionContextImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/ExecutionContextImpl.java
deleted file mode 100644
index a540eca7a3e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/ExecutionContextImpl.java
+++ /dev/null
@@ -1,328 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.m2m.internal.qvt.oml.ast.env.QVTParsingOptions;
-import org.eclipse.m2m.internal.qvt.oml.ast.env.QvtOperationalEnvFactory;
-import org.eclipse.m2m.internal.qvt.oml.ast.env.QvtOperationalEvaluationEnv;
-import org.eclipse.m2m.internal.qvt.oml.evaluator.ImportToNonTransformCtxHelper;
-import org.eclipse.m2m.internal.qvt.oml.evaluator.QvtOperationalEvaluationVisitor;
-import org.eclipse.m2m.internal.qvt.oml.evaluator.QvtOperationalEvaluationVisitorImpl;
-import org.eclipse.m2m.internal.qvt.oml.expressions.Module;
-import org.eclipse.m2m.internal.qvt.oml.library.Context;
-import org.eclipse.m2m.internal.qvt.oml.runtime.util.OCLEnvironmentWithQVTAccessFactory;
-import org.eclipse.ocl.Environment;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.ocl.ecore.EcoreEvaluationEnvironment;
-import org.eclipse.ocl.ecore.EcoreFactory;
-import org.eclipse.ocl.options.ParsingOptions;
-import org.eclipse.papyrus.gmf.internal.xpand.BuiltinMetaModel;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceMarker;
-import org.eclipse.papyrus.gmf.internal.xpand.util.PolymorphicResolver;
-import org.eclipse.papyrus.gmf.internal.xpand.util.TypeNameUtil;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtExtension;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtResource;
-
-/**
- * @author Sven Efftinge
- * @author Arno Haase
- */
-@SuppressWarnings("restriction")
-public final class ExecutionContextImpl implements ExecutionContext {
-
-    private final Map<String, Variable> variables = new HashMap<String, Variable> ();
-
-    // never null
-    private final Scope scope;
-
-    private final ResourceMarker currentResource;
-
-    private Set<QvtExtension> allExtensions;
-
-//	private ImportToNonTransformCtxHelper modulesImportHelper;
-
-    public ExecutionContextImpl(Scope rootScope) {
-        this (rootScope, null, null);
-    }
-
-    public ExecutionContextImpl(Scope rootScope, ResourceMarker resource, Collection<Variable> variables) {
-    	assert rootScope != null;
-		this.scope = rootScope;
-		this.currentResource = resource;
-		if (variables != null) {
-			for (Variable v : variables) {
-				this.variables.put(v.getName(), v);
-			}
-		}
-    }
-
-    public Scope getScope() {
-    	return scope;
-    }
-
-    public Variable getImplicitVariable() {
-        return variables.get(IMPLICIT_VARIABLE);
-    }
-
-
-	public ExecutionContext cloneWithVariable(final Variable... vars) {
-        final ExecutionContextImpl result = new ExecutionContextImpl(scope, currentResource, variables.values());
-        // cached values that depend on resource only may be kept
-        result.envFactory = envFactory;
-        result.allExtensions = allExtensions;
-//        result.modulesImportHelper = modulesImportHelper;
-    	result.environment = null; // XXX or create new, delegating?
-        for (Variable v : vars) {
-        	// adding to the set of original variables because of e.g. nested let statements
-        	result.variables.put(v.getName(), v);
-        }
-        return result;
-    }
-
-    public ExecutionContext cloneWithResource(final ResourceMarker ns) {
-        if (ns == currentResource) {
-        	return this;
-        }
-        // XXX is it reasonable to pass variables if it's another resource?
-        final ExecutionContextImpl result = new ExecutionContextImpl(scope, ns, variables.values());
-    	result.envFactory = null; // need to make sure resource's imports are read into registry.
-    	result.environment = null;
-    	result.allExtensions = null;
-//    	result.modulesImportHelper = null;
-        return result;
-    }
-
-    public ResourceMarker currentResource() {
-        return currentResource;
-    }
-
-    private String[] getImportedExtensions() {
-    	return currentResource == null ? new String[0] : currentResource.getImportedExtensions();
-    }
-
-	public Set<QvtExtension> getAllExtensions() {
-        if (allExtensions == null) {
-            allExtensions = new HashSet<QvtExtension>();
-            final String[] extensions = getImportedExtensions();
-            for (String extension : extensions) {
-            	final QvtResource qvtResource = getScope().findExtension(extension);
-            	if (qvtResource == null) {
-   					continue;
-            	}
-        		final ExecutionContext ctx = cloneWithResource(qvtResource);
-                final List<QvtExtension> extensionList = qvtResource.getExtensions();
-                if (extensionList == null) {
-                	continue;
-                }
-                for (QvtExtension element : extensionList) {
-                    element.init(ctx);
-                    allExtensions.add(element);
-                }
-            }
-        }
-        return allExtensions;
-    }
-
-    public XpandDefinition findDefinition(String name, EClassifier target, EClassifier[] paramTypes) throws AmbiguousDefinitionException {
-        String templateName;
-        boolean localCall = !TypeNameUtil.isQualifiedName(name);
-        if (localCall) {
-        	// [artem] the reason can't just use currentResource() as it might be part of composite?
-        	// otherwise, see no reason to load it once again in findTemplate()
-        	templateName = ((XpandResource) currentResource()).getFullyQualifiedName(); // need an enclosing resource in case of composite	
-        } else {
-        	templateName = TypeNameUtil.withoutLastSegment(name);
-        }
-        XpandResource tpl = findTemplate(templateName);
-        if (tpl == null) {
-        	if (localCall) {
-        		tpl = (XpandResource) currentResource();
-        	} else {
-        		return null;
-        	}
-		}
-        final ExecutionContext ctx = cloneWithResource(tpl);
-        XpandDefinition def = findDefinition(tpl.getDefinitions(), name, target, paramTypes, ctx);
-        if (def == null) {
-        	return null;
-        }
-        XpandAdvice[] advicesInResource = tpl.getAdvices();
-        for (int x = advicesInResource.length - 1; x >= 0; x--) {
-            final XpandAdvice adv = advicesInResource[x];
-            if (adv.matches(def, this)) {
-                def = new AdvicedDefinition(adv, def);
-            }
-        }
-        for (int x = scope.getAdvices().size() - 1; x >= 0; x--) {
-            final XpandAdvice adv = scope.getAdvices().get(x);
-            if (adv.matches(def, this)) {
-                def = new AdvicedDefinition(adv, def);
-            }
-        }
-        return def;
-    }
-
-    // XXX completely rewritten, NEEDS TESTS!
-    // getPossibleNames(getImportedNamespaces()), along with FQN added in #getImportedNamespaces(), was stupid hack anyway.
-    private XpandResource findTemplate(final String templateName) {
-    	if (currentResource() instanceof XpandResource) {
-    		String contextTemplate = ((XpandResource) currentResource()).getFullyQualifiedName();
-    		return scope.findTemplate(templateName, contextTemplate);
-    	} else {
-    		return scope.findTemplate(templateName);
-    	}
-    }
-
-    /**
-     * resolves the correct definition (using parametric polymorphism)
-	 * XXX: get rid of the ctx argument and redeclare as non-static?
-     * @param definitions
-     * @param target
-     * @param paramTypes
-     * @return
-     * @throws AmbiguousDefinitionException 
-     */
-    private static XpandDefinition findDefinition(final XpandDefinition[] definitions, final String name, final EClassifier target,
-            EClassifier[] paramTypes, final ExecutionContext ctx) throws AmbiguousDefinitionException {
-        if (paramTypes == null) {
-            paramTypes = new EClassifier[0];
-        }
-        final String unqualifiedName = TypeNameUtil.getLastSegment(name);
-        // XXX Instead of using map as a mere pair storage, do it like Extension does with init(ctx)
-        // to resolve and keep typed arguments
-        HashMap<XpandDefinition, List<EClassifier>> resolvedDefs = new HashMap<XpandDefinition, List<EClassifier>>();
-        for (final XpandDefinition def : definitions) {
-        	if (!def.getName().equals(unqualifiedName)) {
-        		continue;
-        	}
-            if (def.getParams().length == paramTypes.length) {
-                final LinkedList<EClassifier> defsParamTypes = new LinkedList<EClassifier>();
-                EClassifier t = null;
-                boolean complete = true;
-                for (int j = 0; (j < paramTypes.length) && complete; j++) {
-                    t = def.getParams()[j].getTypeForName(ctx);
-                    if (t == null) {
-                        complete = false;
-                    }
-                    defsParamTypes.add(t);
-                }
-                t = def.getTargetType().getTypeForName(ctx);
-                if (t == null) {
-                    complete = false;
-                } else {
-                	defsParamTypes.addFirst(t);
-                }
-                if (complete) {
-                	resolvedDefs.put(def, defsParamTypes);
-                }
-            }
-        }
-		return PolymorphicResolver.filterDefinition(resolvedDefs, target, Arrays.asList(paramTypes), ctx.getOCLEnvironment());
-    }
-
-    private OCLEnvironmentWithQVTAccessFactory envFactory; // null-ified when context's resource is changed
-
-    private EcoreEnvironment environment;
-
-    public EcoreEnvironment getOCLEnvironment() {
-    	if (environment != null) {
-    		return environment;
-    	}
-    	if (envFactory == null) {
-    		envFactory = new OCLEnvironmentWithQVTAccessFactory(getImportedModules(), getAllVisibleModels());
-    	}
-		environment = (EcoreEnvironment) envFactory.createEnvironment();
-		ParsingOptions.setOption(environment, QVTParsingOptions.ENFORCE_EXPLICIT_SELF_VARIABLE, Boolean.FALSE);
-		ParsingOptions.setOption(environment, ParsingOptions.implicitRootClass(environment), EcorePackage.Literals.EOBJECT);
-		Variable that = getImplicitVariable();
-    	for (Variable v : variables.values()) {
-    		if (that != v) {
-    			// XXX alternative: environment.getOCLFactory().createVariable()
-    			org.eclipse.ocl.ecore.Variable oclVar = EcoreFactory.eINSTANCE.createVariable();
-    			oclVar.setName(v.getName());
-    			if (v.getType() == null) {
-					oclVar.setType(BuiltinMetaModel.getType(this, v.getValue()));
-    			} else {
-    				oclVar.setType(v.getType());
-    			}
-    			environment.addElement(oclVar.getName(), oclVar, true);
-    		}
-    	}
-		if (that != null) {
-			EClassifier type = that.getType() == null ? BuiltinMetaModel.getType(this, that.getValue()) : that.getType();
-			environment = (EcoreEnvironment) envFactory.createClassifierContext(environment, type);
-		}
-    	return environment;
-    }
-
-	public QvtOperationalEvaluationVisitor createEvaluationVisitor() {
-		QvtOperationalEvaluationEnv evaluationEnv = (QvtOperationalEvaluationEnv) createEvaluationEnvironment();
-		ImportToNonTransformCtxHelper importsHelper = scope.getImportsHelper();
-		for (Module module : getImportedModules()) {
-			importsHelper.addImportedModule(module);
-		}
-		return QvtOperationalEvaluationVisitorImpl.createNonTransformationExecutionContextVisitor(QvtOperationalEnvFactory.INSTANCE.createEnvironment(), evaluationEnv, importsHelper);
-	}
-
-	private Set<Module> getImportedModules() {
-		LinkedHashSet<Module> importedModules = new LinkedHashSet<Module>();
-		final String[] extensions = getImportedExtensions();
-		for (String extension : extensions) {
-			final QvtResource qvtResource = getScope().findExtension(extension);
-			if (qvtResource != null) {
-				importedModules.addAll(qvtResource.getModules());
-			}
-		}
-		return importedModules;
-	}
-
-	private EcoreEvaluationEnvironment createEvaluationEnvironment() {
-    	if (envFactory == null) {
-    		getOCLEnvironment();
-    	}
-    	EcoreEvaluationEnvironment ee = QvtOperationalEnvFactory.INSTANCE.createEvaluationEnvironment(new Context(), null);
-    	Variable that = getImplicitVariable();
-    	for (Variable v : variables.values()) {
-    		if (that != v) {
-    			ee.add(v.getName(), v.getValue());
-    		}
-    	}
-    	if (that != null) {
-    		ee.add(Environment.SELF_VARIABLE_NAME, that.getValue());
-    	}
-    	return ee;
-	}
-	
-	private String[] getImportedNamespaces() {
-		return currentResource == null ? new String[0] : currentResource.getImportedNamespaces();
-	}
-
-	public EPackage.Registry getAllVisibleModels() {
-		return getScope().createPackageRegistry(getImportedNamespaces());
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Output.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Output.java
deleted file mode 100644
index ef01c674549..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Output.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005-2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import org.eclipse.papyrus.gmf.internal.xpand.StreamsHolder;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-
-/**
- * @author Sven Efftinge
- */
-public interface Output {
-    public void write(String text);
-
-    public void enterStatement(SyntaxElement stmt);
-
-    public void exitStatement(SyntaxElement stmt);
-
-    public void openFile(String path, String outletName);
-
-    public void closeFile();
-
-    public StreamsHolder getNamedStreams();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Scope.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Scope.java
deleted file mode 100644
index bdf2c05cf1b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Scope.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.impl.EPackageRegistryImpl;
-import org.eclipse.m2m.internal.qvt.oml.evaluator.ImportToNonTransformCtxHelper;
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-import org.eclipse.papyrus.gmf.internal.xpand.eval.EvaluationListener;
-import org.eclipse.papyrus.gmf.internal.xpand.util.TypeNameUtil;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtResource;
-
-/**
- * @author artem
- */
-public class Scope {
-
-    private final Map<String, Variable> globalVars = new HashMap<String, Variable> ();
-
-	private final ResourceManager resourceManager;
-
-    private final Output output;
-
-    private final List<XpandAdvice> registeredAdvices = new LinkedList<XpandAdvice>();
-
-    private EvaluationListener evaluationListener;
-
-    public Scope(ResourceManager resourceManager, Collection<Variable> globalVars, Output output) {
-    	assert resourceManager != null;
-    	// FIXME output != null is only important for evaluation cases, for analyze, null is perfectly ok
-    	// assert output != null;
-        this.resourceManager = resourceManager;
-		this.output = output;
-        if (globalVars != null) {
-        	for (Variable v : globalVars) {
-        		this.globalVars.put(v.getName(), v);
-        	}
-		}
-    }
-
-    // FIXME next two are for tests 
-    protected Scope() {
-    	resourceManager = null;
-    	output = null;
-    }
-
-    protected Scope(Output out) {
-    	resourceManager = null;
-    	output = out;
-    }
-
-	// [artem] if not null, should be notified about entering/leaving xpand ast elements
-    public EvaluationListener getEvaluationListener() {
-    	return evaluationListener;
-    }
-
-    public void setEvaluationListener(EvaluationListener listener) {
-    	this.evaluationListener = listener;
-    }
-
-    public Variable getGlobalVariable(String name) {
-    	return globalVars.get(name);
-    }
-    
-    public Collection<String> getGlobalVarNames() {
-    	return globalVars.keySet();
-    }
-
-    // never null
-    private ResourceManager getResourceManager() {
-    	return resourceManager;
-    }
-
-    // never null
-    public Output getOutput() {
-        return output;
-    }
-
-	public List<XpandAdvice> getAdvices() {
-		return registeredAdvices;
-	}
-
-	public void registerAdvices(final String fullyQualifiedName) {
-        final XpandResource tpl = findTemplate(fullyQualifiedName);
-        if (tpl == null) {
-			throw new RuntimeException("Couldn't find template : " + fullyQualifiedName);
-		}
-        final XpandAdvice[] as = tpl.getAdvices();
-        for (final XpandAdvice advice : as) {
-            if (registeredAdvices.contains(advice)) {
-                Activator.logWarn("advice " + advice.toString() + " allready registered!");
-            } else {
-                registeredAdvices.add(advice);
-            }
-        }
-    }
-
-    public XpandResource findTemplate(String templateName, String contextTemplate) {
-    	assert templateName != null;
-    	assert contextTemplate != null;
-    	if (getResourceManager() == null) {
-    		// HACK for tests
-    		// FIXME once dealt with Scope with null rm, should remove this. (fix tests to use RM)
-    		return null;
-    	}
-    	String[] possibleNames;
-		if (!TypeNameUtil.isQualifiedName(contextTemplate)) {
-			possibleNames = new String[] { templateName };
-		} else {
-			String contextNS = TypeNameUtil.withoutLastSegment(contextTemplate);
-			possibleNames = new String[] { templateName, contextNS + TypeNameUtil.NS_DELIM + templateName };
-		}
-        for (String name : possibleNames) {
-            final XpandResource tpl = findTemplate(name);
-            if (tpl != null) {
-				return tpl;
-			}
-        }
-        return null;
-    }
-
-	public XpandResource findTemplate(String templateName) {
-		XpandResource resource = getResourceManager().loadXpandResource(templateName);
-		if (resource instanceof StatefulResource && !((StatefulResource) resource).isInitialized()) {
-			((StatefulResource) resource).initialize(this);
-		}
-		return resource;
-	}
-
-	public QvtResource findExtension(String extensionName) {
-		return getResourceManager().loadQvtResource(extensionName);
-	}
-
-    public EPackage.Registry createPackageRegistry(String[] metamodelURIs) {
-		assert metamodelURIs != null;
-		// TODO respect meta-models imported not only with nsURI
-		EPackage.Registry result = new EPackageRegistryImpl();
-		for (String namespace : metamodelURIs) {
-			EPackage pkg = Activator.findMetaModel(namespace);
-			if (pkg != null) {
-				result.put(namespace, pkg);
-			}
-		}
-		if (result.isEmpty()) {
-			// hack for tests
-			result.put(EcorePackage.eNS_URI, EcorePackage.eINSTANCE);
-		}
-		return result;
-	}
-
-	private ImportToNonTransformCtxHelper modulesImportHelper;
-	/*package-local*/ ImportToNonTransformCtxHelper getImportsHelper() {
-		if (modulesImportHelper == null) {
-			modulesImportHelper = new ImportToNonTransformCtxHelper();
-		}
-		return modulesImportHelper;
-	}
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/StatefulResource.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/StatefulResource.java
deleted file mode 100644
index df8744ecbe5..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/StatefulResource.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-/**
- * This is a marker interface. Intention of this interface is to show that
- * implementing resource should be initialized with appropriate {@link Scope}
- * instance.
- */
-public interface StatefulResource {
-
-	/**
-	 * Perform actual initialization
-	 */
-	void initialize(Scope scope);
-
-	/**
-	 * @return true if this instance was already initialized
-	 */
-	boolean isInitialized();
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Variable.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Variable.java
deleted file mode 100644
index f265503debe..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/Variable.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005,2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import org.eclipse.emf.ecore.EClassifier;
-
-/**
- * FIXME Do we need Variables now, with explicit OCLEnvironment available? 
- * @author Sven Efftinge
- * @author Arno Haase
- */
-public class Variable {
-
-    private final String name;
-
-    private final Object value;
-
-	private final EClassifier type;
-
-	/**
-	 * type and value may be null 
-	 */
-    public Variable(final String name, final EClassifier type, final Object value) {
-		if (name == null) {
-			throw new NullPointerException("name must not be null!");
-		}
-        this.name = name;
-        this.type = type;
-        this.value = value;
-    }
-
-    public Object getValue() {
-        return value;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public EClassifier getType() {
-		return type;
-	}
-
-    @Override
-    public int hashCode() {
-        final int PRIME = 31;
-        int result = 1;
-        result = PRIME * result + ((name == null) ? 0 : name.hashCode());
-        result = PRIME * result + ((value == null) ? 0 : value.hashCode());
-        return result;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (this == obj) {
-			return true;
-		}
-        if (obj == null) {
-			return false;
-		}
-        if (getClass() != obj.getClass()) {
-			return false;
-		}
-        final Variable other = (Variable) obj;
-        if (name == null) {
-            if (other.name != null) {
-				return false;
-			}
-        } else if (!name.equals(other.name)) {
-			return false;
-		}
-        if (value == null) {
-            return other.value == null;
-        } else {
-			return value.equals(other.value);
-		}
-    }
-
-    @Override
-	public String toString () {
-        return "Variable [" + name + "="+ value + "]";
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandAdvice.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandAdvice.java
deleted file mode 100644
index 4ab93c554cc..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandAdvice.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 committers of openArchitectureWare and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-public interface XpandAdvice {
-
-    public boolean matches(XpandDefinition def, ExecutionContext ctx);
-
-    public void evaluate(ExecutionContext ctx);
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandAnalyzable.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandAnalyzable.java
deleted file mode 100644
index d36aba2eb6c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandAnalyzable.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import java.util.Set;
-
-
-public interface XpandAnalyzable {
-    void analyze(ExecutionContext ctx, Set<AnalysationIssue> issues);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandDefinition.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandDefinition.java
deleted file mode 100644
index 685bd10730c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandDefinition.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 committers of openArchitectureWare and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.TypeHelper;
-
-public interface XpandDefinition {
-
-    XpandResource getOwner();
-
-    void evaluate(ExecutionContext ctx);
-
-    DeclaredParameter[] getParams();
-
-    TypeHelper getTargetType();
-
-    String getName();
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandDefinitionWrap.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandDefinitionWrap.java
deleted file mode 100644
index 62c38b74822..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandDefinitionWrap.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 committers of openArchitectureWare, CEA LIST, Artal and others.
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - initial API and implementation
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-
-public class XpandDefinitionWrap {
-
-    private final XpandDefinition def;
-
-    private final ExecutionContext ctx;
-
-    public XpandDefinitionWrap(final XpandDefinition def, final ExecutionContext ctx) {
-        this.def = def;
-        this.ctx = ctx;
-    }
-
-    public String getName() {
-        return def.getName();
-    }
-
-    public List<EClassifier> getParamTypes() {
-        final DeclaredParameter[] p = def.getParams();
-        final List<EClassifier> result = new ArrayList<EClassifier>();
-        for (DeclaredParameter element : p) {
-            result.add(element.getTypeForName(ctx));
-        }
-        return result;
-    }
-
-    public List<String> getParamNames() {
-        final DeclaredParameter[] p = def.getParams();
-        final List<String> result = new ArrayList<String>();
-        for (DeclaredParameter element : p) {
-            result.add(element.getVarName());
-        }
-        return result;
-    }
-
-    public void proceed() {
-        def.evaluate(ctx);
-    }
-
-    public void proceed(final Object target, final List<?> list) {
-        ExecutionContext context = ctx;
-        if (target != null) {
-            context = context.cloneWithVariable(new Variable(ExecutionContext.IMPLICIT_VARIABLE, null, target));
-        }
-        if (list != null) {
-            final List<String> n = getParamNames();
-            for (int i = 0, x = list.size(); i < x;) {
-                final Object o = list.get(i);
-                if ((o != null) && (n.size() >= i)) {
-                    context = context.cloneWithVariable(new Variable(n.get(i), null, o));
-                }
-            }
-        }
-        def.evaluate(context);
-    }
-
-    @Override
-    public String toString() {
-        return getClass().getSimpleName() + '[' + def.toString() + ']';
-    }
-}
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandEvaluatable.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandEvaluatable.java
deleted file mode 100644
index c2675c52d48..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandEvaluatable.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-
-public interface XpandEvaluatable {
-    public abstract void evaluate(ExecutionContext ctx);
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandIterator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandIterator.java
deleted file mode 100644
index 2f2db586af7..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandIterator.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/************************************************************************************************************************************************************
- * Copyright (c) 2005, 2006 committers of openArchitectureWare and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - initial API and implementation
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-/**
- * FIXME [artem] does this look like good citizen? perhaps, having 
- * java.util.Iterator available instead would be better. Or just directly an []
- */
-public class XpandIterator {
-
-    private long counter = 0l;
-
-    private long elementCount = 0l;
-
-    public XpandIterator(final long elementCount) {
-        this.elementCount = elementCount;
-    }
-
-    public Long counter() {
-        return new Long(counter);
-    }
-
-    public Long elements() {
-        return new Long(elementCount);
-    }
-
-    public void increment() {
-        counter++;
-    }
-
-    public Boolean isLastIteration() {
-        return Boolean.valueOf(counter + 1 == elementCount);
-    }
-
-    public Boolean isFirstIteration() {
-        return Boolean.valueOf(counter == 0);
-    }
-
-    public Long counter1() {
-        return new Long(counter + 1);
-    }
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandResource.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandResource.java
deleted file mode 100644
index 5620d60199d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandResource.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2008 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- */
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceMarker;
-
-public interface XpandResource extends XpandAnalyzable, ResourceMarker {
-	public static final String TEMPLATE_EXTENSION = "xpt";
-
-	String getFullyQualifiedName(); // [artem] from Resource XXX reconsider - almost useless?
-
-    XpandDefinition[] getDefinitions();
-
-    XpandAdvice[] getAdvices();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandStreamsHolder.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandStreamsHolder.java
deleted file mode 100644
index da216928dab..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/model/XpandStreamsHolder.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Boris Blajer (Borland)
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.model;
-
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.papyrus.gmf.internal.xpand.StreamsHolder;
-
-/**
- * Holder for named streams. 
- */
-public class XpandStreamsHolder implements StreamsHolder {
-	private HashMap<String, StringBuilder> myStreams;
-	private HashSet<String> myStreamsAccessed;
-
-	public String getStreamContents(String slotName) {
-		if (myStreams == null) {
-			throw new EvaluationException("Undefined stream " + slotName);
-		}
-		StringBuilder result = myStreams.get(slotName);
-		if (result == null) {
-			throw new EvaluationException("Undefined stream " + slotName);
-		}
-		setAccessed(slotName);
-		if (result.length() == 0) {
-			return null;
-		}
-		return result.toString();
-	}
-
-	public List<String> getSlotNames() {
-		if (myStreams == null) {
-			return Collections.emptyList();
-		}
-		//Filter streams that have no content
-		ArrayList<String> result = new ArrayList<String>(myStreams.size());
-		for (Map.Entry<String, StringBuilder> next : myStreams.entrySet()) {
-			if (next.getValue().length() == 0) {
-				continue;
-			}
-			result.add(next.getKey());
-		}
-		return Collections.unmodifiableList(result);
-	}
-
-	public void addNamedStream(String name, StringBuilder stream) {
-		if (myStreams == null) {
-			myStreams = new HashMap<String, StringBuilder>();
-		}
-		assert !myStreams.containsKey(name);
-		myStreams.put(name, stream);
-	}
-
-	private void setAccessed(String slotName) {
-		if (myStreamsAccessed == null) {
-			myStreamsAccessed = new HashSet<String>();
-		}
-		myStreamsAccessed.add(slotName);
-	}
-
-	public boolean isAccessed(String slotName) {
-		return myStreamsAccessed != null && myStreamsAccessed.contains(slotName);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/DeclaredParameter.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/DeclaredParameter.java
deleted file mode 100644
index fc8d8a01140..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/DeclaredParameter.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ocl;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.cst.VariableCS;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-
-/**
- * FIXME Might need to support init expressions for variables!
- * @author artem
- */
-public class DeclaredParameter {
-
-    private final VariableCS variableCS;
-	private final TypeHelper type;
-
-	public DeclaredParameter(VariableCS variableCS) {
-		this.variableCS = variableCS;
-		type = new TypeHelper(variableCS.getTypeCS());
-    }
-
-	public EClassifier getTypeForName(ExecutionContext ctx) {
-		return type.getTypeForName(ctx);
-	}
-
-	public String getTypeName() {
-		return type.getName();
-	}
-
-	public String getVarName() {
-		return variableCS.getName();
-	}
-
-	public static DeclaredParameter[] create(List<VariableCS> p) {
-		final DeclaredParameter[] params = new DeclaredParameter[p.size()];
-		int i = 0;
-		for (VariableCS v : p) {
-			params[i++] = new DeclaredParameter(v);
-		}
-		return params;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/EmbeddedOCLAnalyzer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/EmbeddedOCLAnalyzer.java
deleted file mode 100644
index 0530612ca83..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/EmbeddedOCLAnalyzer.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.ocl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnumLiteral;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.ocl.cst.CSTNode;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.ocl.cst.TypeCS;
-import org.eclipse.ocl.ecore.CallOperationAction;
-import org.eclipse.ocl.ecore.Constraint;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.ocl.ecore.OCLExpression;
-import org.eclipse.ocl.ecore.SendSignalAction;
-import org.eclipse.ocl.parser.AbstractOCLAnalyzer;
-import org.eclipse.ocl.parser.OCLLexer;
-import org.eclipse.ocl.parser.OCLParser;
-
-import lpg.runtime.Monitor;
-
-class EmbeddedOCLAnalyzer extends AbstractOCLAnalyzer<
-			EPackage, EClassifier, EOperation, EStructuralFeature,
-			EEnumLiteral, EParameter,
-			EObject, CallOperationAction, SendSignalAction, Constraint,
-			EClass, EObject> {
-
-	EmbeddedOCLAnalyzer(EcoreEnvironment environment) {
-		// EcoreEnvironment is also BasicEnvironment,
-		// and hence #getOCLEnvironment() would return it.
-		// The rest of AbstractOCLParser is only that we need to pass anything but null 
-		// to superclass's constructor
-		super(new OCLParser(new OCLLexer(environment)) {
-			
-			@Override
-			public CSTNode parser(Monitor monitor, int error_repair_count) {
-				throw new UnsupportedOperationException("This analyzer is expected to get CST ready for use");
-			}
-		});
-	}
-
-	public OCLExpression analyzeExpression(OCLExpressionCS exprCS) {
-		return (OCLExpression) super.oclExpressionCS(exprCS, getOCLEnvironment());
-	}
-
-	public EClassifier typeForName(TypeCS typeCS) {
-		return super.typeCS(typeCS, getOCLEnvironment());
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/EmbeddedQVTAnalyzer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/EmbeddedQVTAnalyzer.java
deleted file mode 100644
index b142bc9f536..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/EmbeddedQVTAnalyzer.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-
-package org.eclipse.papyrus.gmf.internal.xpand.ocl;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.m2m.internal.qvt.oml.ast.parser.QvtOperationalVisitorCS;
-import org.eclipse.m2m.internal.qvt.oml.compiler.QvtCompilerOptions;
-import org.eclipse.m2m.internal.qvt.oml.cst.parser.QVTOLexer;
-import org.eclipse.m2m.internal.qvt.oml.cst.parser.QVTOParser;
-import org.eclipse.ocl.cst.CSTNode;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.ocl.expressions.OCLExpression;
-
-import lpg.runtime.Monitor;
-
-/**
- * @author artem
- *
- */
-class EmbeddedQVTAnalyzer extends QvtOperationalVisitorCS {
-
-	EmbeddedQVTAnalyzer(EcoreEnvironment env) {
-		super(new QVTOParser(new QVTOLexer(env)) {
-			@Override
-			public String getTokenKindName(int kind) {
-				throw new UnsupportedOperationException();
-			}
-			
-			@Override
-			public CSTNode parser(Monitor monitor, int error_repair_count) {
-				throw new UnsupportedOperationException();
-			}
-		}, options());
-	}
-
-	public OCLExpression<EClassifier> analyzeExpression(OCLExpressionCS oclExpressionCS) {
-		return super.oclExpressionCS(oclExpressionCS, getOCLEnvironment());
-	}
-
-	private static QvtCompilerOptions options() {
-		QvtCompilerOptions options = new QvtCompilerOptions();
-		options.setGenerateCompletionData(false);
-		options.setShowAnnotations(false);
-		return options;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/ExpressionHelper.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/ExpressionHelper.java
deleted file mode 100644
index 2ed26a02179..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/ExpressionHelper.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.xpand.ocl;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.m2m.internal.qvt.oml.ast.env.QvtOperationalEvaluationEnv;
-import org.eclipse.m2m.internal.qvt.oml.evaluator.ModuleInstance;
-import org.eclipse.m2m.internal.qvt.oml.evaluator.QvtOperationalEvaluationVisitor;
-import org.eclipse.m2m.internal.qvt.oml.expressions.Module;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.ocl.expressions.OCLExpression;
-import org.eclipse.ocl.parser.OCLProblemHandler;
-import org.eclipse.papyrus.gmf.internal.xpand.StreamsHolder;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Scope;
-import org.eclipse.papyrus.gmf.internal.xpand.qvtlibraries.XpandGlobalVars;
-import org.eclipse.papyrus.gmf.internal.xpand.util.XpandStreamOperations;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtResource;
-
-public class ExpressionHelper {
-	
-	private final OCLExpressionCS expressionCS;
-	private OCLExpression<EClassifier> oclExpression;
-	private EcoreEnvironment oclEnvironment;
-	private Diagnostic oclExpressionDiagnostic;
-	private SyntaxElement parentElement;
-	
-	public ExpressionHelper(OCLExpressionCS exprCS, SyntaxElement parentElement) {
-		assert exprCS != null;
-		this.expressionCS = exprCS;
-		// TODO: determine start/end/line from CST element?
-		this.parentElement = parentElement;
-	}
-
-	public OCLExpressionCS getCST() {
-		return expressionCS;
-	}
-
-	public EClassifier analyze(ExecutionContext ctx, Set<AnalysationIssue> issues) {
-		EcoreEnvironment env = getOCLEnvironment(ctx);
-		OCLExpression<EClassifier> expression = getOCLExpression(env);
-		handleOCLAnalyzationErrors(issues);
-		return expression!= null ? expression.getType() : null;
-	}
-
-	/**
-	 * TODO: report error message with more concrete positions (currently whole
-	 * ImperativeOCL expression will be highlighted)
-	 */
-	private void handleOCLAnalyzationErrors(Set<AnalysationIssue> issues) {
-		if (getOclExpressionDiagnostic() != null) {
-			issues.add(new AnalysationIssue(AnalysationIssue.Type.INCOMPATIBLE_TYPES, getOclExpressionDiagnostic().getMessage(), this));
-		}
-	}
-
-	public Object evaluate(ExecutionContext ctx) {
-		EcoreEnvironment env = getOCLEnvironment(ctx);
-		OCLExpression<EClassifier> expression = getOCLExpression(env);		
-		if (getOclExpressionDiagnostic() != null) {
-			throw new EvaluationException(getOclExpressionDiagnostic().getMessage(), this);
-		}
-
-		// TODO: use CustomOclValidationVisitor extracted from
-		// QvtOperationalValidationVisitor once it is available.
-		
-//		// Validating AST only on evaluation time since this process can report
-//		// some errors in indirectly references .qvto files which are not
-//		// important while analyzing AST
-//		ValidationVisitor<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject> validator = new ValidationVisitor<EPackage, EClassifier, EOperation, EStructuralFeature, EEnumLiteral, EParameter, EObject, CallOperationAction, SendSignalAction, Constraint, EClass, EObject>(
-//				env) {
-//		};
-//		expression.accept(validator);
-//		Diagnostic validationResults = getOCLDiagnostic(env);
-//		if (validationResults != null) {
-//			throw new EvaluationException(validationResults.getMessage(), this);
-//		}
-
-		QvtOperationalEvaluationVisitor visitor = ctx.createEvaluationVisitor();
-		defineGlobalVariables(ctx, visitor.getOperationalEvaluationEnv());
-		initializeStreamsHolder(ctx.getScope(), ctx.getScope().getOutput().getNamedStreams(), visitor.getOperationalEvaluationEnv());
-		Object val = visitor.visitExpression(expression);
-		initializeStreamsHolder(ctx.getScope(), null, visitor.getOperationalEvaluationEnv());
-		clearGlobalVariables(ctx, visitor.getOperationalEvaluationEnv());
-		if (env.getOCLStandardLibrary().getOclInvalid() == val) {
-			throw new EvaluationException("Can't evaluate expression: returned value is OclInvalid", this);
-		}
-		return val;		
-	}
-
-	private EcoreEnvironment getOCLEnvironment(ExecutionContext ctx) {
-		if (oclEnvironment == null) {
-			oclEnvironment = ctx.getOCLEnvironment();
-		}
-		return oclEnvironment;
-	}
-	
-	private OCLExpression<EClassifier> getOCLExpression(EcoreEnvironment env) {
-		if (oclExpression == null) {
-			oclExpression = new EmbeddedQVTAnalyzer(env).analyzeExpression(expressionCS);
-			oclExpressionDiagnostic = getOCLDiagnostic(env);
-		}
-		return oclExpression;
-	}
-	
-	private Diagnostic getOCLDiagnostic(EcoreEnvironment env) {
-		if (env.getProblemHandler() instanceof OCLProblemHandler) {
-			OCLProblemHandler oclProblemHandler = (OCLProblemHandler) env.getProblemHandler();
-			Diagnostic diagnostic = oclProblemHandler.getDiagnostic();
-			if (diagnostic != null && diagnostic.getSeverity() == Diagnostic.ERROR) {
-				return diagnostic;
-			}
-			oclProblemHandler.clearDiagnostic();
-		}
-		return null;
-	}
-
-	/**
-	 * Should be called only after {@link #getOCLExpression(EcoreEnvironment)}
-	 * 
-	 * @return Diagnostic or null if expression was analyzed successfully
-	 */
-	private Diagnostic getOclExpressionDiagnostic() {
-		return oclExpressionDiagnostic;
-	}
-
-	private void clearGlobalVariables(ExecutionContext ctx, QvtOperationalEvaluationEnv evaluationEnv) {
-		Collection<String> globalVarNames = ctx.getScope().getGlobalVarNames();
-		if (globalVarNames.isEmpty()) {
-			return;
-		}
-		XpandGlobalVars globalVarsLibInstance = getGlobalVarsLibraryInstance(ctx.getScope(), evaluationEnv);
-		if (globalVarsLibInstance != null) {
-			globalVarsLibInstance.globalVariables = Collections.emptyMap();
-		}
-	}
-
-	private void defineGlobalVariables(ExecutionContext ctx, QvtOperationalEvaluationEnv evaluationEnv) {
-		Scope scope = ctx.getScope();
-		Collection<String> globalVarNames = scope.getGlobalVarNames();
-		if (globalVarNames.isEmpty()) {
-			return;
-		}
-		XpandGlobalVars globalVarsLibInstance = getGlobalVarsLibraryInstance(scope, evaluationEnv);
-		if (globalVarsLibInstance != null) {
-			Map<String, Object> globalVars = new HashMap<String, Object>();
-			for (String varName : globalVarNames) {
-				globalVars.put(varName, scope.getGlobalVariable(varName).getValue());
-			}
-			globalVarsLibInstance.globalVariables = globalVars;
-		}
-	}
-	
-	private XpandGlobalVars getGlobalVarsLibraryInstance(Scope scope, QvtOperationalEvaluationEnv evaluationEnv) {
-		QvtResource globalVarsOperationResource = scope.findExtension("xpt::GlobalVarOperations");
-		if (globalVarsOperationResource != null) {
-			for (Module module : globalVarsOperationResource.getModules()) {
-				ModuleInstance moduleInstance = evaluationEnv.getThisOfType(module);
-				if (moduleInstance != null) {
-					XpandGlobalVars globalVarsLibInstance = moduleInstance.getAdapter(XpandGlobalVars.class);
-					if (globalVarsLibInstance != null) {
-						return globalVarsLibInstance;
-					}
-				}
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Initializes QVT black-box java library with the given value of the streams holder.
-	 */
-	private void initializeStreamsHolder(Scope scope, StreamsHolder namedStreams, QvtOperationalEvaluationEnv evaluationEnv) {
-		QvtResource streamOperationResource = scope.findExtension("xpt::StreamOperations");
-		if (streamOperationResource != null) {
-			for (Module module : streamOperationResource.getModules()) {
-				ModuleInstance moduleInstance = evaluationEnv.getThisOfType(module);
-				if (moduleInstance != null) {
-					XpandStreamOperations libInstance = moduleInstance.getAdapter(XpandStreamOperations.class);
-					if (libInstance != null) {
-						libInstance.streamsHolder = namedStreams;
-					}
-				}
-			}
-		}
-	}
-
-	public int getStart() {
-		return expressionCS.getStartOffset();
-	}
-
-	public int getEnd() {
-		return expressionCS.getEndOffset();
-	}
-	
-	public String getFileName() {
-		return parentElement.getFileName();
-	}
-	
-	public int getLine() {
-		return parentElement.getLine();
-	}
-
-	/**
-	 * @return cached oclExpression. This method should be called only after
-	 *         analyze() or evaluate() method call.
-	 */
-	public OCLExpression<EClassifier> getOCLExpression() {
-		return oclExpression;
-	}
-	
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/TypeHelper.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/TypeHelper.java
deleted file mode 100644
index 095a9c32ad2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/ocl/TypeHelper.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal and others
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.xpand.ocl;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.cst.CollectionTypeCS;
-import org.eclipse.ocl.cst.PathNameCS;
-import org.eclipse.ocl.cst.PrimitiveTypeCS;
-import org.eclipse.ocl.cst.SimpleNameCS;
-import org.eclipse.ocl.cst.TypeCS;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-
-/**
- * FIXME Definition.toString gives native java string for TypeHelper 
- * @author artem
- */
-public class TypeHelper {
-
-	private final TypeCS typeCS;
-
-	public TypeHelper(TypeCS typeCS) {
-		this.typeCS = typeCS;
-	}
-
-	public EClassifier getTypeForName(ExecutionContext ctx) {
-		EClassifier c = new EmbeddedOCLAnalyzer(ctx.getOCLEnvironment()).typeForName(typeCS);
-		if (c == ctx.getOCLEnvironment().getOCLStandardLibrary().getOclVoid()) {
-			return null;
-		}
-		return c;
-	}
-
-	public String getName() {
-		if (typeCS instanceof PrimitiveTypeCS) {
-			return ((PrimitiveTypeCS) typeCS).getValue();
-		} else if (typeCS instanceof PathNameCS) {
-			return toString((PathNameCS) typeCS);
-		} else if (typeCS instanceof CollectionTypeCS) {
-			CollectionTypeCS collTypeCS = (CollectionTypeCS) typeCS;
-			return collTypeCS.getCollectionTypeIdentifier().getName() + '[' + new TypeHelper(collTypeCS.getTypeCS()).getName() + ']';
-		}
-		return typeCS.toString();
-	}
-
-	public static String toString(PathNameCS pathName) {
-        StringBuilder sb = new StringBuilder();
-        for (SimpleNameCS simpleName : pathName.getSimpleNames()) {
-        	if (sb.length() > 0) {
-        		sb.append("::");
-        	}
-        	sb.append(simpleName.getValue());
-        }
-        return sb.toString();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractOCLParser.gi b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractOCLParser.gi
deleted file mode 100644
index fd0e68d85be..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractOCLParser.gi
+++ /dev/null
@@ -1,352 +0,0 @@
--- Copy of OCL CST factory methods from AbstractOCLParser
--- Only required (reused) methods were copied, hence private visibility to make sure we use all them
--- XXX ask C.Damus to split factory out of AbstractOCLParser.java 
-%Headers
-/.
-	private OperationCallExpCS createArrowOperationCallExpCS(OCLExpressionCS oclExpressionCS, SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS, EList<OCLExpressionCS> arguments) {
-		return createOperationCallExpCS(oclExpressionCS, DotOrArrowEnum.ARROW_LITERAL, null, simpleNameCS, isMarkedPreCS, arguments);
-	}
-	
-	private OperationCallExpCS createOperationCallExpCS(OCLExpressionCS oclExpressionCS, DotOrArrowEnum dotOrArrow, PathNameCS pathNameCS, SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS, EList<OCLExpressionCS> arguments) {
-		OperationCallExpCS result = CSTFactory.eINSTANCE.createOperationCallExpCS();
-		result.setSource(oclExpressionCS);
-		result.setAccessor(oclExpressionCS != null ? dotOrArrow : DotOrArrowEnum.NONE_LITERAL);
-		result.setPathNameCS((pathNameCS != null) && (pathNameCS.getSimpleNames().size() > 0) ? pathNameCS : null);
-		result.setSimpleNameCS(simpleNameCS);
-		result.getArguments().addAll(arguments);
-
-		if (isAtPre(isMarkedPreCS)) {
-			result.setIsMarkedPreCS(isMarkedPreCS);
-		}
-
-		return result;
-	}
-	
-	private OperationCallExpCS createOperationCallExpCS(OCLExpressionCS oclExpressionCS, SimpleNameCS simpleNameCS, EList<OCLExpressionCS> arguments) {
-		return createOperationCallExpCS(oclExpressionCS, null, null, simpleNameCS, null, arguments);
-	}
-
-	private VariableExpCS createVariableExpCS(
-			SimpleNameCS simpleNameCS,
-			EList<OCLExpressionCS> arguments,
-			IsMarkedPreCS isMarkedPreCS) {
-		VariableExpCS result = CSTFactory.eINSTANCE.createVariableExpCS();
-		result.setSimpleNameCS(simpleNameCS);
-		result.getArguments().addAll(arguments);
-		result.setIsMarkedPreCS(isMarkedPreCS);
-		return result;
-	}
-
-	private SimpleNameCS createSimpleNameCS(
-			SimpleTypeEnum type,
-			String value) {
-		SimpleNameCS result = CSTFactory.eINSTANCE.createSimpleNameCS();
-		result.setType(type);
-		result.setValue(unquote(value));
-		return result;
-	}
-
-	private PrimitiveTypeCS createPrimitiveTypeCS(
-			SimpleTypeEnum type,
-			String value) {
-		PrimitiveTypeCS result = CSTFactory.eINSTANCE.createPrimitiveTypeCS();
-		result.setType(type);
-		result.setValue(value);
-		return result;
-	}
-	
-	private PathNameCS createPathNameCS(SimpleNameCS name) {
-		PathNameCS result = CSTFactory.eINSTANCE.createPathNameCS();
-		result.getSimpleNames().add(name);
-		return result;
-	}
-	
-	private PathNameCS extendPathNameCS(PathNameCS path, SimpleNameCS name) {
-		path.getSimpleNames().add(name);
-		return path;
-	}
-	
-	private SimpleNameCS removeLastSimpleNameCS(PathNameCS path) {
-		EList<SimpleNameCS> simpleNames = path.getSimpleNames();
-		SimpleNameCS name = simpleNames.remove(simpleNames.size()-1);
-		setOffsets(path, path, simpleNames.size() > 0 ? simpleNames.get(simpleNames.size()-1) : path);
-		return name;
-	}
-	
-
-	private CollectionLiteralExpCS createCollectionLiteralExpCS(CollectionTypeCS typeCS, EList<CollectionLiteralPartCS> collectionLiteralParts) {
-		CollectionLiteralExpCS result = CSTFactory.eINSTANCE.createCollectionLiteralExpCS();
-		result.setCollectionType(typeCS.getCollectionTypeIdentifier());
-		result.getCollectionLiteralParts().addAll(collectionLiteralParts);
-		return result;
-	}
-
-	private CollectionLiteralPartCS createCollectionLiteralPartCS(OCLExpressionCS oclExpressionCS) {
-		CollectionLiteralPartCS result = CSTFactory.eINSTANCE.createCollectionLiteralPartCS();
-		result.setExpressionCS(oclExpressionCS);
-		return result;
-	}
-
-	private CollectionRangeCS createCollectionRangeCS(
-			OCLExpressionCS oclExpressionCS,
-			OCLExpressionCS lastOCLExpressionCS) {
-		CollectionRangeCS result = CSTFactory.eINSTANCE.createCollectionRangeCS();
-		result.setExpressionCS(oclExpressionCS);
-		result.setLastExpressionCS(lastOCLExpressionCS);
-		return result;
-	}
-
-	private TupleLiteralExpCS createTupleLiteralExpCS(EList<VariableCS> variables) {
-		TupleLiteralExpCS result = CSTFactory.eINSTANCE.createTupleLiteralExpCS();
-		result.getVariables().addAll(variables);
-		return result;
-	}
-
-	private IntegerLiteralExpCS createIntegerLiteralExpCS(String string) {
-		IntegerLiteralExpCS result = CSTFactory.eINSTANCE.createIntegerLiteralExpCS();
-		result.setSymbol(string);
-		result.setIntegerSymbol(Integer.valueOf(string));
-		return result;
-	}
-
-	@SuppressWarnings("nls")
-	private UnlimitedNaturalLiteralExpCS createUnlimitedNaturalLiteralExpCS(String string) {
-		UnlimitedNaturalLiteralExpCS result = CSTFactory.eINSTANCE.createUnlimitedNaturalLiteralExpCS();
-		result.setSymbol(string);
-		if ("*".equals(string)) {
-			result.setIntegerSymbol(-1);
-		} else {
-			result.setIntegerSymbol(Integer.valueOf(string));
-		}
-		return result;
-	}
-
-	private RealLiteralExpCS createRealLiteralExpCS(String string) {
-		RealLiteralExpCS result = CSTFactory.eINSTANCE.createRealLiteralExpCS();
-		result.setSymbol(string);
-		result.setRealSymbol(Double.valueOf(string));
-		return result;
-	}
-
-	private StringLiteralExpCS createStringLiteralExpCS(String string) {
-		StringLiteralExpCS result = CSTFactory.eINSTANCE.createStringLiteralExpCS();
-		result.setSymbol(string);
-		result.setStringSymbol(string);
-		return result;
-	}
-
-	private BooleanLiteralExpCS createBooleanLiteralExpCS(String string) {
-		BooleanLiteralExpCS result = CSTFactory.eINSTANCE.createBooleanLiteralExpCS();
-		result.setSymbol(string);
-		result.setBooleanSymbol(Boolean.valueOf(string));
-		return result;
-	}
-
-	private NullLiteralExpCS createNullLiteralExpCS(String string) {
-		NullLiteralExpCS result = CSTFactory.eINSTANCE.createNullLiteralExpCS();
-		result.setValue(string);
-		result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
-		return result;
-	}
-
-	private InvalidLiteralExpCS createInvalidLiteralExpCS(String string) {
-		InvalidLiteralExpCS result = CSTFactory.eINSTANCE.createInvalidLiteralExpCS();
-		result.setValue(string);
-		result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
-		return result;
-	}
-
-	protected IteratorExpCS createIteratorExpCS(OCLExpressionCS source, SimpleNameCS simpleNameCS, VariableCS variable1, VariableCS variable2, OCLExpressionCS oclExpressionCS) {
-		IteratorExpCS result = CSTFactory.eINSTANCE.createIteratorExpCS();
-		result.setSource(source);
-		result.setAccessor(DotOrArrowEnum.ARROW_LITERAL);
-		result.setSimpleNameCS(simpleNameCS);
-		result.setVariable1(variable1);
-		result.setVariable2(variable2);
-		result.setBody(oclExpressionCS);
-		return result;
-	}
-
-	protected IterateExpCS createIterateExpCS(OCLExpressionCS source, SimpleNameCS simpleNameCS, VariableCS variable1, VariableCS variable2, OCLExpressionCS oclExpressionCS) {
-		IterateExpCS result = CSTFactory.eINSTANCE.createIterateExpCS();
-		result.setSource(source);
-		result.setAccessor(DotOrArrowEnum.ARROW_LITERAL);
-		result.setSimpleNameCS(simpleNameCS);
-		result.setVariable1(variable1);
-		result.setVariable2(variable2);
-		result.setBody(oclExpressionCS);
-		return result;
-	}
-
-	private VariableCS createVariableCS(
-			String varName,
-			TypeCS typeCS,
-			OCLExpressionCS oclExpressionCS) {
-		VariableCS result = CSTFactory.eINSTANCE.createVariableCS();
-		result.setName(unquote(varName));
-		result.setTypeCS(typeCS);
-		result.setInitExpression(oclExpressionCS);
-		return result;
-	}
-	
-	private VariableCS createVariableCS(SimpleNameCS varName, TypeCS typeCS, OCLExpressionCS oclExpressionCS) {
-		VariableCS result = CSTFactory.eINSTANCE.createVariableCS();
-		result.setName(unquote(varName.getValue()));
-		result.setTypeCS(typeCS);
-		result.setInitExpression(oclExpressionCS);
-		return result;
-	}
-
-	protected CollectionTypeCS createCollectionTypeCS(CollectionTypeIdentifierEnum collectionType, String value) {
-		CollectionTypeCS result = CSTFactory.eINSTANCE.createCollectionTypeCS();
-		result.setType(SimpleTypeEnum.IDENTIFIER_LITERAL);
-		result.setValue(unquote(value));
-		result.setCollectionTypeIdentifier(collectionType);
-		return result;
-	}
-
-	private TupleTypeCS createTupleTypeCS(EList<VariableCS> variables) {
-		TupleTypeCS result = CSTFactory.eINSTANCE.createTupleTypeCS();
-		result.getVariables().addAll(variables);
-		return result;
-	}
-
-	private FeatureCallExpCS createFeatureCallExpCS(OCLExpressionCS source, PathNameCS pathNameCS, SimpleNameCS simpleNameCS, EList<OCLExpressionCS> arguments, IsMarkedPreCS isMarkedPreCS) {
-		FeatureCallExpCS result = CSTFactory.eINSTANCE.createFeatureCallExpCS();
-		result.setSource(source);
-		result.setAccessor(source != null ? DotOrArrowEnum.DOT_LITERAL : DotOrArrowEnum.NONE_LITERAL);
-		result.setPathNameCS((pathNameCS != null) && (pathNameCS.getSimpleNames().size() > 0) ? pathNameCS : null);
-		result.setSimpleNameCS(simpleNameCS);
-		result.getArguments().addAll(arguments);
-
-		if (isAtPre(isMarkedPreCS)) {
-			result.setIsMarkedPreCS(isMarkedPreCS);
-		}
-
-		return result;
-	}
-
-	private LetExpCS createLetExpCS(
-			EList<VariableCS> variables,
-			OCLExpressionCS oclExpressionCS) {
-		LetExpCS result = CSTFactory.eINSTANCE.createLetExpCS();
-		result.getVariables().addAll(variables);
-		result.setInExpression(oclExpressionCS);
-		return result;
-	}
-
-	private IfExpCS createIfExpCS(
-			OCLExpressionCS condition,
-			OCLExpressionCS thenExpression,
-			OCLExpressionCS elseExpression) {
-		IfExpCS result = CSTFactory.eINSTANCE.createIfExpCS();
-		result.setCondition(condition);
-		result.setThenExpression(thenExpression);
-		result.setElseExpression(elseExpression);
-		return result;
-	}
-
-	private boolean isNonStdSQSupported() {
-		return false;
-	}
-	
-	protected SimpleNameCS createConceptualOperationNameCS(IToken token) {
-		SimpleNameCS result = CSTFactory.eINSTANCE.createSimpleNameCS();
-		result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
-		String conceptualName = token.toString();
-		result.setValue(conceptualName);
-		ProblemHandler.Severity sev = ProblemHandler.Severity.OK;
-/*
-[AS]: TODO log error here
-
-		BasicEnvironment benv = getEnvironment();
-		if (benv != null) {
-			sev = benv.getValue(ProblemOption.CONCEPTUAL_OPERATION_NAME);
-		}
-		
-		if ((sev != null) && (sev != ProblemHandler.Severity.OK)) {
-			benv.problem(sev, ProblemHandler.Phase.PARSER, OCLMessages
-				.bind(OCLMessages.Conceptual_Operation_Name_, conceptualName),
-				"unquote", //$NON-NLS-1$
-				token);
-		}
-*/		
-		return result;
-	}
-	
-	protected SimpleNameCS createSimpleNameCS(SimpleTypeEnum type, IToken token) {
-		SimpleNameCS result = CSTFactory.eINSTANCE.createSimpleNameCS();
-		result.setType(type);
-		result.setValue(unDoubleQuote(token));
-		return result;
-	}
-	
-	protected StringLiteralExpCS createStringLiteralExpCS(IToken token) {
-		StringLiteralExpCS result = CSTFactory.eINSTANCE
-			.createStringLiteralExpCS();
-		String unquoted = unSingleQuote(token);
-		result.setSymbol(unquoted);
-		result.setStringSymbol(unquoted);
-		result.setUnescapedStringSymbol(unquoted);
-		return result;
-	}
-	
-	protected StringLiteralExpCS extendStringLiteralExpCS(StringLiteralExpCS string, IToken token) {       
-        String oldString = string.getUnescapedStringSymbol();
-        String newString = unSingleQuote(token);
-        int oldFinish = string.getEndOffset();
-        int newStart = token.getStartOffset();
-    	String joinedString;
-        if (newStart - oldFinish > 1) {
-        	joinedString = oldString + newString;
-            }
-        else {
-        	joinedString = oldString + '\'' + newString;
-/*
-[AS]: TODO log error here        	
-    		ProblemHandler.Severity sev = getEnvironment().getValue(
-    			ProblemOption.STRING_SINGLE_QUOTE_ESCAPE);
-    		if ((sev != null) && (sev != ProblemHandler.Severity.OK)) {
-    			getEnvironment().problem(
-    				sev,
-    				ProblemHandler.Phase.PARSER,
-    				OCLMessages.bind(OCLMessages.NonStd_SQuote_Escape_,
-    					joinedString), "STRING_LITERAL", //$NON-NLS-1$
-    					joinedString);
-    		}
-*/    		
-        }
-		string.setSymbol(joinedString);
-    	string.setStringSymbol(joinedString);
-    	string.setUnescapedStringSymbol(joinedString);
-		return string;
-	}
-	
-	protected Set<String> iteratorNames = null;
-
-	@SuppressWarnings("nls")
-	protected Set<String> createIteratorNames() {
-		Set<String> iteratorNames = new HashSet<String>();
-		iteratorNames.add("any");
-		iteratorNames.add("collect");
-		iteratorNames.add("collectNested");
-		iteratorNames.add("exists");
-		iteratorNames.add("forAll");
-		iteratorNames.add("isUnique");
-		iteratorNames.add("one");
-		iteratorNames.add("reject");
-		iteratorNames.add("select");
-		iteratorNames.add("sortedBy");
-
-		iteratorNames.add("closure");
-		return iteratorNames;
-	}
-	
-	protected boolean isIterator(String name) {
-		if (iteratorNames == null) {
-			iteratorNames = createIteratorNames();
-		}
-		return iteratorNames.contains(name);
-	}
-./
-%End
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractParser.gi b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractParser.gi
deleted file mode 100644
index 5922a020694..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractParser.gi
+++ /dev/null
@@ -1,294 +0,0 @@
--- Copy of reelvant methods from org.eclipse.ocl.lpg.AbstractParser
-%Headers
-/.
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code>
-	 * to the start and end offsets of the given <code>IToken</code>
-	 *
-	 * @param cstNode <code>CSTNode</code> to set offsets
-	 * @param startEnd <code>IToken</code> to retrieve offsets from
-	 */
-	private void setOffsets(CSTNode cstNode, IToken startEnd) {
-		cstNode.setStartOffset(startEnd.getStartOffset());
-		cstNode.setEndOffset(startEnd.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code>
-	 * to the start and end offsets of the 2nd given <code>CSTNode</code>
-	 *
-	 * @param cstNode <code>CSTNode</code> to set offsets
-	 * @param startEnd <code>CSTNode</code> to retrieve offsets from
-	 */
-	private void setOffsets(CSTNode cstNode, CSTNode startEnd) {
-		cstNode.setStartOffset(startEnd.getStartOffset());
-		cstNode.setEndOffset(startEnd.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code>
-	 * to the start offset of the 2nd given <code>CSTNode</code> and the
-	 * end offset of the 3rd given <code>CSTNode</code>
-	 *
-	 * @param cstNode <code>CSTNode</code> to set offsets
-	 * @param start <code>CSTNode</code> to retrieve start offset from
-	 * @param end <code>CSTNode</code> to retrieve end offset from
-	 */
-	private void setOffsets(CSTNode cstNode, CSTNode start, CSTNode end) {
-		cstNode.setStartOffset(start.getStartOffset());
-		cstNode.setEndOffset(end.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code>
-	 * to the start offset of the 2nd given <code>CSTNode</code> and the
-	 * end offset of the given <code>IToken</code>
-	 *
-	 * @param cstNode <code>CSTNode</code> to set offsets
-	 * @param start <code>CSTNode</code> to retrieve start offset from
-	 * @param end <code>IToken</code> to retrieve end offset from
-	 */
-	private void setOffsets(CSTNode cstNode, CSTNode start, IToken end) {
-		cstNode.setStartOffset(start.getStartOffset());
-		cstNode.setEndOffset(end.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code>
-	 * to the start offset of the given <code>IToken</code> and the
-	 * end offset of the 2nd given <code>CSTNode</code>
-	 *
-	 * @param cstNode <code>CSTNode</code> to set offsets
-	 * @param start <code>IToken</code> to retrieve start offset from
-	 * @param end <code>CSTNode</code> to retrieve end offset from
-	 */
-	private void setOffsets(CSTNode cstNode, IToken start, CSTNode end) {
-		cstNode.setStartOffset(start.getStartOffset());
-		cstNode.setEndOffset(end.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code>
-	 * to the start offset of the 1std given <code>IToken</code> and the
-	 * end offset of the 2nd given <code>IToken</code>
-	 *
-	 * @param cstNode <code>CSTNode</code> to set offsets
-	 * @param start <code>IToken</code> to retrieve start offset from
-	 * @param end <code>IToken</code> to retrieve end offset from
-	 */
-	private void setOffsets(CSTNode cstNode, IToken start, IToken end) {
-		cstNode.setStartOffset(start.getStartOffset());
-		cstNode.setEndOffset(end.getEndOffset());
-	}
-
-	/**
-	 * Removes the "s surrounding a quoted string, if any.
-	 * 
-	 * @param quoted a possibly quoted string
-	 * @return <code>quoted</code> without the surrounding quotes, or just
-	 *	 <code>quoted</code> verbatim if there were none
-	 */
-	private String unquote(String quoted) {
-		String result = quoted;
-	
-		if ((result != null) && (result.length() > 1)) {
-			int max = result.length() - 1;
-	
-			if ((result.charAt(0) == '"') && (quoted.charAt(max) == '"')) {
-				result = result.substring(1, max);
-			}
-			
-			// this is a regexp, so the backslash needs to be
-			//   re-escaped, thus "\\" is rendered in a Java
-			//   string literal as "\\\\"
-			result = result.replaceAll("\\\\\"", "\"");  //$NON-NLS-2$//$NON-NLS-1$
-			/*
-			 * [artem] removed extra error handling fon non-spec escape processing 
-			 */
-		}
-	
-		return result;
-	}
-	
-	private boolean isAtPre(IsMarkedPreCS atPreCS) {
-		return atPreCS != null;
-	}
-	
-	protected String unDoubleQuote(IToken token) {
-		if (token == null) {
-			return null;
-		}
-		String quoted = token.toString();
-		if (quoted == null) {
-			return null;
-		}
-		int quotedLength = quoted.length();
-		if ((quotedLength < 2) || (quoted.charAt(0) != '"') || (quoted.charAt(quotedLength-1) != '"')) {
-			return quoted;
-		}
-		ProblemHandler.Severity sev = ProblemHandler.Severity.OK;
-/*
-		BasicEnvironment benv = getEnvironment();
-
-		if (benv != null) {
-			sev = benv
-				.getValue(ProblemOption.ELEMENT_NAME_QUOTE_ESCAPE);
-		}
-		if ((sev != null) && (sev != ProblemHandler.Severity.OK)) {
-			benv.problem(sev, ProblemHandler.Phase.PARSER, OCLMessages
-				.bind(OCLMessages.NonStd_DQuote_Escape_, quoted),
-				"unquote", //$NON-NLS-1$
-				token);
-		}
-*/		
-		return decodeString(token, quoted.substring(1, quotedLength-1));
-	}
-	
-	protected String unSingleQuote(IToken token) {
-		if (token == null) {
-			return null;
-		}
-		String quoted = token.toString();
-		if (quoted == null) {
-			return null;
-		}
-		int quotedLength = quoted.length();
-		if ((quotedLength < 2) || (quoted.charAt(0) != '\'') || (quoted.charAt(quotedLength-1) != '\'')) {
-			return quoted;
-		}
-		String unquoted = quoted.substring(1, quotedLength-1);
-		Boolean backslashProcessingEnabled = true;
-/*
-		BasicEnvironment benv = getEnvironment();
-		if (benv != null) {
-			backslashProcessingEnabled = benv
-				.getValue(ParsingOptions.USE_BACKSLASH_ESCAPE_PROCESSING);
-		}
-*/		
-		if ((backslashProcessingEnabled == null) || !backslashProcessingEnabled) {
-			return unquoted;
-		}
-		return decodeString(token, unquoted);
-	}
-	
-	protected String decodeString(IToken token, String string) {
-		if (string.indexOf('\\') < 0) {
-			return string;			
-		}
-		StringBuffer s = new StringBuffer();
-		StringCharacterIterator i = new StringCharacterIterator(string);
-		for (char c = i.first(); c != StringCharacterIterator.DONE; c = i.next()) {
-			if (c != '\\') {
-				s.append(c);
-			}
-			else {
-				int iStart = i.getIndex();
-				char ch = decodeEscapeSequence(i);
-				if (ch != StringCharacterIterator.DONE) {
-					s.append(ch);
-				}
-				else {
-/*
-[AS]: TODO: report error here
-
-					BasicEnvironment benv = getEnvironment();
-					benv.problem(ProblemHandler.Severity.ERROR, ProblemHandler.Phase.PARSER, OCLMessages
-						.bind(OCLMessages.InvalidEscapeSequence_ERROR, string.substring(iStart, i.getIndex())),
-						"unquote", //$NON-NLS-1$
-						token);
-*/						
-					return string;
-				}
-			}
-		}
-		return s.toString();
-	}
-	
-	protected char decodeEscapeSequence(StringCharacterIterator i) {
-		int savedIndex = i.getIndex();
-		char c = i.next();
-		switch (c) {
-			case 'b' : return '\b';
-			case 'f' : return '\f';
-			case 't' : return '\t';
-			case 'n' : return '\n';
-			case 'r' : return '\r';
-			case '\\' : return '\\';
-			case '\'' : return '\'';
-			case '"' : return '\"';
-			case '0' :
-			case '1' :
-			case '2' :
-			case '3' : {
-				int c1 = c - '0';
-				int c2 = decodeOctalCharacter(i);
-				if (c2 < 0) {
-					return (char)(c1);					
-				}
-				int c3 = decodeOctalCharacter(i);
-				if (c3 < 0) {
-					return (char)((c1 << 3) + c2);
-				}
-				return (char)((c1 << 6) + (c2 << 3) + c3);
-			}
-			case '4' :
-			case '5' :
-			case '6' :
-			case '7' : {
-				int c1 = c - '0';
-				int c2 = decodeOctalCharacter(i);
-				if (c2 < 0) {
-					i.previous();
-					return (char)(c1);					
-				}
-				return (char)((c1 << 3) + c2);
-			}
-			case 'x' : {
-				int c1 = decodeHexCharacter(i.next());
-				int c2 = decodeHexCharacter(i.next());
-				if ((c1 < 0) || (c2 < 0)) {
-					break;
-				}
-				return (char)((c1 << 4) + c2);
-			}
-			case 'u' : {
-				int c1 = decodeHexCharacter(i.next());
-				int c2 = decodeHexCharacter(i.next());
-				int c3 = decodeHexCharacter(i.next());
-				int c4 = decodeHexCharacter(i.next());
-				if ((c1 < 0) || (c2 < 0) || (c3 < 0) || (c4 < 0)) {
-					break;
-				}
-				return (char)((c1 << 12) + (c2 << 8) + (c3 << 4) + c4);
-			}
-		}
-		i.setIndex(savedIndex);		// Give derived augmentations the same starting point
-		return StringCharacterIterator.DONE;
-	}
-	
-	protected int decodeOctalCharacter(StringCharacterIterator i) {
-		char c = i.next();
-		if (c == StringCharacterIterator.DONE) {
-			return -1;					
-		}
-		if (('0' <= c) && (c <= '7')) {
-			return c - '0';
-		}
-		i.previous();
-		return -1;
-	}
-
-	protected int decodeHexCharacter(char c) {
-		if (('0' <= c) && (c <= '9')) {
-			return c - '0';
-		}
-		if (('A' <= c) && (c <= 'F')) {
-			return 10 + c - 'A';
-		}
-		if (('a' <= c) && (c <= 'f')) {
-			return 10 + c - 'a';
-		}
-		return -1;
-	}
-./
-%End
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractQVTParser.gi b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractQVTParser.gi
deleted file mode 100644
index 1c2fc95ed9a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/AbstractQVTParser.gi
+++ /dev/null
@@ -1,183 +0,0 @@
--- Copy of QVT CST factory methods from AbstractQVTParser
--- Only required (reused) methods were copied, hence private visibility to make sure we use all them
--- XXX ask QVT guys to split factory out of AbstractOCLParser.java 
-%Globals
-	/.
-	import org.eclipse.m2m.internal.qvt.oml.cst.CompleteSignatureCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.LibraryImportCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.ListTypeCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.DictLiteralExpCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.DictionaryTypeCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.DictLiteralPartCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.StatementCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.ListLiteralExpCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.ImperativeOperationCallExpCS;
-	./
-%End
-
-%Headers
-/.
-    private ImperativeIterateExpCS createImperativeIterateExpCS(
-            SimpleNameCS simpleNameCS,
-            EList<VariableCS> iterators,
-            VariableCS target,
-            OCLExpressionCS body,
-            OCLExpressionCS condition) {
-        ImperativeIterateExpCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createImperativeIterateExpCS();
-        result.setSimpleNameCS(simpleNameCS);
-        if (iterators.size() > 0) {
-            result.setVariable1(iterators.get(0));
-            if (iterators.size() > 1) {
-                result.setVariable2(iterators.get(1));
-            }
-        }
-        if (target != null) {
-            result.setTarget(target);
-        }
-        result.setBody(body);
-        result.setCondition(condition);
-        return result;
-    }
-    
-	protected final CSTNode createCompleteSignatureCS(SimpleSignatureCS simpleSignatureCS, EList<ParameterDeclarationCS> resultList) {
-	    CompleteSignatureCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createCompleteSignatureCS();
-	    result.setSimpleSignature(simpleSignatureCS);
-	    result.getResultParams().addAll(resultList);
-	    return result;
-	}
-	
-	protected final SimpleSignatureCS createSimpleSignatureCS(EList<ParameterDeclarationCS> paramsCS) {
-	    SimpleSignatureCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createSimpleSignatureCS();
-	    result.getParams().addAll(paramsCS);
-	    return result;
-	}
-	
-	protected final ParameterDeclarationCS createParameterDeclarationCS(DirectionKindCS sym, IToken tokenText, TypeSpecCS typeSpecCS) {
-		ParameterDeclarationCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createParameterDeclarationCS();
-		SimpleNameCS nameCS = null;
-		if (tokenText != null) {
-			nameCS = createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL, tokenText.toString());
-			setOffsets(nameCS, tokenText);
-		} else {
-			//nameCS = createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL, ""); //$NON-NLS-1$
-		}
-		result.setSimpleNameCS(nameCS);
-		result.setTypeSpecCS(typeSpecCS);
-		if (sym != null) {
-			result.setDirectionKind(sym.getDirectionKind());
-		}
-		return result;
-	}
-	
-	protected final CSTNode createLibraryImportCS(PathNameCS sym) {
-		LibraryImportCS imp = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createLibraryImportCS();
-		imp.setPathNameCS(sym);
-		return imp;
-	}
-	
-	protected final CSTNode createDirectionKindCS(DirectionKindEnum kind) {
-		DirectionKindCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createDirectionKindCS();
-		result.setDirectionKind(kind);
-		return result;
-	}
-	
-	protected final TypeSpecCS createTypeSpecCS(TypeCS typeCS, IToken extentLocation) {
-		TypeSpecCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createTypeSpecCS();
-		result.setTypeCS(typeCS);
-		setOffsets(result, typeCS);
-		if (extentLocation != null) {
-			SimpleNameCS nameCS = createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL, extentLocation.toString());
-			setOffsets(nameCS, extentLocation);
-			result.setSimpleNameCS(nameCS);
-			result.setEndOffset(extentLocation.getEndOffset());
-		}
-		return result;
-	}
-	
-	private ListTypeCS createListTypeCS(TypeCS typeCS) {
-		ListTypeCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createListTypeCS();
-		result.setTypeCS(typeCS);
-		return result;
-	}
-	
-	private DictLiteralExpCS createDictLiteralExpCS(EList<DictLiteralPartCS> parts) {		
-		DictLiteralExpCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createDictLiteralExpCS();
-		result.getParts().addAll(parts);
-		return result;
-	}
-	
-	private DictionaryTypeCS createDictTypeCS(TypeCS keyTypeCS, TypeCS valueTypeCS) {
-		DictionaryTypeCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createDictionaryTypeCS();
-		result.setKey(keyTypeCS);
-		result.setValue(valueTypeCS);
-		return result;
-	}	
-	
-	private DictLiteralPartCS createDictLiteralPartCS(LiteralExpCS keyLiteralCS, OCLExpressionCS valueExpCS) {
-		DictLiteralPartCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createDictLiteralPartCS();
-		result.setKey(keyLiteralCS);
-		result.setValue(valueExpCS);
-		return result;
-	}
-	
-	private final StatementCS createBreakCS() {
-		StatementCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createBreakExpCS();
-		return result;
-	}
-	
-	private final StatementCS createContinueCS() {
-		StatementCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createContinueExpCS();
-		return result;
-	}
-	
-	private ListLiteralExpCS createListLiteralExpCS(EList<CollectionLiteralPartCS> collectionLiteralParts) {
-		ListLiteralExpCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createListLiteralExpCS();
-		result.getCollectionLiteralParts().addAll(collectionLiteralParts);
-		return result;
-	}
-
-	private boolean isTokenOfType(IToken token, int kind) {
-		return (token != null) && (token.getKind() == kind);
-	}
-	
-	private ImperativeOperationCallExpCS createFeatureFQNOperationCallExpCS(SimpleNameCS moduleName, SimpleNameCS operationName, EList<OCLExpressionCS> arguments) {
-		ImperativeOperationCallExpCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createImperativeOperationCallExpCS();
-		return setupImperativeOperationCallExpCS(moduleName, operationName,	arguments, result);
-	}
-	
-	private OperationCallExpCS createDotOperationCallExpCS(OCLExpressionCS oclExpressionCS, PathNameCS pathNameCs, SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS,	EList<OCLExpressionCS> arguments) {
-		if (pathNameCs != null && pathNameCs.getSimpleNames().size() == 1) {
-			ImperativeOperationCallExpCS result = createFeatureFQNOperationCallExpCS(pathNameCs.getSimpleNames().get(0), simpleNameCS, arguments);
-			if (oclExpressionCS != null) {
-				result.setSource(oclExpressionCS);
-				result.setIsAtomic(true);
-			}
-			result.setAccessor(oclExpressionCS != null ? DotOrArrowEnum.DOT_LITERAL : DotOrArrowEnum.NONE_LITERAL);
-			if (isAtPre(isMarkedPreCS)) {
-				result.setIsMarkedPreCS(isMarkedPreCS);
-			}
-			return result;
-		}
-		OperationCallExpCS result = createOperationCallExpCS(oclExpressionCS, DotOrArrowEnum.DOT_LITERAL, pathNameCs, simpleNameCS, isMarkedPreCS, arguments);
-		if (oclExpressionCS != null) {
-			result.setIsAtomic(true);
-		}
-		return result;
-	}
-	
-	private ImperativeOperationCallExpCS setupImperativeOperationCallExpCS(SimpleNameCS moduleName, SimpleNameCS operationName, EList<OCLExpressionCS> arguments, ImperativeOperationCallExpCS result) {
-		result.setModule(moduleName);
-		result.setSimpleNameCS(operationName);
-		result.getArguments().addAll(arguments);
-		return result;
-	}
-	
-	protected VariableCS createVariableCS(IToken token, TypeCS typeCS, OCLExpressionCS oclExpressionCS) {
-		VariableCS result = CSTFactory.eINSTANCE.createVariableCS();
-		result.setName(unSingleQuote(token));
-		result.setTypeCS(typeCS);
-		result.setInitExpression(oclExpressionCS);
-		return result;
-	}
-./
-%End
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/Keyw.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/Keyw.java
deleted file mode 100644
index fb1599ac35e..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/Keyw.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/************************************************************************************************************************************************************
- * Copyright (c) 2006, 2020 Eclipse.org, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
-***********************************************************************************************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-public class Keyw {
-	private final static String SSS = "IMPORT EXTENSION	AROUND ENDAROUND DEFINE ENDDEFINE ERROR EXPAND FOR SEPARATOR AS ITERATOR FOREACH ENDFOREACH	FILE ENDFILE IF ELSEIF ELSE ENDIF LET ENDLET PROTECT CSTART CEND ID DISABLE ENDPROTECT";
-
-	public static void main(String[] args) {
-		for (String s : SSS.split("\\s")) {
-			System.out.println("\t\t| " + toSeparateChars(s));
-			System.out.println("\t\t/.$BeginAction");
-			System.out.println("\t\t\t$setResult($_" + s + ");");
-			System.out.println("\t\t$EndAction./");
-			System.out.println();
-		}
-	}
-
-	private static String toSeparateChars(String s) {
-		StringBuilder sb = new StringBuilder(s.length() * 2 + 1);
-		for (int i = 0; i < s.length(); i++) {
-			sb.append(s.charAt(i));
-			sb.append(' ');
-		}
-		sb.setLength(sb.length()-1);
-		return sb.toString();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandFactory.java
deleted file mode 100644
index dbf30bca176..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandFactory.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-import java.util.List;
-
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.ocl.cst.PathNameCS;
-import org.eclipse.ocl.cst.StringLiteralExpCS;
-import org.eclipse.ocl.cst.TypeCS;
-import org.eclipse.ocl.cst.VariableCS;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Advice;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Definition;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.ErrorStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.ExpandStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.ExpressionStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.FileStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.ForEachStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.IfStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.ImportDeclaration;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.LetStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.NamespaceImport;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.ProtectStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Statement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Template;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.TextStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.Identifier;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.ocl.DeclaredParameter;
-
-import lpg.runtime.IToken;
-
-/**
- * @author Sven Efftinge
- */
-public class XpandFactory {
-
-	private final String fileName;
-
-	public XpandFactory(final String fileName) {
-		this.fileName = fileName;
-	}
-
-	public Template createTemplate(final List<NamespaceImport> imports, final List<ImportDeclaration> extensions, final List<Definition> defines, final List<Advice> advices, final IToken eof) {
-		final NamespaceImport[] i = imports.toArray(new NamespaceImport[imports.size()]);
-		final ImportDeclaration[] ext = extensions.toArray(new ImportDeclaration[extensions.size()]);
-
-		final Definition[] d = defines.toArray(new Definition[defines.size()]);
-		final Advice[] a = advices.toArray(new Advice[advices.size()]);
-		final Template t = new Template(0, end(eof), 0, i, ext, d, a);
-		return handle(t);
-	}
-
-	public Definition createDefinition(final IToken startToken, final IToken endToken, final IToken n, final List<VariableCS> p, final TypeCS type, final List<Statement> s) {
-		final int start = start(startToken);
-		final int end = end(endToken);
-		final int line = line(startToken);
-		final Identifier name = createIdentifier(n);
-		final Statement[] body = s.toArray(new Statement[s.size()]);
-		return handle(new Definition(start, end, line, name, type, DeclaredParameter.create(p), body));
-	}
-
-	public TextStatement createTextStatement(final IToken t, final IToken m) {
-		String text = t.toString();
-		if (text.length() > 1) {
-			text = text.substring(1, text.length() - 1);
-		} else {
-			text = "";
-		}
-		return handle(new TextStatement(start(m != null ? m : t), end(t), line(m != null ? m : t), text, m != null));
-	}
-
-	public ForEachStatement createForEachStatement(final IToken start, final IToken end, final OCLExpressionCS e, final IToken v, final OCLExpressionCS sep, final IToken iter, final List<SyntaxElement> s) {
-		final Statement[] body = s.toArray(new Statement[s.size()]);
-		return handle(new ForEachStatement(start(start), end(end), line(start), createIdentifier(v), e, body, sep, iter != null ? createIdentifier(iter) : null));
-	}
-
-	public IfStatement createIfStatement(final IToken start, final OCLExpressionCS condition, final List<SyntaxElement> statements, final IfStatement elseIf) {
-		final Statement[] body = statements.toArray(new Statement[statements.size()]);
-		final int end = body[body.length - 1].getEnd();
-		return handle(new IfStatement(start(start), end, line(start), condition, body, elseIf));
-	}
-
-	public LetStatement createLetStatement(final IToken start, final IToken end, final OCLExpressionCS e, final IToken name, final List<SyntaxElement> statements) {
-		final Statement[] body = statements.toArray(new Statement[statements.size()]);
-		return handle(new LetStatement(start(start), end(end), line(start), createIdentifier(name), e, body));
-	}
-
-	public ErrorStatement createErrorStatement(final IToken start, final OCLExpressionCS expr) {
-		return handle(new ErrorStatement(start(start), expr.getEndOffset(), line(start), expr));
-	}
-
-	public ExpressionStatement createExpressionStatement(final OCLExpressionCS e, int lineNumber) {
-		return handle(new ExpressionStatement(e.getStartOffset(), e.getEndOffset(), lineNumber, e));
-	}
-
-	public FileStatement createFileStatement(final IToken start, final IToken end, final OCLExpressionCS fileName, final Identifier option, final List<SyntaxElement> statements) {
-		final Statement[] body = statements.toArray(new Statement[statements.size()]);
-		return handle(new FileStatement(start(start), end(end), line(start), fileName, body, option));
-	}
-
-	// FIXME disabled as token - no reason, just true/false 
-	public ProtectStatement createProtectStatement(final IToken start, final IToken end, final OCLExpressionCS startC, final OCLExpressionCS endC, final OCLExpressionCS id, final IToken disabled, final List<SyntaxElement> statements) {
-		final Statement[] body = statements.toArray(new Statement[statements.size()]);
-		return handle(new ProtectStatement(start(start), end(end), line(start), startC, endC, body, id, disabled != null));
-	}
-
-	public ExpandStatement createExpandStatement(final IToken start, final PathNameCS definition, final List<OCLExpressionCS> parameters, final OCLExpressionCS target, final boolean foreach, final OCLExpressionCS sep) {
-		final OCLExpressionCS[] params = parameters.toArray(new OCLExpressionCS[parameters.size()]);
-		int end = definition.getEndOffset();
-		if (sep != null) {
-			end = sep.getEndOffset();
-		} else if (target != null) {
-			end = target.getEndOffset();
-		} else if (params.length > 0) {
-			end = params[params.length - 1].getEndOffset();
-		}
-		return handle(new ExpandStatement(start(start), end, line(start), definition, target, sep, params, foreach));
-	}
-
-	public NamespaceImport createNamespaceImport(IToken start, StringLiteralExpCS namespace) {
-		return handle(new NamespaceImport(start(start), namespace.getEndOffset(), line(start), namespace));
-	}
-
-	public ImportDeclaration createImportDeclaration(final IToken start, final PathNameCS namespace) {
-		return handle(new ImportDeclaration(start(start), namespace.getEndOffset(), line(start), namespace));
-	}
-
-	public Advice createAround(final IToken start, final IToken end, final Identifier n, final List<VariableCS> p, final boolean wildparams, final TypeCS t, final List<Statement> s) {
-		final Statement[] body = s.toArray(new Statement[s.size()]);
-		final Advice a = new Advice(start(start), end(end), line(start), n, t, DeclaredParameter.create(p), wildparams, body);
-		return handle(a);
-	}
-
-	// copy from ExpressionFactory
-	private <T extends SyntaxElement> T handle(final T expr) {
-		expr.setFileName(fileName);
-		return expr;
-	}
-
-	private static int end(final IToken c) {
-		return c.getEndOffset();
-	}
-
-	private static int start(final IToken c) {
-		return c.getStartOffset();
-	}
-
-	private static int line(final IToken c) {
-		return c.getLine();
-	}
-
-	public Identifier createIdentifier(IToken name) {
-		return new Identifier(start(name), end(name), line(name), name.toString());
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexer.g b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexer.g
deleted file mode 100644
index 3bb9c408a3c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexer.g
+++ /dev/null
@@ -1,216 +0,0 @@
---
--- Copyright (c) 2006, 2008 Borland Software Corp.
--- 
--- All rights reserved. This program and the accompanying materials
--- are made available under the terms of the Eclipse Public License 2.0
--- which accompanies this distribution, and is available at
--- https://www.eclipse.org/legal/epl-2.0/
---
--- Contributors:
---    Artem Tikhomirov (Borland)
---
-
-%options fp=XpandKWLexer,prefix=Char_
-%options package=org.eclipse.papyrus.gmf.internal.xpand.parser
-%options template=../expression/parser/KeywordTemplateF.gi
-%options export_terminals=("XpandParsersym.java", "TK_")
-%options include_directory="../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/cst;../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/lpg"
-
-%Import
-	../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/cst/QVTOKWLexer.gi
-
-%DropRules
-	QVTKeyWord ::= t r a n s f o r m a t i o n
-	QVTKeyWord ::= i m p o r t
-	QVTKeyWord ::= l i b r a r y
-	QVTKeyWord ::= m e t a m o d e l
-	QVTKeyWord ::= m a p p i n g
-	QVTKeyWord ::= q u e r y
-	QVTKeyWord ::= h e l p e r
-	QVTKeyWord ::= e n d
-	QVTKeyWord ::= m a p
-	QVTKeyWord ::= x m a p
-	QVTKeyWord ::= o u t
-	QVTKeyWord ::= i n o u t
-	QVTKeyWord ::= m o d e l t y p e
-	QVTKeyWord ::= e x t e n d s
-	QVTKeyWord ::= a b s t r a c t
-	QVTKeyWord ::= s t a t i c
-	QVTKeyWord ::= r e s u l t
-	QVTKeyWord ::= m a i n
-	QVTKeyWord ::= r e t u r n
-	QVTKeyWord ::= r e n a m e
-	QVTKeyWord ::= d i s j u n c t s
-	QVTKeyWord ::= m e r g e s
-	QVTKeyWord ::= i n h e r i t s
-	-- next are symbols that were not dropped
-	QVTKeyWord ::= c o n f i g u r a t i o n
-		| p o p u l a t i o n
-		| i n t e r m e d i a t e
-		| p r o p e r t y
-		| l a t e
-		| l o g
-		| a s s e r t
-		| u s e s
-		| r e f i n e s
-		| e n f o r c i n g
-		| a c c e s s
-		| b l a c k b o x
-%End
-
-%Export
-	IMPORT EXTENSION
-	AROUND ENDAROUND
-	DEFINE ENDDEFINE
-	ERROR
-	EXPAND
-	FOR SEPARATOR AS ITERATOR 
-	FOREACH ENDFOREACH
-	FILE ENDFILE
-	IF ELSEIF ELSE ENDIF
-	LET ENDLET
-	PROTECT CSTART CEND ID DISABLE ENDPROTECT
-%End
-
-%Rules
-	KeyWord ::=
-		I M P O R T
-		/.$BeginAction
-			$setResult($_IMPORT);
-		$EndAction./
-
-		| E X T E N S I O N
-		/.$BeginAction
-			$setResult($_EXTENSION);
-		$EndAction./
-
-		| A R O U N D
-		/.$BeginAction
-			$setResult($_AROUND);
-		$EndAction./
-
-		| E N D A R O U N D
-		/.$BeginAction
-			$setResult($_ENDAROUND);
-		$EndAction./
-
-		| D E F I N E
-		/.$BeginAction
-			$setResult($_DEFINE);
-		$EndAction./
-
-		| E N D D E F I N E
-		/.$BeginAction
-			$setResult($_ENDDEFINE);
-		$EndAction./
-
-		| E R R O R
-		/.$BeginAction
-			$setResult($_ERROR);
-		$EndAction./
-
-		| E X P A N D
-		/.$BeginAction
-			$setResult($_EXPAND);
-		$EndAction./
-
-		| F O R
-		/.$BeginAction
-			$setResult($_FOR);
-		$EndAction./
-
-		| S E P A R A T O R
-		/.$BeginAction
-			$setResult($_SEPARATOR);
-		$EndAction./
-
-		| A S
-		/.$BeginAction
-			$setResult($_AS);
-		$EndAction./
-
-		| I T E R A T O R
-		/.$BeginAction
-			$setResult($_ITERATOR);
-		$EndAction./
-
-		| F O R E A C H
-		/.$BeginAction
-			$setResult($_FOREACH);
-		$EndAction./
-
-		| E N D F O R E A C H
-		/.$BeginAction
-			$setResult($_ENDFOREACH);
-		$EndAction./
-
-		| F I L E
-		/.$BeginAction
-			$setResult($_FILE);
-		$EndAction./
-
-		| E N D F I L E
-		/.$BeginAction
-			$setResult($_ENDFILE);
-		$EndAction./
-
-		| I F
-		/.$BeginAction
-			$setResult($_IF);
-		$EndAction./
-
-		| E L S E I F
-		/.$BeginAction
-			$setResult($_ELSEIF);
-		$EndAction./
-
-		| E L S E
-		/.$BeginAction
-			$setResult($_ELSE);
-		$EndAction./
-
-		| E N D I F
-		/.$BeginAction
-			$setResult($_ENDIF);
-		$EndAction./
-
-		| L E T
-		/.$BeginAction
-			$setResult($_LET);
-		$EndAction./
-
-		| E N D L E T
-		/.$BeginAction
-			$setResult($_ENDLET);
-		$EndAction./
-
-		| P R O T E C T
-		/.$BeginAction
-			$setResult($_PROTECT);
-		$EndAction./
-
-		| C S T A R T
-		/.$BeginAction
-			$setResult($_CSTART);
-		$EndAction./
-
-		| C E N D
-		/.$BeginAction
-			$setResult($_CEND);
-		$EndAction./
-
-		| I D
-		/.$BeginAction
-			$setResult($_ID);
-		$EndAction./
-
-		| D I S A B L E
-		/.$BeginAction
-			$setResult($_DISABLE);
-		$EndAction./
-
-		| E N D P R O T E C T
-		/.$BeginAction
-			$setResult($_ENDPROTECT);
-		$EndAction./
-%End
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexer.java
deleted file mode 100644
index d3ac5244548..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexer.java
+++ /dev/null
@@ -1,989 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *    Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-
-
-public class XpandKWLexer extends XpandKWLexerprs implements XpandParsersym
-{
-    private char[] inputChars;
-    private final int keywordKind[] = new int[149 + 1];
-
-    public int[] getKeywordKinds() { return keywordKind; }
-
-    public int lexer(int curtok, int lasttok)
-    {
-        int current_kind = getKind(inputChars[curtok]),
-            act;
-
-        for (act = tAction(START_STATE, current_kind);
-             act > NUM_RULES && act < ACCEPT_ACTION;
-             act = tAction(act, current_kind))
-        {
-            curtok++;
-            current_kind = (curtok > lasttok
-                                   ? Char_EOF
-                                   : getKind(inputChars[curtok]));
-        }
-
-        if (act > ERROR_ACTION)
-        {
-            curtok++;
-            act -= ERROR_ACTION;
-        }
-
-        return keywordKind[act == ERROR_ACTION  || curtok <= lasttok ? 0 : act];
-    }
-
-    public void setInputChars(char[] inputChars) { this.inputChars = inputChars; }
-
-
-    final static int tokenKind[] = new int[128];
-    static
-    {
-        tokenKind['$'] = XpandKWLexersym.Char_DollarSign;
-        tokenKind['%'] = XpandKWLexersym.Char_Percent;
-        tokenKind['_'] = XpandKWLexersym.Char__;
-
-        tokenKind['a'] = XpandKWLexersym.Char_a;
-        tokenKind['b'] = XpandKWLexersym.Char_b;
-        tokenKind['c'] = XpandKWLexersym.Char_c;
-        tokenKind['d'] = XpandKWLexersym.Char_d;
-        tokenKind['e'] = XpandKWLexersym.Char_e;
-        tokenKind['f'] = XpandKWLexersym.Char_f;
-        tokenKind['g'] = XpandKWLexersym.Char_g;
-        tokenKind['h'] = XpandKWLexersym.Char_h;
-        tokenKind['i'] = XpandKWLexersym.Char_i;
-        tokenKind['j'] = XpandKWLexersym.Char_j;
-        tokenKind['k'] = XpandKWLexersym.Char_k;
-        tokenKind['l'] = XpandKWLexersym.Char_l;
-        tokenKind['m'] = XpandKWLexersym.Char_m;
-        tokenKind['n'] = XpandKWLexersym.Char_n;
-        tokenKind['o'] = XpandKWLexersym.Char_o;
-        tokenKind['p'] = XpandKWLexersym.Char_p;
-        tokenKind['q'] = XpandKWLexersym.Char_q;
-        tokenKind['r'] = XpandKWLexersym.Char_r;
-        tokenKind['s'] = XpandKWLexersym.Char_s;
-        tokenKind['t'] = XpandKWLexersym.Char_t;
-        tokenKind['u'] = XpandKWLexersym.Char_u;
-        tokenKind['v'] = XpandKWLexersym.Char_v;
-        tokenKind['w'] = XpandKWLexersym.Char_w;
-        tokenKind['x'] = XpandKWLexersym.Char_x;
-        tokenKind['y'] = XpandKWLexersym.Char_y;
-        tokenKind['z'] = XpandKWLexersym.Char_z;
-
-        tokenKind['A'] = XpandKWLexersym.Char_A;
-        tokenKind['B'] = XpandKWLexersym.Char_B;
-        tokenKind['C'] = XpandKWLexersym.Char_C;
-        tokenKind['D'] = XpandKWLexersym.Char_D;
-        tokenKind['E'] = XpandKWLexersym.Char_E;
-        tokenKind['F'] = XpandKWLexersym.Char_F;
-        tokenKind['G'] = XpandKWLexersym.Char_G;
-        tokenKind['H'] = XpandKWLexersym.Char_H;
-        tokenKind['I'] = XpandKWLexersym.Char_I;
-        tokenKind['J'] = XpandKWLexersym.Char_J;
-        tokenKind['K'] = XpandKWLexersym.Char_K;
-        tokenKind['L'] = XpandKWLexersym.Char_L;
-        tokenKind['M'] = XpandKWLexersym.Char_M;
-        tokenKind['N'] = XpandKWLexersym.Char_N;
-        tokenKind['O'] = XpandKWLexersym.Char_O;
-        tokenKind['P'] = XpandKWLexersym.Char_P;
-        tokenKind['Q'] = XpandKWLexersym.Char_Q;
-        tokenKind['R'] = XpandKWLexersym.Char_R;
-        tokenKind['S'] = XpandKWLexersym.Char_S;
-        tokenKind['T'] = XpandKWLexersym.Char_T;
-        tokenKind['U'] = XpandKWLexersym.Char_U;
-        tokenKind['V'] = XpandKWLexersym.Char_V;
-        tokenKind['W'] = XpandKWLexersym.Char_W;
-        tokenKind['X'] = XpandKWLexersym.Char_X;
-        tokenKind['Y'] = XpandKWLexersym.Char_Y;
-        tokenKind['Z'] = XpandKWLexersym.Char_Z;
-    };
-
-    final int getKind(char c)
-    {
-        return (((c & 0xFFFFFF80) == 0) /* 0 <= c < 128? */ ? tokenKind[c] : 0);
-    }
-
-
-    public XpandKWLexer(char[] inputChars, int identifierKind)
-    {
-        this.inputChars = inputChars;
-        keywordKind[0] = identifierKind;
-
-        //
-        // Rule 1:  KeyWord ::= s e l f
-        //
-		keywordKind[1] = (XpandParsersym.TK_self);
-	  
-	
-        //
-        // Rule 2:  KeyWord ::= i f
-        //
-		keywordKind[2] = (XpandParsersym.TK_if);
-	  
-	
-        //
-        // Rule 3:  KeyWord ::= t h e n
-        //
-		keywordKind[3] = (XpandParsersym.TK_then);
-	  
-	
-        //
-        // Rule 4:  KeyWord ::= e l s e
-        //
-		keywordKind[4] = (XpandParsersym.TK_else);
-	  
-	
-        //
-        // Rule 5:  KeyWord ::= e n d i f
-        //
-		keywordKind[5] = (XpandParsersym.TK_endif);
-	  
-	
-        //
-        // Rule 6:  KeyWord ::= a n d
-        //
-		keywordKind[6] = (XpandParsersym.TK_and);
-	  
-	
-        //
-        // Rule 7:  KeyWord ::= o r
-        //
-		keywordKind[7] = (XpandParsersym.TK_or);
-	  
-	
-        //
-        // Rule 8:  KeyWord ::= x o r
-        //
-		keywordKind[8] = (XpandParsersym.TK_xor);
-	  
-	
-        //
-        // Rule 9:  KeyWord ::= n o t
-        //
-		keywordKind[9] = (XpandParsersym.TK_not);
-	  
-	
-        //
-        // Rule 10:  KeyWord ::= i m p l i e s
-        //
-		keywordKind[10] = (XpandParsersym.TK_implies);
-	  
-	
-        //
-        // Rule 11:  KeyWord ::= l e t
-        //
-		keywordKind[11] = (XpandParsersym.TK_let);
-	  
-	
-        //
-        // Rule 12:  KeyWord ::= i n
-        //
-		keywordKind[12] = (XpandParsersym.TK_in);
-	  
-	
-        //
-        // Rule 13:  KeyWord ::= t r u e
-        //
-		keywordKind[13] = (XpandParsersym.TK_true);
-	  
-	
-        //
-        // Rule 14:  KeyWord ::= f a l s e
-        //
-		keywordKind[14] = (XpandParsersym.TK_false);
-	  
-	
-        //
-        // Rule 15:  KeyWord ::= S e t
-        //
-		keywordKind[15] = (XpandParsersym.TK_Set);
-	  
-	
-        //
-        // Rule 16:  KeyWord ::= B a g
-        //
-		keywordKind[16] = (XpandParsersym.TK_Bag);
-	  
-	
-        //
-        // Rule 17:  KeyWord ::= S e q u e n c e
-        //
-		keywordKind[17] = (XpandParsersym.TK_Sequence);
-	  
-	
-        //
-        // Rule 18:  KeyWord ::= C o l l e c t i o n
-        //
-		keywordKind[18] = (XpandParsersym.TK_Collection);
-	  
-	
-        //
-        // Rule 19:  KeyWord ::= O r d e r e d S e t
-        //
-		keywordKind[19] = (XpandParsersym.TK_OrderedSet);
-	  
-	
-        //
-        // Rule 20:  KeyWord ::= S t r i n g
-        //
-		keywordKind[20] = (XpandParsersym.TK_String);
-	  
-	
-        //
-        // Rule 21:  KeyWord ::= I n t e g e r
-        //
-		keywordKind[21] = (XpandParsersym.TK_Integer);
-	  
-	
-        //
-        // Rule 22:  KeyWord ::= U n l i m i t e d N a t u r a l
-        //
-		keywordKind[22] = (XpandParsersym.TK_UnlimitedNatural);
-	  
-	
-        //
-        // Rule 23:  KeyWord ::= R e a l
-        //
-		keywordKind[23] = (XpandParsersym.TK_Real);
-	  
-	
-        //
-        // Rule 24:  KeyWord ::= B o o l e a n
-        //
-		keywordKind[24] = (XpandParsersym.TK_Boolean);
-	  
-	
-        //
-        // Rule 25:  KeyWord ::= T u p l e
-        //
-		keywordKind[25] = (XpandParsersym.TK_Tuple);
-	  
-	
-        //
-        // Rule 26:  KeyWord ::= O c l A n y
-        //
-		keywordKind[26] = (XpandParsersym.TK_OclAny);
-	  
-	
-        //
-        // Rule 27:  KeyWord ::= O c l V o i d
-        //
-		keywordKind[27] = (XpandParsersym.TK_OclVoid);
-	  
-	
-        //
-        // Rule 28:  KeyWord ::= O c l I n v a l i d
-        //
-		keywordKind[28] = (XpandParsersym.TK_OclInvalid);
-	  
-	
-        //
-        // Rule 29:  KeyWord ::= n u l l
-        //
-		keywordKind[29] = (XpandParsersym.TK_null);
-	  
-	
-        //
-        // Rule 30:  KeyWord ::= i n v a l i d
-        //
-		keywordKind[30] = (XpandParsersym.TK_invalid);
-	  
-	
-        //
-        // Rule 32:  ImperativeOCLKeyWord ::= D i c t
-        //
-		keywordKind[32] = (XpandParsersym.TK_Dict);
-	  
-	
-        //
-        // Rule 33:  ImperativeOCLKeyWord ::= L i s t
-        //
-		keywordKind[33] = (XpandParsersym.TK_List);
-	  
-	
-        //
-        // Rule 34:  ImperativeOCLKeyWord ::= b r e a k
-        //
-		keywordKind[34] = (XpandParsersym.TK_break);
-	  
-	
-        //
-        // Rule 35:  ImperativeOCLKeyWord ::= s w i t c h
-        //
-		keywordKind[35] = (XpandParsersym.TK_switch);
-	  
-	
-        //
-        // Rule 36:  ImperativeOCLKeyWord ::= c a s e
-        //
-		keywordKind[36] = (XpandParsersym.TK_case);
-	  
-	
-        //
-        // Rule 37:  ImperativeOCLKeyWord ::= x s e l e c t
-        //
-		keywordKind[37] = (XpandParsersym.TK_xselect);
-	  
-	
-        //
-        // Rule 38:  ImperativeOCLKeyWord ::= x c o l l e c t
-        //
-		keywordKind[38] = (XpandParsersym.TK_xcollect);
-	  
-	
-        //
-        // Rule 39:  ImperativeOCLKeyWord ::= s e l e c t O n e
-        //
-		keywordKind[39] = (XpandParsersym.TK_selectOne);
-	  
-	
-        //
-        // Rule 40:  ImperativeOCLKeyWord ::= c o l l e c t O n e
-        //
-		keywordKind[40] = (XpandParsersym.TK_collectOne);
-	  
-	
-        //
-        // Rule 41:  ImperativeOCLKeyWord ::= c o l l e c t s e l e c t
-        //
-		keywordKind[41] = (XpandParsersym.TK_collectselect);
-	  
-	
-        //
-        // Rule 42:  ImperativeOCLKeyWord ::= c o l l e c t s e l e c t O n e
-        //
-		keywordKind[42] = (XpandParsersym.TK_collectselectOne);
-	  
-	
-        //
-        // Rule 43:  ImperativeOCLKeyWord ::= f o r E a c h
-        //
-		keywordKind[43] = (XpandParsersym.TK_forEach);
-	  
-	
-        //
-        // Rule 44:  ImperativeOCLKeyWord ::= f o r O n e
-        //
-		keywordKind[44] = (XpandParsersym.TK_forOne);
-	  
-	
-        //
-        // Rule 45:  ImperativeOCLKeyWord ::= c o m p u t e
-        //
-		keywordKind[45] = (XpandParsersym.TK_compute);
-	  
-	
-        //
-        // Rule 46:  ImperativeOCLKeyWord ::= r e t u r n
-        //
-		keywordKind[46] = (XpandParsersym.TK_return);
-	  
-	
-        //
-        // Rule 47:  ImperativeOCLKeyWord ::= v a r
-        //
-		keywordKind[47] = (XpandParsersym.TK_var);
-	  
-	
-        //
-        // Rule 48:  ImperativeOCLKeyWord ::= w h i l e
-        //
-		keywordKind[48] = (XpandParsersym.TK_while);
-	  
-	
-        //
-        // Rule 49:  ImperativeOCLKeyWord ::= c o n t i n u e
-        //
-		keywordKind[49] = (XpandParsersym.TK_continue);
-	  
-	
-        //
-        // Rule 50:  ImperativeOCLKeyWord ::= l o g
-        //
-		keywordKind[50] = (XpandParsersym.TK_log);
-	  
-	
-        //
-        // Rule 51:  ImperativeOCLKeyWord ::= a s s e r t
-        //
-		keywordKind[51] = (XpandParsersym.TK_assert);
-	  
-	
-        //
-        // Rule 52:  ImperativeOCLKeyWord ::= w i t h
-        //
-		keywordKind[52] = (XpandParsersym.TK_with);
-	  
-	
-        //
-        // Rule 53:  ImperativeOCLKeyWord ::= n e w
-        //
-		keywordKind[53] = (XpandParsersym.TK_new);
-	  
-	
-        //
-        // Rule 55:  QVTOKeyWord ::= s t a t i c
-        //
-		keywordKind[55] = (XpandParsersym.TK_static);
-	  
-	
-        //
-        // Rule 56:  QVTOKeyWord ::= i n i t
-        //
-		keywordKind[56] = (XpandParsersym.TK_init);
-	  
-	
-        //
-        // Rule 57:  QVTOKeyWord ::= e n d
-        //
-		keywordKind[57] = (XpandParsersym.TK_end);
-	  
-	
-        //
-        // Rule 58:  QVTOKeyWord ::= o u t
-        //
-		keywordKind[58] = (XpandParsersym.TK_out);
-	  
-	
-        //
-        // Rule 59:  QVTOKeyWord ::= o b j e c t
-        //
-		keywordKind[59] = (XpandParsersym.TK_object);
-	  
-	
-        //
-        // Rule 60:  QVTOKeyWord ::= t r a n s f o r m a t i o n
-        //
-		keywordKind[60] = (XpandParsersym.TK_transformation);
-	  
-	
-        //
-        // Rule 61:  QVTOKeyWord ::= i m p o r t
-        //
-		keywordKind[61] = (XpandParsersym.TK_import);
-	  
-	
-        //
-        // Rule 62:  QVTOKeyWord ::= l i b r a r y
-        //
-		keywordKind[62] = (XpandParsersym.TK_library);
-	  
-	
-        //
-        // Rule 63:  QVTOKeyWord ::= m e t a m o d e l
-        //
-		keywordKind[63] = (XpandParsersym.TK_metamodel);
-	  
-	
-        //
-        // Rule 64:  QVTOKeyWord ::= d i s j u n c t s
-        //
-		keywordKind[64] = (XpandParsersym.TK_disjuncts);
-	  
-	
-        //
-        // Rule 65:  QVTOKeyWord ::= m e r g e s
-        //
-		keywordKind[65] = (XpandParsersym.TK_merges);
-	  
-	
-        //
-        // Rule 66:  QVTOKeyWord ::= i n h e r i t s
-        //
-		keywordKind[66] = (XpandParsersym.TK_inherits);
-	  
-	
-        //
-        // Rule 67:  QVTOKeyWord ::= r e n a m e
-        //
-		keywordKind[67] = (XpandParsersym.TK_rename);
-	  
-	
-        //
-        // Rule 68:  QVTOKeyWord ::= m a p p i n g
-        //
-		keywordKind[68] = (XpandParsersym.TK_mapping);
-	  
-	
-        //
-        // Rule 69:  QVTOKeyWord ::= q u e r y
-        //
-		keywordKind[69] = (XpandParsersym.TK_query);
-	  
-	
-        //
-        // Rule 70:  QVTOKeyWord ::= h e l p e r
-        //
-		keywordKind[70] = (XpandParsersym.TK_helper);
-	  
-	
-        //
-        // Rule 71:  QVTOKeyWord ::= i n o u t
-        //
-		keywordKind[71] = (XpandParsersym.TK_inout);
-	  
-	
-        //
-        // Rule 72:  QVTOKeyWord ::= w h e n
-        //
-		keywordKind[72] = (XpandParsersym.TK_when);
-	  
-	
-        //
-        // Rule 73:  QVTOKeyWord ::= c o n f i g u r a t i o n
-        //
-		keywordKind[73] = (XpandParsersym.TK_configuration);
-	  
-	
-        //
-        // Rule 74:  QVTOKeyWord ::= p o p u l a t i o n
-        //
-		keywordKind[74] = (XpandParsersym.TK_population);
-	  
-	
-        //
-        // Rule 75:  QVTOKeyWord ::= i n t e r m e d i a t e
-        //
-		keywordKind[75] = (XpandParsersym.TK_intermediate);
-	  
-	
-        //
-        // Rule 76:  QVTOKeyWord ::= p r o p e r t y
-        //
-		keywordKind[76] = (XpandParsersym.TK_property);
-	  
-	
-        //
-        // Rule 77:  QVTOKeyWord ::= o p p o s i t e s
-        //
-		keywordKind[77] = (XpandParsersym.TK_opposites);
-	  
-	
-        //
-        // Rule 78:  QVTOKeyWord ::= c l a s s
-        //
-		keywordKind[78] = (XpandParsersym.TK_class);
-	  
-	
-        //
-        // Rule 79:  QVTOKeyWord ::= m a p
-        //
-		keywordKind[79] = (XpandParsersym.TK_map);
-	  
-	
-        //
-        // Rule 80:  QVTOKeyWord ::= x m a p
-        //
-		keywordKind[80] = (XpandParsersym.TK_xmap);
-	  
-	
-        //
-        // Rule 81:  QVTOKeyWord ::= l a t e
-        //
-		keywordKind[81] = (XpandParsersym.TK_late);
-	  
-	
-        //
-        // Rule 82:  QVTOKeyWord ::= r e s o l v e
-        //
-		keywordKind[82] = (XpandParsersym.TK_resolve);
-	  
-	
-        //
-        // Rule 83:  QVTOKeyWord ::= r e s o l v e o n e
-        //
-		keywordKind[83] = (XpandParsersym.TK_resolveone);
-	  
-	
-        //
-        // Rule 84:  QVTOKeyWord ::= r e s o l v e I n
-        //
-		keywordKind[84] = (XpandParsersym.TK_resolveIn);
-	  
-	
-        //
-        // Rule 85:  QVTOKeyWord ::= r e s o l v e o n e I n
-        //
-		keywordKind[85] = (XpandParsersym.TK_resolveoneIn);
-	  
-	
-        //
-        // Rule 86:  QVTOKeyWord ::= i n v r e s o l v e
-        //
-		keywordKind[86] = (XpandParsersym.TK_invresolve);
-	  
-	
-        //
-        // Rule 87:  QVTOKeyWord ::= i n v r e s o l v e o n e
-        //
-		keywordKind[87] = (XpandParsersym.TK_invresolveone);
-	  
-	
-        //
-        // Rule 88:  QVTOKeyWord ::= i n v r e s o l v e I n
-        //
-		keywordKind[88] = (XpandParsersym.TK_invresolveIn);
-	  
-	
-        //
-        // Rule 89:  QVTOKeyWord ::= i n v r e s o l v e o n e I n
-        //
-		keywordKind[89] = (XpandParsersym.TK_invresolveoneIn);
-	  
-	
-        //
-        // Rule 90:  QVTOKeyWord ::= m o d e l t y p e
-        //
-		keywordKind[90] = (XpandParsersym.TK_modeltype);
-	  
-	
-        //
-        // Rule 91:  QVTOKeyWord ::= u s e s
-        //
-		keywordKind[91] = (XpandParsersym.TK_uses);
-	  
-	
-        //
-        // Rule 92:  QVTOKeyWord ::= w h e r e
-        //
-		keywordKind[92] = (XpandParsersym.TK_where);
-	  
-	
-        //
-        // Rule 93:  QVTOKeyWord ::= r e f i n e s
-        //
-		keywordKind[93] = (XpandParsersym.TK_refines);
-	  
-	
-        //
-        // Rule 94:  QVTOKeyWord ::= a c c e s s
-        //
-		keywordKind[94] = (XpandParsersym.TK_access);
-	  
-	
-        //
-        // Rule 95:  QVTOKeyWord ::= e x t e n d s
-        //
-		keywordKind[95] = (XpandParsersym.TK_extends);
-	  
-	
-        //
-        // Rule 96:  QVTOKeyWord ::= b l a c k b o x
-        //
-		keywordKind[96] = (XpandParsersym.TK_blackbox);
-	  
-	
-        //
-        // Rule 97:  QVTOKeyWord ::= a b s t r a c t
-        //
-		keywordKind[97] = (XpandParsersym.TK_abstract);
-	  
-	
-        //
-        // Rule 98:  QVTOKeyWord ::= r e s u l t
-        //
-		keywordKind[98] = (XpandParsersym.TK_result);
-	  
-	
-        //
-        // Rule 99:  QVTOKeyWord ::= m a i n
-        //
-		keywordKind[99] = (XpandParsersym.TK_main);
-	  
-	
-        //
-        // Rule 100:  QVTOKeyWord ::= t h i s
-        //
-		keywordKind[100] = (XpandParsersym.TK_this);
-	  
-	
-        //
-        // Rule 101:  QVTOKeyWord ::= c o m p o s e s
-        //
-		keywordKind[101] = (XpandParsersym.TK_composes);
-	  
-	
-        //
-        // Rule 102:  QVTOKeyWord ::= c o n s t r u c t o r
-        //
-		keywordKind[102] = (XpandParsersym.TK_constructor);
-	  
-	
-        //
-        // Rule 103:  QVTOKeyWord ::= d a t a t y p e
-        //
-		keywordKind[103] = (XpandParsersym.TK_datatype);
-	  
-	
-        //
-        // Rule 104:  QVTOKeyWord ::= d e f a u l t
-        //
-		keywordKind[104] = (XpandParsersym.TK_default);
-	  
-	
-        //
-        // Rule 105:  QVTOKeyWord ::= d e r i v e d
-        //
-		keywordKind[105] = (XpandParsersym.TK_derived);
-	  
-	
-        //
-        // Rule 106:  QVTOKeyWord ::= d o
-        //
-		keywordKind[106] = (XpandParsersym.TK_do);
-	  
-	
-        //
-        // Rule 107:  QVTOKeyWord ::= e l i f
-        //
-		keywordKind[107] = (XpandParsersym.TK_elif);
-	  
-	
-        //
-        // Rule 108:  QVTOKeyWord ::= e n u m
-        //
-		keywordKind[108] = (XpandParsersym.TK_enum);
-	  
-	
-        //
-        // Rule 109:  QVTOKeyWord ::= e x c e p t
-        //
-		keywordKind[109] = (XpandParsersym.TK_except);
-	  
-	
-        //
-        // Rule 110:  QVTOKeyWord ::= e x c e p t i o n
-        //
-		keywordKind[110] = (XpandParsersym.TK_exception);
-	  
-	
-        //
-        // Rule 111:  QVTOKeyWord ::= f r o m
-        //
-		keywordKind[111] = (XpandParsersym.TK_from);
-	  
-	
-        //
-        // Rule 112:  QVTOKeyWord ::= l i t e r a l
-        //
-		keywordKind[112] = (XpandParsersym.TK_literal);
-	  
-	
-        //
-        // Rule 113:  QVTOKeyWord ::= o r d e r e d
-        //
-		keywordKind[113] = (XpandParsersym.TK_ordered);
-	  
-	
-        //
-        // Rule 114:  QVTOKeyWord ::= p r i m i t i v e
-        //
-		keywordKind[114] = (XpandParsersym.TK_primitive);
-	  
-	
-        //
-        // Rule 115:  QVTOKeyWord ::= r a i s e
-        //
-		keywordKind[115] = (XpandParsersym.TK_raise);
-	  
-	
-        //
-        // Rule 116:  QVTOKeyWord ::= r e a d o n l y
-        //
-		keywordKind[116] = (XpandParsersym.TK_readonly);
-	  
-	
-        //
-        // Rule 117:  QVTOKeyWord ::= r e f e r e n c e s
-        //
-		keywordKind[117] = (XpandParsersym.TK_references);
-	  
-	
-        //
-        // Rule 118:  QVTOKeyWord ::= t a g
-        //
-		keywordKind[118] = (XpandParsersym.TK_tag);
-	  
-	
-        //
-        // Rule 119:  QVTOKeyWord ::= t r y
-        //
-		keywordKind[119] = (XpandParsersym.TK_try);
-	  
-	
-        //
-        // Rule 120:  QVTOKeyWord ::= t y p e d e f
-        //
-		keywordKind[120] = (XpandParsersym.TK_typedef);
-	  
-	
-        //
-        // Rule 121:  QVTOKeyWord ::= u n l i m i t e d
-        //
-		keywordKind[121] = (XpandParsersym.TK_unlimited);
-	  
-	
-        //
-        // Rule 122:  KeyWord ::= I M P O R T
-        //
-		keywordKind[122] = (XpandParsersym.TK_IMPORT);
-	
-        //
-        // Rule 123:  KeyWord ::= E X T E N S I O N
-        //
-		keywordKind[123] = (XpandParsersym.TK_EXTENSION);
-	
-        //
-        // Rule 124:  KeyWord ::= A R O U N D
-        //
-		keywordKind[124] = (XpandParsersym.TK_AROUND);
-	
-        //
-        // Rule 125:  KeyWord ::= E N D A R O U N D
-        //
-		keywordKind[125] = (XpandParsersym.TK_ENDAROUND);
-	
-        //
-        // Rule 126:  KeyWord ::= D E F I N E
-        //
-		keywordKind[126] = (XpandParsersym.TK_DEFINE);
-	
-        //
-        // Rule 127:  KeyWord ::= E N D D E F I N E
-        //
-		keywordKind[127] = (XpandParsersym.TK_ENDDEFINE);
-	
-        //
-        // Rule 128:  KeyWord ::= E R R O R
-        //
-		keywordKind[128] = (XpandParsersym.TK_ERROR);
-	
-        //
-        // Rule 129:  KeyWord ::= E X P A N D
-        //
-		keywordKind[129] = (XpandParsersym.TK_EXPAND);
-	
-        //
-        // Rule 130:  KeyWord ::= F O R
-        //
-		keywordKind[130] = (XpandParsersym.TK_FOR);
-	
-        //
-        // Rule 131:  KeyWord ::= S E P A R A T O R
-        //
-		keywordKind[131] = (XpandParsersym.TK_SEPARATOR);
-	
-        //
-        // Rule 132:  KeyWord ::= A S
-        //
-		keywordKind[132] = (XpandParsersym.TK_AS);
-	
-        //
-        // Rule 133:  KeyWord ::= I T E R A T O R
-        //
-		keywordKind[133] = (XpandParsersym.TK_ITERATOR);
-	
-        //
-        // Rule 134:  KeyWord ::= F O R E A C H
-        //
-		keywordKind[134] = (XpandParsersym.TK_FOREACH);
-	
-        //
-        // Rule 135:  KeyWord ::= E N D F O R E A C H
-        //
-		keywordKind[135] = (XpandParsersym.TK_ENDFOREACH);
-	
-        //
-        // Rule 136:  KeyWord ::= F I L E
-        //
-		keywordKind[136] = (XpandParsersym.TK_FILE);
-	
-        //
-        // Rule 137:  KeyWord ::= E N D F I L E
-        //
-		keywordKind[137] = (XpandParsersym.TK_ENDFILE);
-	
-        //
-        // Rule 138:  KeyWord ::= I F
-        //
-		keywordKind[138] = (XpandParsersym.TK_IF);
-	
-        //
-        // Rule 139:  KeyWord ::= E L S E I F
-        //
-		keywordKind[139] = (XpandParsersym.TK_ELSEIF);
-	
-        //
-        // Rule 140:  KeyWord ::= E L S E
-        //
-		keywordKind[140] = (XpandParsersym.TK_ELSE);
-	
-        //
-        // Rule 141:  KeyWord ::= E N D I F
-        //
-		keywordKind[141] = (XpandParsersym.TK_ENDIF);
-	
-        //
-        // Rule 142:  KeyWord ::= L E T
-        //
-		keywordKind[142] = (XpandParsersym.TK_LET);
-	
-        //
-        // Rule 143:  KeyWord ::= E N D L E T
-        //
-		keywordKind[143] = (XpandParsersym.TK_ENDLET);
-	
-        //
-        // Rule 144:  KeyWord ::= P R O T E C T
-        //
-		keywordKind[144] = (XpandParsersym.TK_PROTECT);
-	
-        //
-        // Rule 145:  KeyWord ::= C S T A R T
-        //
-		keywordKind[145] = (XpandParsersym.TK_CSTART);
-	
-        //
-        // Rule 146:  KeyWord ::= C E N D
-        //
-		keywordKind[146] = (XpandParsersym.TK_CEND);
-	
-        //
-        // Rule 147:  KeyWord ::= I D
-        //
-		keywordKind[147] = (XpandParsersym.TK_ID);
-	
-        //
-        // Rule 148:  KeyWord ::= D I S A B L E
-        //
-		keywordKind[148] = (XpandParsersym.TK_DISABLE);
-	
-        //
-        // Rule 149:  KeyWord ::= E N D P R O T E C T
-        //
-		keywordKind[149] = (XpandParsersym.TK_ENDPROTECT);
-	
-
-        for (int i = 0; i < keywordKind.length; i++)
-        {
-            if (keywordKind[i] == 0)
-                keywordKind[i] = identifierKind;
-        }
-    }
-}
-
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexerprs.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexerprs.java
deleted file mode 100644
index 67c27446b89..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexerprs.java
+++ /dev/null
@@ -1,529 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-public class XpandKWLexerprs implements lpg.runtime.ParseTable, XpandKWLexersym {
-    public final static int ERROR_SYMBOL = 0;
-    public final int getErrorSymbol() { return ERROR_SYMBOL; }
-
-    public final static int SCOPE_UBOUND = 0;
-    public final int getScopeUbound() { return SCOPE_UBOUND; }
-
-    public final static int SCOPE_SIZE = 0;
-    public final int getScopeSize() { return SCOPE_SIZE; }
-
-    public final static int MAX_NAME_LENGTH = 0;
-    public final int getMaxNameLength() { return MAX_NAME_LENGTH; }
-
-    public final static int NUM_STATES = 560;
-    public final int getNumStates() { return NUM_STATES; }
-
-    public final static int NT_OFFSET = 56;
-    public final int getNtOffset() { return NT_OFFSET; }
-
-    public final static int LA_STATE_OFFSET = 864;
-    public final int getLaStateOffset() { return LA_STATE_OFFSET; }
-
-    public final static int MAX_LA = 1;
-    public final int getMaxLa() { return MAX_LA; }
-
-    public final static int NUM_RULES = 149;
-    public final int getNumRules() { return NUM_RULES; }
-
-    public final static int NUM_NONTERMINALS = 4;
-    public final int getNumNonterminals() { return NUM_NONTERMINALS; }
-
-    public final static int NUM_SYMBOLS = 60;
-    public final int getNumSymbols() { return NUM_SYMBOLS; }
-
-    public final static int SEGMENT_SIZE = 8192;
-    public final int getSegmentSize() { return SEGMENT_SIZE; }
-
-    public final static int START_STATE = 150;
-    public final int getStartState() { return START_STATE; }
-
-    public final static int IDENTIFIER_SYMBOL = 0;
-    public final int getIdentifier_SYMBOL() { return IDENTIFIER_SYMBOL; }
-
-    public final static int EOFT_SYMBOL = 45;
-    public final int getEoftSymbol() { return EOFT_SYMBOL; }
-
-    public final static int EOLT_SYMBOL = 57;
-    public final int getEoltSymbol() { return EOLT_SYMBOL; }
-
-    public final static int ACCEPT_ACTION = 714;
-    public final int getAcceptAction() { return ACCEPT_ACTION; }
-
-    public final static int ERROR_ACTION = 715;
-    public final int getErrorAction() { return ERROR_ACTION; }
-
-    public final static boolean BACKTRACK = false;
-    public final boolean getBacktrack() { return BACKTRACK; }
-
-    public final int getStartSymbol() { return lhs(0); }
-    public final boolean isValidForParser() { return XpandKWLexersym.isValidForParser; }
-
-
-    public interface IsNullable {
-        public final static byte isNullable[] = {0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0
-        };
-    };
-    public final static byte isNullable[] = IsNullable.isNullable;
-    public final boolean isNullable(int index) { return isNullable[index] != 0; }
-
-    public interface ProsthesesIndex {
-        public final static byte prosthesesIndex[] = {0,
-            2,3,4,1
-        };
-    };
-    public final static byte prosthesesIndex[] = ProsthesesIndex.prosthesesIndex;
-    public final int prosthesesIndex(int index) { return prosthesesIndex[index]; }
-
-    public interface IsKeyword {
-        public final static byte isKeyword[] = {0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0
-        };
-    };
-    public final static byte isKeyword[] = IsKeyword.isKeyword;
-    public final boolean isKeyword(int index) { return isKeyword[index] != 0; }
-
-    public interface BaseCheck {
-        public final static byte baseCheck[] = {0,
-            4,2,4,4,5,3,2,3,3,7,
-            3,2,4,5,3,3,8,10,10,6,
-            7,16,4,7,5,6,7,10,4,7,
-            1,4,4,5,6,4,7,8,9,10,
-            13,16,7,6,7,6,3,5,8,3,
-            6,4,3,1,6,4,3,3,6,14,
-            6,7,9,9,6,8,6,7,5,6,
-            5,4,13,10,12,8,9,5,3,4,
-            4,7,10,9,12,10,13,12,15,9,
-            4,5,7,6,7,8,8,6,4,4,
-            8,11,8,7,7,2,4,4,6,9,
-            4,7,7,9,5,8,10,3,3,7,
-            9,6,9,6,9,6,9,5,6,3,
-            9,2,8,7,10,4,7,2,6,4,
-            5,3,6,7,6,4,2,7,10
-        };
-    };
-    public final static byte baseCheck[] = BaseCheck.baseCheck;
-    public final int baseCheck(int index) { return baseCheck[index]; }
-    public final static byte rhs[] = baseCheck;
-    public final int rhs(int index) { return rhs[index]; };
-
-    public interface BaseAction {
-        public final static char baseAction[] = {
-            1,2,2,2,2,2,2,2,2,2,
-            2,2,2,2,2,2,2,2,2,2,
-            2,2,2,2,2,2,2,2,2,2,
-            2,3,3,3,3,3,3,3,3,3,
-            3,3,3,3,3,3,3,3,3,3,
-            3,3,3,3,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,2,2,2,2,2,2,2,2,
-            2,2,2,2,2,2,2,2,2,2,
-            2,2,2,2,2,2,2,2,2,2,
-            1,154,31,54,230,48,172,23,90,73,
-            120,108,47,183,67,263,194,130,43,104,
-            123,193,135,82,138,86,129,153,91,98,
-            185,278,118,149,107,160,162,197,204,170,
-            274,223,205,270,282,288,38,290,286,291,
-            206,145,283,280,293,296,294,297,299,207,
-            300,301,302,304,305,316,312,319,306,321,
-            320,322,326,327,329,216,332,333,334,337,
-            217,221,222,340,341,169,228,52,342,343,
-            347,351,348,39,355,359,361,235,344,367,
-            372,238,373,358,63,375,376,380,381,378,
-            389,387,384,139,392,395,394,399,396,405,
-            397,400,407,410,408,412,411,140,413,417,
-            414,419,422,424,432,421,433,437,429,423,
-            435,441,444,445,446,449,448,25,450,451,
-            452,461,464,453,465,471,171,473,454,467,
-            476,478,475,484,477,485,491,496,498,500,
-            486,502,345,503,507,509,510,513,514,515,
-            518,519,521,69,236,489,524,527,529,532,
-            534,536,525,243,538,537,540,247,245,541,
-            544,539,250,545,547,550,559,553,177,549,
-            560,566,568,569,256,572,573,574,575,577,
-            579,578,583,584,586,588,590,592,593,596,
-            599,600,603,601,604,609,608,610,614,611,
-            617,615,616,252,618,621,624,625,634,622,
-            630,636,638,639,640,651,643,645,655,657,
-            653,660,664,659,666,667,670,671,672,675,
-            677,679,678,682,689,691,692,695,694,697,
-            701,702,703,704,711,713,709,715,716,718,
-            720,722,724,726,727,731,728,735,737,681,
-            738,739,260,744,747,740,748,749,752,753,
-            754,755,760,757,761,764,765,767,756,771,
-            773,777,769,781,782,783,784,785,786,788,
-            791,792,794,795,798,796,799,800,802,804,
-            797,807,812,816,819,826,827,828,829,830,
-            838,839,831,843,840,846,844,849,850,851,
-            855,856,861,857,863,867,866,870,871,877,
-            879,881,875,884,886,887,882,890,893,894,
-            895,896,897,905,898,901,904,910,909,913,
-            914,915,916,921,922,926,927,918,931,928,
-            933,934,935,936,937,939,945,942,944,947,
-            952,948,960,958,949,962,967,968,970,972,
-            973,978,979,976,981,984,986,989,993,994,
-            995,997,998,996,1000,1008,1009,1012,999,1010,
-            1014,1015,1017,1021,1022,1026,1029,1024,1032,1033,
-            1035,1037,1038,1041,1042,1046,1049,1050,1047,1052,
-            1053,1054,1055,1056,1062,1060,1059,1067,1066,1068,
-            1073,1077,1080,1079,1083,1082,1093,1084,1089,254,
-            1094,1090,1097,1101,1104,175,1105,1098,1106,1109,
-            1111,1112,1114,1117,1116,1120,1123,1124,1125,1126,
-            1127,1128,1132,1130,1135,1136,1137,1141,1142,1150,
-            1154,1155,1159,1153,1162,1164,1165,1168,1170,1143,
-            1172,1173,1174,1175,1179,1180,1181,1183,1189,1191,
-            1193,1196,1197,1200,1202,1203,264,1206,1208,1209,
-            1210,1215,1212,1218,1221,1222,1226,1220,1227,1230,
-            1231,1232,1235,1234,1240,1241,1242,1245,1247,1248,
-            1249,1250,1256,715,715
-        };
-    };
-    public final static char baseAction[] = BaseAction.baseAction;
-    public final int baseAction(int index) { return baseAction[index]; }
-    public final static char lhs[] = baseAction;
-    public final int lhs(int index) { return lhs[index]; };
-
-    public interface TermCheck {
-        public final static byte termCheck[] = {0,
-            0,1,2,3,4,5,6,7,8,9,
-            10,11,12,13,14,15,16,17,18,19,
-            20,21,0,1,0,25,26,27,28,29,
-            30,31,32,33,34,35,36,0,0,39,
-            40,17,0,6,20,3,0,0,10,25,
-            3,0,28,2,30,4,9,33,21,8,
-            18,15,0,17,2,3,0,25,0,7,
-            28,9,0,1,6,7,4,26,27,7,
-            8,0,16,21,42,0,0,6,22,0,
-            0,6,7,3,13,14,30,0,1,9,
-            10,4,13,0,7,8,0,0,23,6,
-            44,26,31,10,8,9,10,0,1,0,
-            1,31,0,16,7,19,7,8,0,0,
-            8,3,3,11,0,1,2,0,0,0,
-            3,3,5,5,0,11,2,19,0,21,
-            6,29,0,1,6,7,8,19,19,0,
-            8,0,1,2,5,13,7,8,0,0,
-            0,0,35,4,0,7,0,6,2,8,
-            11,13,0,9,0,9,17,17,4,15,
-            20,23,0,0,1,34,0,21,16,7,
-            8,5,6,0,0,0,0,4,4,4,
-            26,29,8,43,11,0,0,2,2,14,
-            0,0,0,1,18,4,10,0,1,0,
-            9,4,12,13,0,0,2,0,1,33,
-            5,4,0,8,0,3,0,1,6,0,
-            4,0,8,0,39,0,1,13,0,0,
-            11,8,0,0,15,31,15,8,17,0,
-            17,8,13,0,45,13,21,0,5,0,
-            17,0,0,14,7,0,5,0,1,0,
-            0,2,0,0,9,0,0,15,0,0,
-            0,0,12,0,0,0,5,7,16,30,
-            15,0,16,14,11,0,5,2,0,0,
-            0,0,29,25,5,0,0,22,0,8,
-            12,0,0,0,6,2,0,33,18,0,
-            0,0,0,0,0,14,0,0,12,24,
-            0,5,2,14,0,14,9,0,0,33,
-            0,4,2,9,24,21,0,24,2,37,
-            12,0,0,2,0,0,34,0,6,0,
-            0,6,8,0,5,8,0,7,0,1,
-            7,0,6,0,0,0,0,4,0,0,
-            9,7,7,5,0,1,0,0,9,0,
-            0,0,0,0,18,4,0,10,0,9,
-            0,0,0,0,6,4,14,14,0,13,
-            7,0,0,1,0,29,0,28,7,3,
-            0,7,14,0,0,0,24,0,0,0,
-            0,0,0,0,11,11,5,37,18,11,
-            0,11,15,0,0,5,0,4,16,20,
-            0,1,0,1,0,0,0,0,25,15,
-            5,36,5,0,0,0,20,4,0,13,
-            0,1,8,5,20,0,1,0,1,0,
-            1,0,0,1,19,4,0,1,0,0,
-            1,3,0,0,0,1,3,0,0,1,
-            0,9,2,0,0,2,0,1,0,1,
-            13,0,1,0,1,0,0,0,0,0,
-            0,6,5,0,0,9,0,7,0,0,
-            26,12,0,9,5,0,13,19,0,0,
-            14,9,14,5,5,0,1,0,0,2,
-            2,0,0,0,0,2,0,0,0,7,
-            2,10,0,0,1,0,4,0,1,0,
-            5,0,0,17,20,0,19,2,0,0,
-            0,1,0,0,5,13,4,0,0,0,
-            0,13,23,0,0,0,0,0,27,11,
-            0,0,19,0,0,11,16,20,11,0,
-            17,22,16,0,1,0,16,0,0,0,
-            19,3,0,28,0,22,22,8,6,20,
-            0,16,0,3,0,1,0,1,0,0,
-            16,24,3,0,1,0,0,9,16,0,
-            0,0,6,3,0,10,0,0,0,2,
-            0,0,2,14,6,9,12,6,0,1,
-            0,0,21,0,0,5,0,6,4,6,
-            0,0,0,0,1,9,6,6,0,7,
-            0,1,0,1,0,0,8,0,3,0,
-            6,0,5,0,5,0,0,0,3,6,
-            0,1,5,7,0,1,0,0,0,0,
-            19,4,4,0,1,9,0,0,0,10,
-            4,0,0,0,0,0,0,10,4,0,
-            0,2,6,0,0,1,0,7,0,6,
-            0,5,0,3,2,22,0,9,23,3,
-            0,0,0,0,0,0,38,0,8,38,
-            0,0,40,0,0,0,0,0,0,0,
-            15,0,4,0,1,18,0,16,25,15,
-            4,0,28,32,32,0,1,18,0,18,
-            30,28,25,27,29,0,0,0,0,0,
-            0,1,3,7,23,10,18,0,0,0,
-            2,4,0,0,2,0,1,20,0,0,
-            0,12,24,4,0,0,0,2,4,9,
-            0,1,0,7,21,0,0,19,2,0,
-            0,9,7,3,0,6,0,1,0,1,
-            0,0,2,0,1,0,0,1,3,0,
-            1,10,0,0,0,0,0,0,3,6,
-            0,27,10,0,0,9,2,10,0,0,
-            10,2,0,0,0,0,2,0,24,4,
-            0,0,2,2,11,0,0,0,2,26,
-            0,14,0,0,0,0,0,12,0,31,
-            10,0,30,0,0,12,0,0,0,11,
-            23,0,18,2,18,11,24,0,17,0,
-            12,0,15,17,7,6,0,0,2,0,
-            3,0,0,12,2,0,41,0,0,36,
-            0,10,4,0,9,0,1,18,0,12,
-            2,8,0,0,0,0,0,0,0,0,
-            8,21,5,9,5,12,10,0,0,0,
-            3,0,1,0,0,2,0,9,23,10,
-            0,0,1,0,26,0,1,13,0,13,
-            2,0,0,13,0,1,0,0,15,8,
-            0,0,1,11,4,0,0,2,0,0,
-            1,0,0,0,0,0,1,11,0,0,
-            23,0,14,27,5,0,0,0,1,15,
-            4,20,0,1,22,22,0,16,0,0,
-            15,0,0,0,8,6,5,29,0,0,
-            12,9,0,0,2,2,0,0,10,10,
-            0,1,6,0,0,0,23,3,0,1,
-            0,0,9,0,1,0,0,12,8,0,
-            9,5,0,0,0,0,0,0,1,0,
-            4,0,35,11,0,0,0,12,3,8,
-            0,0,0,9,4,16,22,32,25,0,
-            1,32,0,0,0,19,3,3,0,7,
-            2,0,1,0,0,1,3,0,27,0,
-            3,0,0,0,0,2,0,3,0,0,
-            0,1,0,41,12,7,7,18,0,1,
-            0,9,0,22,2,0,0,1,8,0,
-            5,0,0,2,2,0,7,0,0,0,
-            1,0,4,6,0,4,2,0,1,0,
-            0,0,17,3,3,0,0,8,3,0,
-            0,0,1,0,0,2,10,3,8,0,
-            0,0,13,3,0,6,0,0,0,0,
-            3,3,0,7,5,0,1,0,17,15,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0
-        };
-    };
-    public final static byte termCheck[] = TermCheck.termCheck;
-    public final int termCheck(int index) { return termCheck[index]; }
-
-    public interface TermAction {
-        public final static char termAction[] = {0,
-            715,174,175,177,176,179,182,178,173,186,
-            185,164,159,155,156,169,166,168,165,160,
-            163,183,715,194,715,189,157,181,162,172,
-            188,187,170,161,180,184,167,715,715,158,
-            171,392,715,282,395,215,715,715,337,394,
-            190,12,393,329,391,332,191,390,283,330,
-            213,204,715,203,350,349,715,862,715,346,
-            853,348,715,196,424,425,198,331,333,197,
-            821,715,207,347,214,715,715,229,208,715,
-            715,235,234,245,228,226,206,715,249,244,
-            243,247,195,715,246,248,715,715,233,217,
-            209,236,227,216,261,260,259,715,254,715,
-            201,242,715,202,253,258,200,199,715,715,
-            220,237,212,218,715,225,224,715,715,715,
-            231,358,232,360,715,223,290,238,715,717,
-            289,219,715,239,255,257,256,359,372,715,
-            241,715,267,265,262,240,264,263,715,715,
-            715,715,230,274,715,325,715,192,451,193,
-            273,326,715,664,715,449,272,403,250,665,
-            405,834,715,715,211,266,715,450,205,222,
-            221,268,269,715,715,715,715,271,277,287,
-            251,847,278,404,270,715,715,730,319,288,
-            715,715,715,276,299,322,318,715,328,715,
-            323,327,321,320,715,715,340,715,343,298,
-            427,344,715,426,715,787,715,437,433,715,
-            438,715,440,82,314,715,456,439,715,715,
-            444,661,715,86,443,341,481,532,480,715,
-            660,695,533,715,714,210,716,715,275,715,
-            694,715,715,279,252,715,280,715,281,715,
-            715,284,715,715,285,715,715,291,715,715,
-            715,715,286,715,715,715,302,301,293,292,
-            294,715,296,300,303,715,306,305,715,715,
-            715,715,295,297,310,715,715,308,715,311,
-            307,715,715,715,313,773,7,304,309,715,
-            715,715,715,715,715,315,715,715,317,731,
-            715,335,724,324,715,334,336,715,715,312,
-            715,345,339,338,833,822,715,765,726,316,
-            721,715,715,342,715,715,768,715,762,715,
-            715,352,351,715,353,355,715,354,715,356,
-            357,715,723,715,715,715,715,363,715,715,
-            361,362,365,364,715,366,715,715,367,715,
-            715,715,715,715,857,371,715,370,715,806,
-            715,715,715,715,376,377,373,375,79,374,
-            378,715,715,381,715,368,715,369,379,814,
-            715,384,382,715,130,715,383,715,715,715,
-            715,715,715,715,851,386,398,380,385,388,
-            715,397,389,715,715,738,715,399,400,396,
-            715,402,715,406,715,715,715,715,861,401,
-            408,387,409,715,715,715,407,411,715,412,
-            715,414,413,744,410,715,415,715,416,715,
-            417,57,715,719,823,418,715,419,715,715,
-            728,420,715,715,715,421,718,715,715,423,
-            715,815,771,715,715,428,715,429,715,430,
-            422,715,796,715,431,715,715,715,715,715,
-            715,432,434,715,715,435,715,441,715,715,
-            767,436,715,445,446,715,442,826,715,715,
-            795,448,452,447,453,715,751,715,715,454,
-            455,715,715,715,715,748,715,715,715,458,
-            747,457,715,715,463,715,462,715,465,715,
-            464,715,715,460,459,715,461,468,715,715,
-            715,472,715,715,470,467,471,715,715,715,
-            715,469,784,140,715,715,715,715,466,474,
-            715,715,473,715,715,479,843,475,482,715,
-            477,476,478,715,740,715,483,715,715,715,
-            486,490,715,856,715,484,485,491,493,487,
-            715,488,715,492,715,495,715,496,715,715,
-            494,489,498,715,499,715,715,500,497,715,
-            715,715,502,504,715,501,715,715,715,786,
-            715,715,529,503,507,506,505,508,715,509,
-            715,715,720,715,715,510,715,511,512,513,
-            715,715,715,715,807,514,515,516,715,517,
-            715,763,715,830,715,715,518,715,520,715,
-            519,715,521,715,522,715,715,715,525,524,
-            715,729,527,526,715,528,715,715,715,715,
-            523,530,531,715,534,793,715,715,715,536,
-            535,715,715,715,715,715,715,537,541,715,
-            715,542,543,715,715,545,715,544,715,785,
-            715,546,715,548,549,540,715,780,547,550,
-            715,715,715,715,715,715,538,715,551,749,
-            715,715,539,715,715,715,715,715,715,715,
-            554,715,560,715,562,858,715,556,839,558,
-            564,715,854,552,553,715,565,561,715,837,
-            555,557,844,563,559,715,715,715,715,715,
-            715,571,569,567,741,566,860,715,715,715,
-            774,570,715,715,572,715,574,568,715,715,
-            715,573,735,577,715,715,715,776,579,578,
-            715,580,715,581,575,715,715,576,766,715,
-            715,809,582,584,715,583,715,585,715,586,
-            715,715,813,715,782,715,715,759,761,715,
-            589,588,715,715,715,715,715,715,593,591,
-            715,587,590,715,715,594,595,596,715,715,
-            770,597,715,715,715,715,600,715,592,601,
-            715,715,602,603,841,715,715,715,819,750,
-            715,604,715,715,715,715,715,820,715,598,
-            605,715,599,715,715,607,715,715,715,852,
-            606,715,859,613,608,609,783,715,610,715,
-            742,715,614,612,615,736,715,715,617,715,
-            739,715,715,616,620,715,849,715,109,611,
-            715,619,621,715,810,715,623,618,715,828,
-            624,622,715,715,715,715,715,715,715,715,
-            625,835,827,725,627,745,626,715,715,715,
-            628,715,629,715,715,752,715,808,777,630,
-            715,715,634,715,758,715,760,631,715,632,
-            635,715,715,633,715,638,715,715,636,637,
-            715,715,818,863,640,715,715,641,715,715,
-            643,715,715,715,715,715,649,644,715,715,
-            791,715,642,639,650,715,715,715,732,648,
-            652,645,715,654,646,647,715,848,715,715,
-            653,715,715,715,655,656,658,651,715,715,
-            657,781,715,715,812,753,715,715,659,662,
-            715,764,663,715,715,715,831,666,715,829,
-            715,715,816,715,805,715,715,836,667,715,
-            779,778,715,715,715,715,715,715,672,715,
-            671,715,811,842,715,715,715,670,825,673,
-            715,715,715,792,675,846,838,668,840,715,
-            677,669,715,715,715,674,799,678,715,680,
-            679,715,681,715,715,754,682,715,676,715,
-            789,715,715,715,715,734,715,733,715,715,
-            715,686,715,850,743,684,685,864,715,687,
-            715,832,715,683,689,715,715,755,688,715,
-            690,715,715,692,693,83,691,715,715,715,
-            698,715,697,817,715,700,699,715,790,715,
-            715,715,696,803,701,715,715,702,800,715,
-            715,715,706,715,715,707,703,788,705,715,
-            715,87,704,775,41,708,715,715,715,715,
-            804,712,715,711,737,715,757,715,709,710
-        };
-    };
-    public final static char termAction[] = TermAction.termAction;
-    public final int termAction(int index) { return termAction[index]; }
-    public final int asb(int index) { return 0; }
-    public final int asr(int index) { return 0; }
-    public final int nasb(int index) { return 0; }
-    public final int nasr(int index) { return 0; }
-    public final int terminalIndex(int index) { return 0; }
-    public final int nonterminalIndex(int index) { return 0; }
-    public final int scopePrefix(int index) { return 0;}
-    public final int scopeSuffix(int index) { return 0;}
-    public final int scopeLhs(int index) { return 0;}
-    public final int scopeLa(int index) { return 0;}
-    public final int scopeStateSet(int index) { return 0;}
-    public final int scopeRhs(int index) { return 0;}
-    public final int scopeState(int index) { return 0;}
-    public final int inSymb(int index) { return 0;}
-    public final String name(int index) { return null; }
-    public final int originalState(int state) { return 0; }
-    public final int asi(int state) { return 0; }
-    public final int nasi(int state) { return 0; }
-    public final int inSymbol(int state) { return 0; }
-
-    /**
-     * assert(! goto_default);
-     */
-    public final int ntAction(int state, int sym) {
-        return baseAction[state + sym];
-    }
-
-    /**
-     * assert(! shift_default);
-     */
-    public final int tAction(int state, int sym) {
-        int i = baseAction[state],
-            k = i + sym;
-        return termAction[termCheck[k] == sym ? k : i];
-    }
-    public final int lookAhead(int la_state, int sym) {
-        int k = la_state + sym;
-        return termAction[termCheck[k] == sym ? k : la_state];
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexersym.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexersym.java
deleted file mode 100644
index 11d11881f4c..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandKWLexersym.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-public interface XpandKWLexersym {
-    public final static int
-      Char_DollarSign = 46,
-      Char_Percent = 47,
-      Char__ = 48,
-      Char_a = 7,
-      Char_b = 31,
-      Char_c = 10,
-      Char_d = 12,
-      Char_e = 1,
-      Char_f = 21,
-      Char_g = 24,
-      Char_h = 26,
-      Char_i = 4,
-      Char_j = 37,
-      Char_k = 38,
-      Char_l = 5,
-      Char_m = 19,
-      Char_n = 3,
-      Char_o = 8,
-      Char_p = 14,
-      Char_q = 39,
-      Char_r = 6,
-      Char_s = 9,
-      Char_t = 2,
-      Char_u = 13,
-      Char_v = 27,
-      Char_w = 34,
-      Char_x = 35,
-      Char_y = 23,
-      Char_z = 49,
-      Char_A = 20,
-      Char_B = 40,
-      Char_C = 32,
-      Char_D = 25,
-      Char_E = 11,
-      Char_F = 28,
-      Char_G = 50,
-      Char_H = 41,
-      Char_I = 17,
-      Char_J = 51,
-      Char_K = 52,
-      Char_L = 30,
-      Char_M = 42,
-      Char_N = 22,
-      Char_O = 15,
-      Char_P = 33,
-      Char_Q = 53,
-      Char_R = 16,
-      Char_S = 29,
-      Char_T = 18,
-      Char_U = 36,
-      Char_V = 43,
-      Char_W = 54,
-      Char_X = 44,
-      Char_Y = 55,
-      Char_Z = 56,
-      Char_EOF = 45;
-
-    public final static String orderedTerminalSymbols[] = {
-                 "",
-                 "e",
-                 "t",
-                 "n",
-                 "i",
-                 "l",
-                 "r",
-                 "a",
-                 "o",
-                 "s",
-                 "c",
-                 "E",
-                 "d",
-                 "u",
-                 "p",
-                 "O",
-                 "R",
-                 "I",
-                 "T",
-                 "m",
-                 "A",
-                 "f",
-                 "N",
-                 "y",
-                 "g",
-                 "D",
-                 "h",
-                 "v",
-                 "F",
-                 "S",
-                 "L",
-                 "b",
-                 "C",
-                 "P",
-                 "w",
-                 "x",
-                 "U",
-                 "j",
-                 "k",
-                 "q",
-                 "B",
-                 "H",
-                 "M",
-                 "V",
-                 "X",
-                 "EOF",
-                 "DollarSign",
-                 "Percent",
-                 "_",
-                 "z",
-                 "G",
-                 "J",
-                 "K",
-                 "Q",
-                 "W",
-                 "Y",
-                 "Z"
-             };
-
-    public final static int numTokenKinds = orderedTerminalSymbols.length;
-    public final static boolean isValidForParser = true;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexer.g b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexer.g
deleted file mode 100644
index add41854fd1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexer.g
+++ /dev/null
@@ -1,101 +0,0 @@
---
--- Copyright (c) 2006, 2008 Borland Software Corp.
--- 
--- All rights reserved. This program and the accompanying materials
--- are made available under the terms of the Eclipse Public License 2.0
--- which accompanies this distribution, and is available at
--- https://www.eclipse.org/legal/epl-2.0/
---
--- Contributors:
---    Artem Tikhomirov (Borland)
---
-
-%options fp=XpandLexer,prefix=Char_
-%options package=org.eclipse.papyrus.gmf.internal.xpand.parser
-%options template=../expression/parser/LexerTemplateF.gi
-%options export_terminals=("XpandParsersym.java", "TK_")
-%options filter=XpandKWLexer.g
--- stupid endrem needs 6
-%options lalr=6
-%options include_directory="../expression/parser/;../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/cst;../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/lpg"
-
-%Import
-	../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/cst/QVTOLexer.gi
-%End
-
-%Define
-	$kw_lexer_class /.XpandKWLexer./
-	$prs_stream_class /.PrsStream./
-	$getNonASCIICharKindMethodImpl 
-	    /.if (c == '\u00AB') {
-              return Char_LG;
-          }
-          if (c == '\u00BB') {
-              return Char_RG;
-          }
-          if (c == '\u00b4') {
-              return Char_Acute; // For OCLLexer
-          }
-          return Char_AfterASCII;
-        ./
-%End
-
-%Export
-	TEXT
-	LG
---	RG
-%End
-
-%Terminals
-	AfterASCII
-	LG ::= '\u00AB'
-	RG ::= '\u00BB'
-%End
-
-%Rules
-	Token ::= LG
-		/.$BeginAction
-			makeToken($_LG);
-		$EndAction./
-
-	Token ::= RG textAny lgOpt
-		/.$BeginAction
-			makeToken($_TEXT);
-		$EndAction./
-
-	textAny -> %empty
-	textAny -> textAny textAnyChars
-	textAnyChars -> AfterASCII | NotSlashOrStar | '*' | '/' | CtlCharNotWS
-
-	-- lgOpt -> EOF | LG
-	lgOpt -> %empty
-	lgOpt -> LG
-
-	Token ::= R E M RG commentAny lgPlus E N D R E M 
-		/.$BeginAction
-			skipToken();
-		$EndAction./
-
-	commentAny -> %empty
-	commentAny -> commentAny commentChar 
-	commentAny -> commentAny LG commentCharNotE
-	commentAny -> commentAny LG E commentCharNotN
-	commentAny -> commentAny LG E N commentCharNotD
-	commentAny -> commentAny LG E N D commentCharNotR
-	commentAny -> commentAny LG E N D R commentCharNotE
-	commentAny -> commentAny LG E N D R E commentCharNotM
-
-	commentChar -> commentCharNoUpper | UpperCaseLetter
-
-	commentCharNoUpper -> AfterASCII | Digit | SpecialNotSlash | WSChar | RG | '*' | '/' | CtlCharNotWS | LowerCaseLetter | '_' 
-
-	commentCharNotE ::= commentCharNoUpper | UpperCaseLetterWithoutENDRM | N | D | R | M 
-	commentCharNotN ::= commentCharNoUpper | UpperCaseLetterWithoutENDRM | E | D | R | M
-	commentCharNotD ::= commentCharNoUpper | UpperCaseLetterWithoutENDRM | E | N | R | M
-	commentCharNotR ::= commentCharNoUpper | UpperCaseLetterWithoutENDRM | E | N | D | M
-	commentCharNotM ::= commentCharNoUpper | UpperCaseLetterWithoutENDRM | E | N | D | R
-
-	UpperCaseLetterWithoutENDRM -> A | B | C | F | G | H | I | J | K | L | O | P | Q | S | T | U | V | W | X | Y | Z
-	
-	lgPlus ::= LG | lgPlus LG
-%End
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexer.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexer.java
deleted file mode 100644
index d2ac1dbae7f..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexer.java
+++ /dev/null
@@ -1,747 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException.ErrorLocationInfo;
-
-import lpg.runtime.LexParser;
-import lpg.runtime.LexStream;
-import lpg.runtime.LpgLexStream;
-import lpg.runtime.Monitor;
-import lpg.runtime.ParseTable;
-import lpg.runtime.PrsStream;
-import lpg.runtime.RuleAction;
-
-public class XpandLexer extends LpgLexStream implements XpandParsersym, XpandLexersym, RuleAction {
-
-	private static ParseTable prs = new XpandLexerprs();
-
-	private PrsStream prsStream;
-
-	private final LexParser lexParser = new LexParser(this, prs, this);
-
-	private XpandKWLexer kwLexer;
-
-	public PrsStream getPrsStream() {
-		return prsStream;
-	}
-
-	public int getToken(int i) {
-		return lexParser.getToken(i);
-	}
-
-	public int getRhsFirstTokenIndex(int i) {
-		return lexParser.getFirstToken(i);
-	}
-
-	public int getRhsLastTokenIndex(int i) {
-		return lexParser.getLastToken(i);
-	}
-
-	public int getLeftSpan() {
-		return lexParser.getFirstToken();
-	}
-
-	public int getRightSpan() {
-		return lexParser.getLastToken();
-	}
-
-	public XpandLexer(char[] input_chars, String filename, int tab) {
-		super(input_chars, filename, tab);
-	}
-
-	public XpandLexer(char[] input_chars, String filename) {
-		this(input_chars, filename, 4);
-	}
-
-	public String[] orderedExportedSymbols() {
-		return XpandParsersym.orderedTerminalSymbols;
-	}
-
-	public LexStream getLexStream() {
-		return (LexStream) this;
-	}
-
-	public int[] getKeywordKinds() {
-		return kwLexer.getKeywordKinds();
-	}
-
-	public void lexer(PrsStream prsStream) {
-		lexer(null, prsStream);
-	}
-
-	public void lexer(Monitor monitor, PrsStream prsStream) {
-		if (getInputChars() == null) {
-			throw new NullPointerException("LexStream was not initialized");
-		}
-
-		this.prsStream = prsStream;
-		resetErrors();
-
-		prsStream.makeToken(0, 0, 0); // Token list must start with a bad token
-
-		lexParser.parseCharacters(monitor); // Lex the input characters
-
-		int i = getStreamIndex();
-		prsStream.makeToken(i, i, XpandParsersym.TK_EOF_TOKEN); // and end with
-																// the end of
-																// file token
-		prsStream.setStreamLength(prsStream.getSize());
-
-		return;
-	}
-
-	@Override
-	public void initialize(char[] content, String filename) {
-		super.initialize(content, filename);
-		if (this.kwLexer == null) {
-			this.kwLexer = new XpandKWLexer(getInputChars(), XpandParsersym.TK_IDENTIFIER);
-		} else {
-			this.kwLexer.setInputChars(getInputChars());
-		}
-	}
-
-	final void makeToken(int kind) {
-		int startOffset = getLeftSpan(), endOffset = getRightSpan();
-		makeToken(startOffset, endOffset, kind);
-	}
-
-	final void makeComment(int kind) {
-		int startOffset = getLeftSpan(), endOffset = getRightSpan();
-		super.getPrsStream().makeAdjunct(startOffset, endOffset, kind);
-	}
-
-	final void skipToken() {
-	}
-
-	final void checkForKeyWord() {
-		int startOffset = getLeftSpan(), endOffset = getRightSpan(), kwKind = kwLexer.lexer(startOffset, endOffset);
-		makeToken(startOffset, endOffset, kwKind);
-	}
-
-	// aux data for getKind method
-	private final int tokenKind[] = { Char_CtlCharNotWS, // 000 0x00
-			Char_CtlCharNotWS, // 001 0x01
-			Char_CtlCharNotWS, // 002 0x02
-			Char_CtlCharNotWS, // 003 0x03
-			Char_CtlCharNotWS, // 004 0x04
-			Char_CtlCharNotWS, // 005 0x05
-			Char_CtlCharNotWS, // 006 0x06
-			Char_CtlCharNotWS, // 007 0x07
-			Char_CtlCharNotWS, // 008 0x08
-			Char_HT, // 009 0x09
-			Char_LF, // 010 0x0A
-			Char_CtlCharNotWS, // 011 0x0B
-			Char_FF, // 012 0x0C
-			Char_CR, // 013 0x0D
-			Char_CtlCharNotWS, // 014 0x0E
-			Char_CtlCharNotWS, // 015 0x0F
-			Char_CtlCharNotWS, // 016 0x10
-			Char_CtlCharNotWS, // 017 0x11
-			Char_CtlCharNotWS, // 018 0x12
-			Char_CtlCharNotWS, // 019 0x13
-			Char_CtlCharNotWS, // 020 0x14
-			Char_CtlCharNotWS, // 021 0x15
-			Char_CtlCharNotWS, // 022 0x16
-			Char_CtlCharNotWS, // 023 0x17
-			Char_CtlCharNotWS, // 024 0x18
-			Char_CtlCharNotWS, // 025 0x19
-			Char_CtlCharNotWS, // 026 0x1A
-			Char_CtlCharNotWS, // 027 0x1B
-			Char_CtlCharNotWS, // 028 0x1C
-			Char_CtlCharNotWS, // 029 0x1D
-			Char_CtlCharNotWS, // 030 0x1E
-			Char_CtlCharNotWS, // 031 0x1F
-			Char_Space, // 032 0x20
-			Char_Exclamation, // 033 0x21
-			Char_DoubleQuote, // 034 0x22
-			Char_Sharp, // 035 0x23
-			Char_DollarSign, // 036 0x24
-			Char_Percent, // 037 0x25
-			Char_Ampersand, // 038 0x26
-			Char_SingleQuote, // 039 0x27
-			Char_LeftParen, // 040 0x28
-			Char_RightParen, // 041 0x29
-			Char_Star, // 042 0x2A
-			Char_Plus, // 043 0x2B
-			Char_Comma, // 044 0x2C
-			Char_Minus, // 045 0x2D
-			Char_Dot, // 046 0x2E
-			Char_Slash, // 047 0x2F
-			Char_0, // 048 0x30
-			Char_1, // 049 0x31
-			Char_2, // 050 0x32
-			Char_3, // 051 0x33
-			Char_4, // 052 0x34
-			Char_5, // 053 0x35
-			Char_6, // 054 0x36
-			Char_7, // 055 0x37
-			Char_8, // 056 0x38
-			Char_9, // 057 0x39
-			Char_Colon, // 058 0x3A
-			Char_SemiColon, // 059 0x3B
-			Char_LessThan, // 060 0x3C
-			Char_Equal, // 061 0x3D
-			Char_GreaterThan, // 062 0x3E
-			Char_QuestionMark, // 063 0x3F
-			Char_AtSign, // 064 0x40
-			Char_A, // 065 0x41
-			Char_B, // 066 0x42
-			Char_C, // 067 0x43
-			Char_D, // 068 0x44
-			Char_E, // 069 0x45
-			Char_F, // 070 0x46
-			Char_G, // 071 0x47
-			Char_H, // 072 0x48
-			Char_I, // 073 0x49
-			Char_J, // 074 0x4A
-			Char_K, // 075 0x4B
-			Char_L, // 076 0x4C
-			Char_M, // 077 0x4D
-			Char_N, // 078 0x4E
-			Char_O, // 079 0x4F
-			Char_P, // 080 0x50
-			Char_Q, // 081 0x51
-			Char_R, // 082 0x52
-			Char_S, // 083 0x53
-			Char_T, // 084 0x54
-			Char_U, // 085 0x55
-			Char_V, // 086 0x56
-			Char_W, // 087 0x57
-			Char_X, // 088 0x58
-			Char_Y, // 089 0x59
-			Char_Z, // 090 0x5A
-			Char_LeftBracket, // 091 0x5B
-			Char_BackSlash, // 092 0x5C
-			Char_RightBracket, // 093 0x5D
-			Char_Caret, // 094 0x5E
-			Char__, // 095 0x5F
-			Char_BackQuote, // 096 0x60
-			Char_a, // 097 0x61
-			Char_b, // 098 0x62
-			Char_c, // 099 0x63
-			Char_d, // 100 0x64
-			Char_e, // 101 0x65
-			Char_f, // 102 0x66
-			Char_g, // 103 0x67
-			Char_h, // 104 0x68
-			Char_i, // 105 0x69
-			Char_j, // 106 0x6A
-			Char_k, // 107 0x6B
-			Char_l, // 108 0x6C
-			Char_m, // 109 0x6D
-			Char_n, // 110 0x6E
-			Char_o, // 111 0x6F
-			Char_p, // 112 0x70
-			Char_q, // 113 0x71
-			Char_r, // 114 0x72
-			Char_s, // 115 0x73
-			Char_t, // 116 0x74
-			Char_u, // 117 0x75
-			Char_v, // 118 0x76
-			Char_w, // 119 0x77
-			Char_x, // 120 0x78
-			Char_y, // 121 0x79
-			Char_z, // 122 0x7A
-			Char_LeftBrace, // 123 0x7B
-			Char_VerticalBar, // 124 0x7C
-			Char_RightBrace, // 125 0x7D
-			Char_Tilde, // 126 0x7E
-						// [artem] As I understand, there's no need to specify
-						// characters other than those
-						// we'll try to access by index from getKind method
-						// (iow, this array is auxilary
-						// as I indicated in its comment). Thus, there seems to
-						// be no reason to specify
-						// Char_Acute here as it's done in OCL's LexerBasicMap.g
-			Char_AfterASCII, // for all chars in range 128..65534
-			Char_EOF // for '\uffff' or 65535
-	};
-
-	// Classify character at ith location
-	@Override
-	public final int getKind(int i) {
-		char c = (i >= getStreamLength() ? '\uffff' : getCharValue(i));
-		return (c < 128 // ASCII Character
-		? tokenKind[c]
-				: c == '\uffff' ? Char_EOF : getNonAsciiKind(c));
-
-	}
-
-	private final static int getNonAsciiKind(char c) {
-		if (c == '\u00AB') {
-			return Char_LG;
-		}
-		if (c == '\u00BB') {
-			return Char_RG;
-		}
-		if (c == '\u00b4') {
-			return Char_Acute; // For OCLLexer
-		}
-		return Char_AfterASCII;
-
-	}
-
-	public ErrorLocationInfo[] getErrors() {
-		return errors.toArray(new ErrorLocationInfo[errors.size()]);
-	}
-
-	private void resetErrors() {
-		errors.clear();
-	}
-
-	private final List<ErrorLocationInfo> errors = new LinkedList<ErrorLocationInfo>();
-
-	@Override
-	public void reportError(int errorCode, int leftToken, int errorToken, int rightToken, String errorInfo[]) {
-		StringBuilder sb = new StringBuilder("(");
-		sb.append(errorCode);
-		sb.append(") ");
-		if (errorInfo != null) {
-			for (int i = 0; i < errorInfo.length; i++) {
-				if (sb.length() > 0) {
-					sb.append("; ");
-				}
-				sb.append(errorInfo[i]);
-			}
-		}
-		errors.add(new ErrorLocationInfo(sb.toString(), getLine(leftToken), getColumn(leftToken), getEndLine(rightToken), getEndColumn(rightToken)));
-	}
-
-	public void ruleAction(int ruleNumber) {
-		switch (ruleNumber) {
-
-		//
-		// Rule 1: Token ::= Identifier
-		//
-		case 1: {
-			checkForKeyWord();
-			break;
-		}
-
-			//
-			// Rule 2: Token ::= SingleQuote SLNotSQOpt SingleQuote
-			//
-		case 2: {
-			makeToken(XpandParsersym.TK_STRING_LITERAL);
-			break;
-		}
-
-			//
-			// Rule 3: Token ::= Acute SLNotSQOpt Acute
-			//
-		case 3: {
-			makeToken(XpandParsersym.TK_STRING_LITERAL);
-			break;
-		}
-
-			//
-			// Rule 4: Token ::= BackQuote SLNotSQOpt Acute
-			//
-		case 4: {
-			makeToken(XpandParsersym.TK_STRING_LITERAL);
-			break;
-		}
-
-			//
-			// Rule 5: Token ::= IntegerLiteral
-			//
-		case 5:
-			break;
-
-		//
-		// Rule 6: Token ::= IntegerLiteral DotToken
-		//
-		case 6:
-			break;
-
-		//
-		// Rule 7: Token ::= IntegerLiteral DotDotToken
-		//
-		case 7:
-			break;
-
-		//
-		// Rule 8: Token ::= RealLiteral
-		//
-		case 8: {
-			makeToken(XpandParsersym.TK_REAL_LITERAL);
-			break;
-		}
-
-			//
-			// Rule 9: Token ::= SLC
-			//
-		case 9: {
-			makeComment(XpandParsersym.TK_SINGLE_LINE_COMMENT);
-			break;
-		}
-
-			//
-			// Rule 10: Token ::= / * Inside Stars /
-			//
-		case 10: {
-			makeComment(XpandParsersym.TK_MULTI_LINE_COMMENT);
-			break;
-		}
-
-			//
-			// Rule 11: Token ::= WS
-			//
-		case 11: {
-			skipToken();
-			break;
-		}
-
-			//
-			// Rule 12: Token ::= +
-			//
-		case 12: {
-			makeToken(XpandParsersym.TK_PLUS);
-			break;
-		}
-
-			//
-			// Rule 13: Token ::= -
-			//
-		case 13: {
-			makeToken(XpandParsersym.TK_MINUS);
-			break;
-		}
-
-			//
-			// Rule 14: Token ::= *
-			//
-		case 14: {
-			makeToken(XpandParsersym.TK_MULTIPLY);
-			break;
-		}
-
-			//
-			// Rule 15: Token ::= /
-			//
-		case 15: {
-			makeToken(XpandParsersym.TK_DIVIDE);
-			break;
-		}
-
-			//
-			// Rule 16: Token ::= (
-			//
-		case 16: {
-			makeToken(XpandParsersym.TK_LPAREN);
-			break;
-		}
-
-			//
-			// Rule 17: Token ::= )
-			//
-		case 17: {
-			makeToken(XpandParsersym.TK_RPAREN);
-			break;
-		}
-
-			//
-			// Rule 18: Token ::= >
-			//
-		case 18: {
-			makeToken(XpandParsersym.TK_GREATER);
-			break;
-		}
-
-			//
-			// Rule 19: Token ::= <
-			//
-		case 19: {
-			makeToken(XpandParsersym.TK_LESS);
-			break;
-		}
-
-			//
-			// Rule 20: Token ::= =
-			//
-		case 20: {
-			makeToken(XpandParsersym.TK_EQUAL);
-			break;
-		}
-
-			//
-			// Rule 21: Token ::= > =
-			//
-		case 21: {
-			makeToken(XpandParsersym.TK_GREATER_EQUAL);
-			break;
-		}
-
-			//
-			// Rule 22: Token ::= < =
-			//
-		case 22: {
-			makeToken(XpandParsersym.TK_LESS_EQUAL);
-			break;
-		}
-
-			//
-			// Rule 23: Token ::= < >
-			//
-		case 23: {
-			makeToken(XpandParsersym.TK_NOT_EQUAL);
-			break;
-		}
-
-			//
-			// Rule 24: Token ::= [
-			//
-		case 24: {
-			makeToken(XpandParsersym.TK_LBRACKET);
-			break;
-		}
-
-			//
-			// Rule 25: Token ::= ]
-			//
-		case 25: {
-			makeToken(XpandParsersym.TK_RBRACKET);
-			break;
-		}
-
-			//
-			// Rule 26: Token ::= {
-			//
-		case 26: {
-			makeToken(XpandParsersym.TK_LBRACE);
-			break;
-		}
-
-			//
-			// Rule 27: Token ::= }
-			//
-		case 27: {
-			makeToken(XpandParsersym.TK_RBRACE);
-			break;
-		}
-
-			//
-			// Rule 28: Token ::= - >
-			//
-		case 28: {
-			makeToken(XpandParsersym.TK_ARROW);
-			break;
-		}
-
-			//
-			// Rule 29: Token ::= |
-			//
-		case 29: {
-			makeToken(XpandParsersym.TK_BAR);
-			break;
-		}
-
-			//
-			// Rule 30: Token ::= ,
-			//
-		case 30: {
-			makeToken(XpandParsersym.TK_COMMA);
-			break;
-		}
-
-			//
-			// Rule 31: Token ::= :
-			//
-		case 31: {
-			makeToken(XpandParsersym.TK_COLON);
-			break;
-		}
-
-			//
-			// Rule 32: Token ::= : :
-			//
-		case 32: {
-			makeToken(XpandParsersym.TK_COLONCOLON);
-			break;
-		}
-
-			//
-			// Rule 33: Token ::= ;
-			//
-		case 33: {
-			makeToken(XpandParsersym.TK_SEMICOLON);
-			break;
-		}
-
-			//
-			// Rule 34: Token ::= DotToken
-			//
-		case 34:
-			break;
-
-		//
-		// Rule 35: DotToken ::= .
-		//
-		case 35: {
-			makeToken(XpandParsersym.TK_DOT);
-			break;
-		}
-
-			//
-			// Rule 36: Token ::= DotDotToken
-			//
-		case 36:
-			break;
-
-		//
-		// Rule 37: DotDotToken ::= . .
-		//
-		case 37: {
-			makeToken(XpandParsersym.TK_DOTDOT);
-			break;
-		}
-
-			//
-			// Rule 38: IntegerLiteral ::= Integer
-			//
-		case 38: {
-			makeToken(XpandParsersym.TK_INTEGER_LITERAL);
-			break;
-		}
-
-			//
-			// Rule 263: Token ::= : =
-			//
-		case 263: {
-			makeToken(XpandParsersym.TK_RESET_ASSIGN);
-			break;
-		}
-
-			//
-			// Rule 264: Token ::= + =
-			//
-		case 264: {
-			makeToken(XpandParsersym.TK_ADD_ASSIGN);
-			break;
-		}
-
-			//
-			// Rule 265: Token ::= !
-			//
-		case 265: {
-			makeToken(XpandParsersym.TK_EXCLAMATION_MARK);
-			break;
-		}
-
-			//
-			// Rule 266: Token ::= : : =
-			//
-		case 266: {
-			makeToken(XpandParsersym.TK_COLONCOLONEQUAL);
-			break;
-		}
-
-			//
-			// Rule 267: Token ::= ?
-			//
-		case 267: {
-			makeToken(XpandParsersym.TK_QUESTIONMARK);
-			break;
-		}
-
-			//
-			// Rule 274: Token ::= DoubleQuote SLNotDQOpt DoubleQuote
-			//
-		case 274: {
-			makeToken(XpandParsersym.TK_STRING_LITERAL);
-			break;
-		}
-
-			//
-			// Rule 278: Token ::= < <
-			//
-		case 278: {
-			makeToken(XpandParsersym.TK_STEREOTYPE_QUALIFIER_OPEN);
-			break;
-		}
-
-			//
-			// Rule 279: Token ::= > >
-			//
-		case 279: {
-			makeToken(XpandParsersym.TK_STEREOTYPE_QUALIFIER_CLOSE);
-			break;
-		}
-
-			//
-			// Rule 280: Token ::= . . .
-			//
-		case 280: {
-			makeToken(XpandParsersym.TK_MULTIPLICITY_RANGE);
-			break;
-		}
-
-			//
-			// Rule 281: Token ::= ~
-			//
-		case 281: {
-			makeToken(XpandParsersym.TK_TILDE_SIGN);
-			break;
-		}
-
-			//
-			// Rule 282: Token ::= ! =
-			//
-		case 282: {
-			makeToken(XpandParsersym.TK_NOT_EQUAL_EXEQ);
-			break;
-		}
-
-			//
-			// Rule 283: Token ::= @
-			//
-		case 283: {
-			makeToken(XpandParsersym.TK_AT_SIGN);
-			break;
-		}
-
-			//
-			// Rule 284: Token ::= LG
-			//
-		case 284: {
-			makeToken(XpandParsersym.TK_LG);
-			break;
-		}
-			//
-			// Rule 285: Token ::= RG textAny lgOpt
-			//
-		case 285: {
-			makeToken(XpandParsersym.TK_TEXT);
-			break;
-		}
-			//
-			// Rule 295: Token ::= R E M RG commentAny lgPlus E N D R E M
-			//
-		case 295: {
-			skipToken();
-			break;
-		}
-
-		default:
-			break;
-		}
-		return;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexerprs.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexerprs.java
deleted file mode 100644
index 86ecfef3941..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexerprs.java
+++ /dev/null
@@ -1,824 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-public class XpandLexerprs implements lpg.runtime.ParseTable, XpandLexersym {
-    public final static int ERROR_SYMBOL = 0;
-    public final int getErrorSymbol() { return ERROR_SYMBOL; }
-
-    public final static int SCOPE_UBOUND = 0;
-    public final int getScopeUbound() { return SCOPE_UBOUND; }
-
-    public final static int SCOPE_SIZE = 0;
-    public final int getScopeSize() { return SCOPE_SIZE; }
-
-    public final static int MAX_NAME_LENGTH = 0;
-    public final int getMaxNameLength() { return MAX_NAME_LENGTH; }
-
-    public final static int NUM_STATES = 60;
-    public final int getNumStates() { return NUM_STATES; }
-
-    public final static int NT_OFFSET = 106;
-    public final int getNtOffset() { return NT_OFFSET; }
-
-    public final static int LA_STATE_OFFSET = 1021;
-    public final int getLaStateOffset() { return LA_STATE_OFFSET; }
-
-    public final static int MAX_LA = 6;
-    public final int getMaxLa() { return MAX_LA; }
-
-    public final static int NUM_RULES = 368;
-    public final int getNumRules() { return NUM_RULES; }
-
-    public final static int NUM_NONTERMINALS = 49;
-    public final int getNumNonterminals() { return NUM_NONTERMINALS; }
-
-    public final static int NUM_SYMBOLS = 155;
-    public final int getNumSymbols() { return NUM_SYMBOLS; }
-
-    public final static int SEGMENT_SIZE = 8192;
-    public final int getSegmentSize() { return SEGMENT_SIZE; }
-
-    public final static int START_STATE = 369;
-    public final int getStartState() { return START_STATE; }
-
-    public final static int IDENTIFIER_SYMBOL = 0;
-    public final int getIdentifier_SYMBOL() { return IDENTIFIER_SYMBOL; }
-
-    public final static int EOFT_SYMBOL = 106;
-    public final int getEoftSymbol() { return EOFT_SYMBOL; }
-
-    public final static int EOLT_SYMBOL = 107;
-    public final int getEoltSymbol() { return EOLT_SYMBOL; }
-
-    public final static int ACCEPT_ACTION = 652;
-    public final int getAcceptAction() { return ACCEPT_ACTION; }
-
-    public final static int ERROR_ACTION = 653;
-    public final int getErrorAction() { return ERROR_ACTION; }
-
-    public final static boolean BACKTRACK = false;
-    public final boolean getBacktrack() { return BACKTRACK; }
-
-    public final int getStartSymbol() { return lhs(0); }
-    public final boolean isValidForParser() { return XpandLexersym.isValidForParser; }
-
-
-    public interface IsNullable {
-        public final static byte isNullable[] = {0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,1,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,1,0,0,0,0,0,
-            0,0,0,1,1,1,0,1,0,0,
-            0,0,0,0,0
-        };
-    };
-    public final static byte isNullable[] = IsNullable.isNullable;
-    public final boolean isNullable(int index) { return isNullable[index] != 0; }
-
-    public interface ProsthesesIndex {
-        public final static byte prosthesesIndex[] = {0,
-            18,22,23,21,20,25,26,48,31,49,
-            13,28,33,4,16,35,6,7,15,19,
-            27,32,43,2,3,5,8,9,10,11,
-            12,14,17,24,29,30,34,36,37,38,
-            39,40,41,42,44,45,46,47,1
-        };
-    };
-    public final static byte prosthesesIndex[] = ProsthesesIndex.prosthesesIndex;
-    public final int prosthesesIndex(int index) { return prosthesesIndex[index]; }
-
-    public interface IsKeyword {
-        public final static byte isKeyword[] = {0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0
-        };
-    };
-    public final static byte isKeyword[] = IsKeyword.isKeyword;
-    public final boolean isKeyword(int index) { return isKeyword[index] != 0; }
-
-    public interface BaseCheck {
-        public final static byte baseCheck[] = {0,
-            1,3,3,3,1,2,2,1,1,5,
-            1,1,1,1,1,1,1,1,1,1,
-            2,2,2,1,1,1,1,2,1,1,
-            1,2,1,1,1,1,2,1,1,2,
-            2,3,2,2,0,1,2,2,2,1,
-            2,3,2,3,3,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,2,
-            1,2,2,2,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,2,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,2,1,2,
-            0,1,2,2,1,3,1,1,1,1,
-            1,1,1,3,0,1,2,2,2,3,
-            1,2,1,1,3,0,2,1,1,1,
-            1,1,0,1,12,0,2,3,4,5,
-            6,7,8,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,2
-        };
-    };
-    public final static byte baseCheck[] = BaseCheck.baseCheck;
-    public final int baseCheck(int index) { return baseCheck[index]; }
-    public final static byte rhs[] = baseCheck;
-    public final int rhs(int index) { return rhs[index]; };
-
-    public interface BaseAction {
-        public final static char baseAction[] = {
-            24,24,24,24,24,24,24,24,24,24,
-            24,24,24,24,24,24,24,24,24,24,
-            24,24,24,24,24,24,24,24,24,24,
-            24,24,24,24,24,17,24,18,26,27,
-            27,27,29,29,29,29,30,30,28,28,
-            11,11,32,19,19,19,5,5,5,5,
-            5,4,4,4,4,2,2,2,2,2,
-            2,2,2,2,2,2,2,2,2,2,
-            2,2,2,2,2,2,2,2,2,2,
-            2,3,3,3,3,3,3,3,3,3,
-            3,3,3,3,3,3,3,3,3,3,
-            3,3,3,3,3,3,3,1,1,1,
-            1,1,1,1,1,1,1,20,20,31,
-            31,25,25,25,25,34,34,34,34,34,
-            34,34,34,34,34,34,34,34,34,34,
-            34,34,34,34,34,34,34,34,34,34,
-            34,34,34,34,34,6,6,6,6,6,
-            6,6,6,6,6,6,6,6,6,6,
-            6,6,6,6,6,6,6,6,6,6,
-            6,6,6,6,7,7,7,7,7,7,
-            7,7,7,7,7,7,7,7,7,7,
-            7,7,7,7,7,7,7,7,7,7,
-            7,7,21,21,12,12,35,35,35,35,
-            9,15,15,15,15,33,33,33,33,33,
-            33,33,33,36,36,36,36,22,22,22,
-            22,22,13,13,13,13,13,37,37,16,
-            16,14,14,24,24,24,24,24,13,13,
-            13,22,22,22,24,38,38,28,24,24,
-            24,24,24,24,24,24,39,39,41,41,
-            41,41,41,40,40,24,42,42,42,42,
-            42,42,42,42,44,44,8,8,8,8,
-            8,8,8,8,8,8,23,23,23,23,
-            23,23,45,45,45,45,45,45,46,46,
-            46,46,46,46,47,47,47,47,47,47,
-            48,48,48,48,48,48,10,10,10,10,
-            10,10,10,10,10,10,10,10,10,10,
-            10,10,10,10,10,10,10,43,43,2072,
-            50,61,62,131,129,2282,133,61,62,132,
-            452,1656,248,61,62,247,34,36,222,2466,
-            251,101,1444,392,375,389,8,595,1155,2431,
-            399,416,249,257,130,1642,6,7,1760,253,
-            61,62,252,2398,51,224,2464,256,466,501,
-            254,259,520,2460,477,1760,253,61,62,252,
-            459,2365,224,2461,256,40,533,254,259,529,
-            502,477,1760,253,61,62,252,209,2268,224,
-            2467,256,2350,51,254,259,539,2434,477,1,
-            232,61,62,231,234,233,1864,248,61,62,
-            247,41,533,222,289,251,491,1968,253,61,
-            62,252,2409,51,224,2462,256,249,258,254,
-            260,1344,232,61,62,231,234,233,2470,285,
-            287,2379,106,307,314,305,44,309,308,2483,
-            304,2484,2178,244,61,62,243,2420,51,245,
-            1643,522,1448,232,61,62,231,234,233,1652,
-            211,307,314,2366,50,309,308,42,316,2432,
-            317,2387,50,2485,413,567,297,230,226,314,
-            307,314,482,298,309,308,2152,322,2067,323,
-            417,307,314,2387,50,309,308,2463,328,2277,
-            329,520,307,314,517,2278,309,308,2468,334,
-            2489,335,623,307,314,2438,51,309,308,2252,
-            316,653,317,653,299,1552,236,61,62,235,
-            2387,50,1138,307,314,302,300,309,308,653,
-            340,585,341,653,653,653,653,653,301,653,
-            653,653,653,653,653,653,653,653,49,239,
-            653,653,653,653,653,653,653,653,653,653,
-            653,653,653,653,653,653,653,653,653,653,
-            303,653,653
-        };
-    };
-    public final static char baseAction[] = BaseAction.baseAction;
-    public final int baseAction(int index) { return baseAction[index]; }
-    public final static char lhs[] = baseAction;
-    public final int lhs(int index) { return lhs[index]; };
-
-    public interface TermCheck {
-        public final static byte termCheck[] = {0,
-            0,1,2,3,4,5,6,7,8,9,
-            10,11,12,13,14,15,16,17,18,19,
-            20,21,22,23,24,25,26,27,28,29,
-            30,31,32,33,34,35,36,37,38,39,
-            40,41,42,43,44,45,46,47,48,49,
-            50,51,52,53,54,55,56,57,58,59,
-            60,61,62,63,64,65,66,67,68,69,
-            70,71,72,73,74,75,76,77,78,79,
-            80,81,82,83,84,85,86,87,88,89,
-            90,91,92,93,94,95,96,97,98,99,
-            0,101,102,103,104,0,1,2,3,4,
-            5,6,7,8,9,10,11,12,13,14,
-            15,16,17,18,19,20,21,22,23,24,
-            25,26,27,28,29,30,31,32,33,34,
-            35,36,37,38,39,40,41,42,43,44,
-            45,46,47,48,49,50,51,52,53,54,
-            55,56,57,58,59,60,61,62,63,64,
-            65,66,67,68,69,70,71,72,73,74,
-            75,76,77,78,79,80,81,82,83,84,
-            85,86,87,88,89,90,91,92,93,94,
-            95,96,97,98,99,100,101,102,0,104,
-            0,1,2,3,4,5,6,7,8,9,
-            10,11,12,13,14,15,16,17,18,19,
-            20,21,22,23,24,25,26,27,28,29,
-            30,31,32,33,34,35,36,37,38,39,
-            40,41,42,43,44,45,46,47,48,49,
-            50,51,52,53,54,55,56,57,58,59,
-            60,61,62,63,64,65,66,67,68,69,
-            70,71,72,73,74,75,76,77,78,79,
-            80,81,82,83,84,85,86,87,88,89,
-            90,91,92,93,94,95,96,97,98,99,
-            100,101,102,0,1,2,3,4,5,6,
-            7,8,9,10,11,12,13,14,15,16,
-            17,18,19,20,21,22,23,24,25,26,
-            27,28,29,30,31,32,33,34,35,36,
-            37,38,39,40,41,42,43,44,45,46,
-            47,48,49,50,51,52,53,54,55,56,
-            57,58,59,60,61,62,63,64,65,66,
-            67,68,69,70,71,72,73,74,75,76,
-            77,78,79,80,81,82,83,84,85,86,
-            87,88,89,90,91,92,93,94,95,96,
-            97,98,99,100,101,102,0,1,2,3,
-            4,5,6,7,8,9,10,11,12,13,
-            14,15,16,17,18,19,20,21,22,23,
-            24,25,26,27,28,29,30,31,32,33,
-            34,35,36,37,38,39,40,41,42,43,
-            44,45,46,47,48,49,50,51,52,53,
-            54,55,56,57,58,59,60,61,62,63,
-            64,65,66,67,68,69,70,71,72,73,
-            74,75,76,77,78,79,80,81,82,83,
-            84,85,86,87,88,89,90,91,92,93,
-            94,95,96,97,98,99,100,101,102,0,
-            1,2,3,4,5,6,7,8,9,10,
-            11,12,13,14,15,16,17,18,19,20,
-            21,22,23,24,25,26,27,28,29,30,
-            31,32,33,34,35,36,37,38,39,40,
-            41,42,43,44,45,46,47,48,49,50,
-            51,52,53,54,55,56,57,58,59,60,
-            61,62,63,64,65,66,67,68,69,70,
-            71,72,73,74,75,76,77,78,79,80,
-            81,82,83,84,85,86,87,88,89,90,
-            91,92,93,94,95,96,97,98,99,100,
-            101,102,0,1,2,3,4,5,6,7,
-            8,9,10,11,12,13,14,15,16,17,
-            18,19,20,21,22,23,24,25,26,27,
-            28,29,30,31,32,33,34,35,36,37,
-            38,39,40,41,42,43,44,45,46,47,
-            48,49,50,51,52,53,54,55,56,57,
-            58,59,60,61,62,63,64,65,66,67,
-            68,69,70,71,72,73,74,75,76,77,
-            78,79,80,81,82,83,84,85,86,87,
-            88,89,90,91,92,93,94,95,96,97,
-            98,99,100,101,102,0,1,2,3,4,
-            5,6,7,8,9,10,11,12,13,14,
-            15,16,17,18,19,20,21,22,23,24,
-            25,26,27,28,29,30,31,32,33,34,
-            35,36,37,38,39,40,41,42,43,44,
-            45,46,47,48,49,50,51,52,53,54,
-            55,56,57,58,59,60,61,62,63,64,
-            65,66,67,68,69,70,71,72,73,74,
-            75,76,77,78,79,80,81,82,83,84,
-            85,86,87,88,89,90,91,92,93,94,
-            95,96,97,98,99,100,101,102,0,1,
-            2,3,4,5,6,7,8,9,10,11,
-            12,13,14,15,16,17,18,19,20,21,
-            22,23,24,25,26,27,28,29,30,31,
-            32,33,34,35,36,37,38,39,40,41,
-            42,43,44,45,46,47,48,49,50,51,
-            52,53,54,55,56,57,58,59,60,61,
-            62,63,64,65,66,67,68,69,70,71,
-            72,73,74,75,76,77,78,79,80,81,
-            82,83,84,85,86,87,88,89,90,91,
-            92,93,94,95,96,97,98,99,100,101,
-            102,0,1,2,3,4,5,6,7,8,
-            9,10,11,12,13,14,15,16,17,18,
-            19,20,21,22,23,24,25,26,27,28,
-            29,30,31,32,33,34,35,36,37,38,
-            39,40,41,42,43,44,45,46,47,48,
-            49,50,51,52,53,54,55,56,57,58,
-            59,60,61,62,63,64,65,66,67,68,
-            69,70,71,72,73,74,75,76,77,78,
-            79,80,81,82,83,84,85,86,87,88,
-            89,90,91,92,93,94,95,96,97,98,
-            99,100,101,102,0,1,2,3,4,5,
-            6,7,8,9,10,11,12,13,14,15,
-            16,17,18,19,20,21,22,23,24,25,
-            26,27,28,29,30,31,32,33,34,35,
-            36,37,38,39,40,41,42,43,44,45,
-            46,47,48,49,50,51,52,53,54,55,
-            56,57,58,59,60,61,62,63,64,65,
-            66,67,68,69,70,71,72,73,74,75,
-            76,77,78,79,80,81,82,83,84,85,
-            86,87,88,89,90,91,92,93,94,95,
-            96,97,98,99,100,101,102,0,1,2,
-            3,4,5,6,7,8,9,10,11,12,
-            13,14,15,16,0,18,19,20,21,22,
-            23,24,25,26,27,28,29,30,31,32,
-            33,34,35,36,37,38,39,40,41,42,
-            43,44,45,46,47,48,49,50,51,52,
-            53,54,55,56,57,58,59,60,61,62,
-            63,64,65,66,67,68,69,70,71,72,
-            73,74,75,76,77,78,79,80,81,82,
-            83,84,85,86,87,88,89,90,91,92,
-            93,94,95,96,97,98,99,100,101,102,
-            0,1,2,3,4,5,6,7,8,9,
-            10,11,12,13,14,15,16,0,18,19,
-            20,21,22,23,24,25,26,27,28,29,
-            30,31,32,33,34,35,36,37,38,39,
-            40,41,42,43,44,45,46,47,48,49,
-            50,51,52,53,54,55,56,57,58,59,
-            60,61,62,63,64,65,66,67,68,69,
-            70,71,72,73,74,75,76,77,78,79,
-            80,81,82,83,84,85,86,87,88,89,
-            90,91,92,93,94,95,96,97,98,99,
-            100,101,102,0,1,2,3,4,5,6,
-            7,8,9,10,11,12,13,14,15,16,
-            17,18,19,20,21,22,23,24,25,26,
-            27,28,29,30,31,32,33,34,35,36,
-            37,38,39,40,41,42,43,44,45,46,
-            47,48,49,50,51,52,53,54,55,56,
-            57,58,59,60,61,62,63,64,65,66,
-            67,68,69,70,71,72,73,74,75,76,
-            77,78,79,80,81,82,83,84,85,86,
-            87,88,89,90,91,92,93,94,95,96,
-            97,98,99,0,0,0,103,0,1,2,
-            3,4,5,6,7,8,9,10,11,12,
-            13,14,15,16,17,18,19,20,21,22,
-            23,24,25,26,27,28,29,30,31,32,
-            33,34,35,36,37,38,39,40,41,42,
-            43,44,45,46,47,48,49,50,51,52,
-            53,54,55,56,57,58,59,60,61,62,
-            63,64,65,66,67,68,69,70,71,72,
-            73,74,75,76,77,78,79,80,81,82,
-            83,84,85,86,87,88,89,90,91,92,
-            93,94,95,96,97,98,99,0,0,106,
-            103,0,1,2,3,4,5,6,7,8,
-            9,10,11,12,13,14,15,16,17,18,
-            19,20,21,22,23,24,25,26,27,28,
-            29,30,31,32,33,34,35,36,37,38,
-            39,40,41,42,43,44,45,46,47,48,
-            49,50,51,52,53,54,55,56,57,58,
-            59,60,61,62,63,64,65,66,67,68,
-            69,70,71,72,73,74,75,76,77,78,
-            79,80,81,82,83,84,85,86,87,88,
-            89,0,0,92,93,94,95,96,97,98,
-            99,0,101,12,103,0,1,2,3,4,
-            5,6,7,8,9,10,11,12,13,14,
-            15,16,17,18,19,20,21,22,23,24,
-            25,26,27,28,29,30,31,32,33,34,
-            35,36,37,38,39,40,41,42,43,44,
-            45,46,47,48,49,50,51,52,53,54,
-            55,56,57,58,59,60,61,62,63,64,
-            65,66,67,68,69,70,71,72,73,74,
-            75,76,77,78,79,80,81,82,83,84,
-            85,86,87,88,89,90,91,105,93,94,
-            95,96,97,98,0,0,105,0,103,0,
-            1,2,3,4,5,6,7,8,9,10,
-            11,12,13,14,15,16,17,18,19,20,
-            21,22,23,24,25,26,27,28,29,30,
-            31,32,33,34,35,36,37,38,39,40,
-            41,42,43,44,45,46,47,48,49,50,
-            51,52,53,54,55,56,57,58,59,60,
-            61,62,63,64,65,66,67,68,69,70,
-            71,72,73,74,75,76,77,78,79,80,
-            81,82,83,84,85,86,87,88,89,90,
-            91,92,0,94,95,96,97,98,0,0,
-            0,0,103,0,1,2,3,4,5,6,
-            7,8,9,10,11,12,13,14,15,16,
-            17,18,19,20,21,22,23,24,25,26,
-            27,28,29,30,31,32,33,34,35,36,
-            37,38,39,40,41,42,43,44,45,46,
-            47,48,49,50,51,52,53,54,55,56,
-            57,58,59,60,61,62,63,64,65,66,
-            67,68,69,70,71,72,73,74,75,76,
-            77,78,79,80,81,82,83,84,85,86,
-            87,88,89,90,91,0,93,94,95,96,
-            97,98,0,0,0,0,103,0,1,2,
-            3,4,5,6,7,8,9,10,11,12,
-            13,14,15,16,17,18,19,20,21,22,
-            23,24,25,26,27,28,29,30,31,32,
-            33,34,35,36,37,38,39,40,41,42,
-            43,44,45,46,47,48,49,50,51,52,
-            53,54,55,56,57,58,59,60,61,62,
-            63,64,65,66,67,68,69,70,71,72,
-            73,74,75,76,77,78,79,80,81,82,
-            83,84,85,86,87,88,89,90,91,92,
-            0,94,95,96,97,98,0,0,0,0,
-            103,0,1,2,3,4,5,6,7,8,
-            9,10,11,12,13,14,15,16,17,18,
-            19,20,21,22,23,24,25,26,27,28,
-            29,30,31,32,33,34,35,36,37,38,
-            39,40,41,42,43,44,45,46,47,48,
-            49,50,51,52,53,54,55,56,57,58,
-            59,60,61,62,63,64,65,66,67,68,
-            69,70,71,72,73,74,75,76,77,78,
-            79,0,81,82,83,84,85,86,87,88,
-            89,90,91,92,93,0,100,100,17,0,
-            99,100,0,0,103,104,105,0,1,2,
-            3,4,5,6,7,8,9,10,11,12,
-            13,14,15,16,17,18,19,20,21,22,
-            23,24,25,26,27,28,29,30,31,32,
-            33,34,35,36,37,38,39,40,41,42,
-            43,44,45,46,47,48,49,50,51,52,
-            53,54,55,56,57,58,59,60,61,62,
-            63,64,65,66,67,68,69,70,71,72,
-            73,0,75,76,77,78,79,80,81,82,
-            83,84,85,86,87,88,89,0,17,92,
-            93,94,95,96,97,98,0,0,0,12,
-            103,0,1,2,3,4,5,6,7,8,
-            9,10,11,16,18,14,0,16,17,18,
-            19,0,21,22,23,24,25,26,27,28,
-            29,30,31,32,33,34,35,36,37,38,
-            39,40,41,42,43,44,45,46,47,48,
-            49,50,51,52,53,54,55,56,57,58,
-            59,60,61,62,63,64,65,66,67,0,
-            1,2,3,4,5,6,7,8,9,10,
-            11,80,13,14,0,0,1,2,3,4,
-            5,6,7,8,9,10,12,0,0,15,
-            0,0,0,0,103,20,0,1,2,3,
-            4,5,6,7,8,9,10,0,1,2,
-            3,4,5,6,7,8,9,10,0,1,
-            2,3,4,5,6,7,8,9,10,0,
-            1,2,3,4,5,6,7,8,9,10,
-            0,0,0,0,70,0,71,0,1,2,
-            3,4,5,6,7,8,9,10,0,1,
-            2,3,4,5,6,7,8,9,10,0,
-            0,0,0,0,0,0,0,0,0,0,
-            92,12,12,11,11,15,15,14,13,13,
-            11,20,0,0,0,17,19,0,0,0,
-            0,0,0,0,12,0,13,13,68,11,
-            0,0,0,0,74,72,73,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            90,91,0,0,93,0,0,0,69,99,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,104,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0
-        };
-    };
-    public final static byte termCheck[] = TermCheck.termCheck;
-    public final int termCheck(int index) { return termCheck[index]; }
-
-    public interface TermAction {
-        public final static char termAction[] = {0,
-            293,770,771,772,773,774,775,776,777,778,
-            779,748,844,841,722,843,747,756,757,761,
-            819,718,719,720,721,723,724,725,726,727,
-            728,729,730,731,732,733,734,735,736,737,
-            738,739,740,741,742,743,716,744,745,746,
-            749,750,751,752,753,754,755,758,759,760,
-            762,763,764,765,766,767,768,769,709,830,
-            842,818,944,943,712,834,823,824,825,826,
-            846,831,835,836,837,838,839,840,820,821,
-            710,711,822,832,827,845,828,829,833,713,
-            286,945,941,717,947,653,770,771,772,773,
-            774,775,776,777,778,779,748,844,841,722,
-            843,747,756,757,761,819,718,719,720,721,
-            723,724,725,726,727,728,729,730,731,732,
-            733,734,735,736,737,738,739,740,741,742,
-            743,968,744,745,746,749,750,751,752,753,
-            754,755,758,759,760,762,763,764,765,766,
-            767,768,769,709,830,842,818,965,964,712,
-            834,823,824,825,826,846,831,835,836,837,
-            838,839,840,820,821,710,711,822,832,827,
-            845,828,829,833,713,963,966,959,45,530,
-            367,770,771,772,773,774,775,776,777,778,
-            779,2056,844,841,722,843,972,974,971,973,
-            819,718,719,720,721,723,724,725,726,727,
-            728,729,730,731,732,733,734,735,736,737,
-            738,739,740,741,742,743,968,999,1000,1001,
-            1002,1003,1004,1005,1006,1007,1008,1009,1010,1011,
-            1012,1013,1014,1015,1016,1017,1018,1019,709,830,
-            842,818,965,964,712,834,823,824,825,826,
-            846,831,835,836,837,838,839,840,820,821,
-            710,711,822,832,827,845,828,829,833,713,
-            963,966,959,653,770,771,772,773,774,775,
-            776,777,778,779,977,844,841,722,843,978,
-            980,560,979,819,718,719,720,721,723,724,
-            725,726,727,728,729,730,731,732,733,734,
-            735,736,737,738,739,740,741,742,743,968,
-            999,1000,1001,1002,1003,1004,1005,1006,1007,1008,
-            1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,
-            1019,709,830,842,818,965,964,712,834,823,
-            824,825,826,846,831,835,836,837,838,839,
-            840,820,821,710,711,822,832,827,845,828,
-            829,833,713,963,966,959,653,770,771,772,
-            773,774,775,776,777,778,779,983,844,841,
-            722,843,571,986,984,985,819,718,719,720,
-            721,723,724,725,726,727,728,729,730,731,
-            732,733,734,735,736,737,738,739,740,741,
-            742,743,968,999,1000,1001,1002,1003,1004,1005,
-            1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,
-            1016,1017,1018,1019,709,830,842,818,965,964,
-            712,834,823,824,825,826,846,831,835,836,
-            837,838,839,840,820,821,710,711,822,832,
-            827,845,828,829,833,713,963,966,959,653,
-            770,771,772,773,774,775,776,777,778,779,
-            989,844,841,722,843,991,992,990,582,819,
-            718,719,720,721,723,724,725,726,727,728,
-            729,730,731,732,733,734,735,736,737,738,
-            739,740,741,742,743,968,999,1000,1001,1002,
-            1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,
-            1013,1014,1015,1016,1017,1018,1019,709,830,842,
-            818,965,964,712,834,823,824,825,826,846,
-            831,835,836,837,838,839,840,820,821,710,
-            711,822,832,827,845,828,829,833,713,963,
-            966,959,653,770,771,772,773,774,775,776,
-            777,778,779,602,844,841,722,843,972,974,
-            971,973,819,718,719,720,721,723,724,725,
-            726,727,728,729,730,731,732,733,734,735,
-            736,737,738,739,740,741,742,743,968,999,
-            1000,1001,1002,1003,1004,1005,1006,1007,1008,1009,
-            1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,
-            709,830,842,818,965,964,712,834,823,824,
-            825,826,846,831,835,836,837,838,839,840,
-            820,821,710,711,822,832,827,845,828,829,
-            833,713,963,966,959,653,549,549,549,549,
-            549,549,549,549,549,549,2262,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,653,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,1747,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,653,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,1850,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,653,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,1953,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,653,770,771,
-            772,773,774,775,776,777,778,779,995,844,
-            841,722,843,997,296,996,998,819,718,719,
-            720,721,723,724,725,726,727,728,729,730,
-            731,732,733,734,735,736,737,738,739,740,
-            741,742,743,968,999,1000,1001,1002,1003,1004,
-            1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,
-            1015,1016,1017,1018,1019,709,830,842,818,965,
-            964,712,834,823,824,825,826,846,831,835,
-            836,837,838,839,840,820,821,710,711,822,
-            832,827,845,828,829,833,713,963,966,959,
-            367,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,653,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,549,549,549,549,549,549,549,
-            549,549,549,653,770,771,772,773,774,775,
-            776,777,778,779,748,844,841,722,843,747,
-            756,757,761,819,718,719,720,721,723,724,
-            725,726,727,728,729,730,731,732,733,734,
-            735,736,737,738,739,740,741,742,743,716,
-            744,745,746,749,750,751,752,753,754,755,
-            758,759,760,762,763,764,765,766,767,768,
-            769,709,830,842,818,696,699,712,834,823,
-            824,825,826,846,831,835,836,837,838,839,
-            840,820,821,710,711,822,832,827,845,828,
-            829,833,713,653,653,653,717,653,770,771,
-            772,773,774,775,776,777,778,779,748,844,
-            841,722,843,747,756,757,761,819,718,719,
-            720,721,723,724,725,726,727,728,729,730,
-            731,732,733,734,735,736,737,738,739,740,
-            741,742,743,716,744,745,746,749,750,751,
-            752,753,754,755,758,759,760,762,763,764,
-            765,766,767,768,769,709,830,842,818,663,
-            700,712,834,823,824,825,826,846,831,835,
-            836,837,838,839,840,820,821,710,711,822,
-            832,827,845,828,829,833,713,653,653,652,
-            717,9,770,771,772,773,774,775,776,777,
-            778,779,748,815,812,722,814,747,756,757,
-            761,789,718,719,720,721,723,724,725,726,
-            727,728,729,730,731,732,733,734,735,736,
-            737,738,739,740,741,742,743,716,744,745,
-            746,749,750,751,752,753,754,755,758,759,
-            760,762,763,764,765,766,767,768,769,890,
-            801,813,788,790,891,893,805,794,795,796,
-            797,817,802,806,807,808,809,810,811,791,
-            792,265,653,793,803,798,816,799,800,804,
-            894,653,895,935,717,275,770,771,772,773,
-            774,775,776,777,778,779,748,872,869,722,
-            871,747,756,757,761,848,718,719,720,721,
-            723,724,725,726,727,728,729,730,731,732,
-            733,734,735,736,737,738,739,740,741,742,
-            743,716,744,745,746,749,750,751,752,753,
-            754,755,758,759,760,762,763,764,765,766,
-            767,768,769,903,860,870,847,849,852,924,
-            862,853,854,855,856,874,861,863,864,865,
-            866,867,868,850,851,925,926,657,876,857,
-            873,858,859,512,653,653,656,653,717,261,
-            770,771,772,773,774,775,776,777,778,779,
-            748,872,869,722,871,747,756,757,761,848,
-            718,719,720,721,723,724,725,726,727,728,
-            729,730,731,732,733,734,735,736,737,738,
-            739,740,741,742,743,716,744,745,746,749,
-            750,751,752,753,754,755,758,759,760,762,
-            763,764,765,766,767,768,769,908,860,870,
-            847,849,852,921,862,853,854,855,856,874,
-            861,863,864,865,866,867,868,850,851,922,
-            923,878,653,857,873,858,859,512,653,653,
-            653,653,717,276,770,771,772,773,774,775,
-            776,777,778,779,748,872,869,722,871,747,
-            756,757,761,848,718,719,720,721,723,724,
-            725,726,727,728,729,730,731,732,733,734,
-            735,736,737,738,739,740,741,742,743,716,
-            744,745,746,749,750,751,752,753,754,755,
-            758,759,760,762,763,764,765,766,767,768,
-            769,903,860,870,847,849,852,924,862,853,
-            854,855,856,874,861,863,864,865,866,867,
-            868,850,851,925,926,653,876,857,873,858,
-            859,512,653,653,653,653,717,262,770,771,
-            772,773,774,775,776,777,778,779,748,872,
-            869,722,871,747,756,757,761,848,718,719,
-            720,721,723,724,725,726,727,728,729,730,
-            731,732,733,734,735,736,737,738,739,740,
-            741,742,743,716,744,745,746,749,750,751,
-            752,753,754,755,758,759,760,762,763,764,
-            765,766,767,768,769,908,860,870,847,849,
-            852,921,862,853,854,855,856,874,861,863,
-            864,865,866,867,868,850,851,922,923,878,
-            653,857,873,858,859,512,653,108,653,653,
-            717,653,770,771,772,773,774,775,776,777,
-            778,779,748,673,450,722,433,747,756,757,
-            498,485,718,719,720,721,723,724,725,726,
-            727,728,729,730,731,732,733,734,735,736,
-            737,738,739,740,741,742,743,716,744,745,
-            746,749,750,751,752,753,754,755,758,759,
-            760,762,763,764,765,766,767,768,769,709,
-            423,431,448,457,667,712,682,405,936,408,
-            934,653,686,679,680,677,678,920,683,669,
-            670,710,711,381,442,653,398,556,558,653,
-            713,391,653,653,717,937,425,653,770,771,
-            772,773,774,775,776,777,778,779,748,872,
-            869,722,871,747,756,757,761,848,718,719,
-            720,721,723,724,725,726,727,728,729,730,
-            731,732,733,734,735,736,737,738,739,740,
-            741,742,743,716,744,745,746,749,750,751,
-            752,753,754,755,758,759,760,762,763,764,
-            765,766,767,768,769,899,860,870,847,849,
-            852,653,862,853,854,855,856,874,861,863,
-            864,865,866,867,868,850,851,12,948,880,
-            881,857,873,858,859,882,653,653,653,917,
-            717,1,770,771,772,773,774,775,776,777,
-            778,779,748,578,575,722,653,747,756,757,
-            761,653,718,719,720,721,723,724,725,726,
-            727,728,729,730,731,732,733,734,735,736,
-            737,738,739,740,741,742,743,716,744,745,
-            746,749,750,751,752,753,754,755,758,759,
-            760,762,763,764,765,766,767,768,769,38,
-            770,771,772,773,774,775,776,777,778,779,
-            780,787,3470,781,19,653,770,771,772,773,
-            774,775,776,777,778,779,675,653,653,676,
-            653,653,653,653,717,600,653,770,771,772,
-            773,774,775,776,777,778,779,53,770,771,
-            772,773,774,775,776,777,778,779,52,770,
-            771,772,773,774,775,776,777,778,779,55,
-            770,771,772,773,774,775,776,777,778,779,
-            11,653,653,15,931,653,563,54,770,771,
-            772,773,774,775,776,777,778,779,38,541,
-            541,541,541,541,541,541,541,541,541,31,
-            18,13,653,39,653,5,35,653,108,108,
-            927,916,674,569,780,932,681,781,511,543,
-            3490,701,32,35,37,3089,580,653,653,653,
-            653,653,653,653,919,653,690,933,709,589,
-            653,653,653,653,712,930,447,653,653,653,
-            653,653,653,653,653,653,653,653,653,653,
-            710,711,653,653,655,653,653,653,509,713,
-            653,653,653,653,653,653,653,653,653,653,
-            653,653,653,653,653,653,653,653,653,653,
-            653,653,653,653,653,653,653,653,653,653,
-            653,653,653,653,653,653,1021
-        };
-    };
-    public final static char termAction[] = TermAction.termAction;
-    public final int termAction(int index) { return termAction[index]; }
-    public final int asb(int index) { return 0; }
-    public final int asr(int index) { return 0; }
-    public final int nasb(int index) { return 0; }
-    public final int nasr(int index) { return 0; }
-    public final int terminalIndex(int index) { return 0; }
-    public final int nonterminalIndex(int index) { return 0; }
-    public final int scopePrefix(int index) { return 0;}
-    public final int scopeSuffix(int index) { return 0;}
-    public final int scopeLhs(int index) { return 0;}
-    public final int scopeLa(int index) { return 0;}
-    public final int scopeStateSet(int index) { return 0;}
-    public final int scopeRhs(int index) { return 0;}
-    public final int scopeState(int index) { return 0;}
-    public final int inSymb(int index) { return 0;}
-    public final String name(int index) { return null; }
-    public final int originalState(int state) { return 0; }
-    public final int asi(int state) { return 0; }
-    public final int nasi(int state) { return 0; }
-    public final int inSymbol(int state) { return 0; }
-
-    /**
-     * assert(! goto_default);
-     */
-    public final int ntAction(int state, int sym) {
-        return baseAction[state + sym];
-    }
-
-    /**
-     * assert(! shift_default);
-     */
-    public final int tAction(int state, int sym) {
-        int i = baseAction[state],
-            k = i + sym;
-        return termAction[termCheck[k] == sym ? k : i];
-    }
-    public final int lookAhead(int la_state, int sym) {
-        int k = la_state + sym;
-        return termAction[termCheck[k] == sym ? k : la_state];
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexersym.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexersym.java
deleted file mode 100644
index 2d0feff5297..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandLexersym.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-public interface XpandLexersym {
-    public final static int
-      Char_CtlCharNotWS = 101,
-      Char_LF = 90,
-      Char_CR = 91,
-      Char_HT = 74,
-      Char_FF = 99,
-      Char_a = 21,
-      Char_b = 22,
-      Char_c = 23,
-      Char_d = 24,
-      Char_e = 14,
-      Char_f = 25,
-      Char_g = 26,
-      Char_h = 27,
-      Char_i = 28,
-      Char_j = 29,
-      Char_k = 30,
-      Char_l = 31,
-      Char_m = 32,
-      Char_n = 33,
-      Char_o = 34,
-      Char_p = 35,
-      Char_q = 36,
-      Char_r = 37,
-      Char_s = 38,
-      Char_t = 39,
-      Char_u = 40,
-      Char_v = 41,
-      Char_w = 42,
-      Char_x = 43,
-      Char_y = 44,
-      Char_z = 45,
-      Char__ = 46,
-      Char_A = 47,
-      Char_B = 48,
-      Char_C = 49,
-      Char_D = 16,
-      Char_E = 11,
-      Char_F = 50,
-      Char_G = 51,
-      Char_H = 52,
-      Char_I = 53,
-      Char_J = 54,
-      Char_K = 55,
-      Char_L = 56,
-      Char_M = 17,
-      Char_N = 18,
-      Char_O = 57,
-      Char_P = 58,
-      Char_Q = 59,
-      Char_R = 19,
-      Char_S = 60,
-      Char_T = 61,
-      Char_U = 62,
-      Char_V = 63,
-      Char_W = 64,
-      Char_X = 65,
-      Char_Y = 66,
-      Char_Z = 67,
-      Char_0 = 1,
-      Char_1 = 2,
-      Char_2 = 3,
-      Char_3 = 4,
-      Char_4 = 5,
-      Char_5 = 6,
-      Char_6 = 7,
-      Char_7 = 8,
-      Char_8 = 9,
-      Char_9 = 10,
-      Char_AfterASCIINotAcute = 103,
-      Char_Space = 68,
-      Char_DoubleQuote = 92,
-      Char_SingleQuote = 93,
-      Char_Percent = 94,
-      Char_VerticalBar = 75,
-      Char_Exclamation = 76,
-      Char_AtSign = 77,
-      Char_BackQuote = 78,
-      Char_Acute = 105,
-      Char_Tilde = 79,
-      Char_Sharp = 95,
-      Char_DollarSign = 80,
-      Char_Ampersand = 96,
-      Char_Caret = 97,
-      Char_Colon = 69,
-      Char_SemiColon = 81,
-      Char_BackSlash = 98,
-      Char_LeftBrace = 82,
-      Char_RightBrace = 83,
-      Char_LeftBracket = 84,
-      Char_RightBracket = 85,
-      Char_QuestionMark = 86,
-      Char_Comma = 87,
-      Char_Dot = 13,
-      Char_LessThan = 70,
-      Char_GreaterThan = 15,
-      Char_Plus = 71,
-      Char_Minus = 20,
-      Char_Slash = 72,
-      Char_Star = 73,
-      Char_LeftParen = 88,
-      Char_RightParen = 89,
-      Char_Equal = 12,
-      Char_AfterASCII = 102,
-      Char_LG = 104,
-      Char_RG = 100,
-      Char_EOF = 106;
-
-    public final static String orderedTerminalSymbols[] = {
-                 "",
-                 "0",
-                 "1",
-                 "2",
-                 "3",
-                 "4",
-                 "5",
-                 "6",
-                 "7",
-                 "8",
-                 "9",
-                 "E",
-                 "Equal",
-                 "Dot",
-                 "e",
-                 "GreaterThan",
-                 "D",
-                 "M",
-                 "N",
-                 "R",
-                 "Minus",
-                 "a",
-                 "b",
-                 "c",
-                 "d",
-                 "f",
-                 "g",
-                 "h",
-                 "i",
-                 "j",
-                 "k",
-                 "l",
-                 "m",
-                 "n",
-                 "o",
-                 "p",
-                 "q",
-                 "r",
-                 "s",
-                 "t",
-                 "u",
-                 "v",
-                 "w",
-                 "x",
-                 "y",
-                 "z",
-                 "_",
-                 "A",
-                 "B",
-                 "C",
-                 "F",
-                 "G",
-                 "H",
-                 "I",
-                 "J",
-                 "K",
-                 "L",
-                 "O",
-                 "P",
-                 "Q",
-                 "S",
-                 "T",
-                 "U",
-                 "V",
-                 "W",
-                 "X",
-                 "Y",
-                 "Z",
-                 "Space",
-                 "Colon",
-                 "LessThan",
-                 "Plus",
-                 "Slash",
-                 "Star",
-                 "HT",
-                 "VerticalBar",
-                 "Exclamation",
-                 "AtSign",
-                 "BackQuote",
-                 "Tilde",
-                 "DollarSign",
-                 "SemiColon",
-                 "LeftBrace",
-                 "RightBrace",
-                 "LeftBracket",
-                 "RightBracket",
-                 "QuestionMark",
-                 "Comma",
-                 "LeftParen",
-                 "RightParen",
-                 "LF",
-                 "CR",
-                 "DoubleQuote",
-                 "SingleQuote",
-                 "Percent",
-                 "Sharp",
-                 "Ampersand",
-                 "Caret",
-                 "BackSlash",
-                 "FF",
-                 "RG",
-                 "CtlCharNotWS",
-                 "AfterASCII",
-                 "AfterASCIINotAcute",
-                 "LG",
-                 "Acute",
-                 "EOF"
-             };
-
-    public final static int numTokenKinds = orderedTerminalSymbols.length;
-    public final static boolean isValidForParser = true;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParser.g b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParser.g
deleted file mode 100644
index 6cad8130068..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParser.g
+++ /dev/null
@@ -1,546 +0,0 @@
---
--- Copyright (c) 2006, 2008 Borland Software Corp.
--- 
--- All rights reserved. This program and the accompanying materials
--- are made available under the terms of the Eclipse Public License 2.0
--- which accompanies this distribution, and is available at
--- https://www.eclipse.org/legal/epl-2.0/
---
--- Contributors:
---    Artem Tikhomirov (Borland)
---
-
-%options fp=XpandParser,prefix=TK_
-%options programming_language=java
-%options package=org.eclipse.papyrus.gmf.internal.xpand.parser
-%options template=../expression/parser/dtParserTemplateD.g
-%options ast_type=Template
-%options import_terminals=XpandLexer.g
-%options lalr=2
-%options include_directory="../expression/parser/;../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/cst;../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/lpg"
-
-%Globals
-	/.
-	import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.Identifier;
-	import org.eclipse.papyrus.gmf.internal.xpand.ast.*;
-	import org.eclipse.ocl.cst.*;
-	import java.util.Collections;
-
-	import org.eclipse.m2m.internal.qvt.oml.cst.SimpleSignatureCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.ParameterDeclarationCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.DirectionKindEnum;
-	import org.eclipse.m2m.internal.qvt.oml.cst.DirectionKindCS;
-	import org.eclipse.m2m.internal.qvt.oml.cst.TypeSpecCS;
-	
-	import org.eclipse.ocl.util.OCLStandardLibraryUtil;
-	import org.eclipse.ocl.utilities.PredefinedType;
-
-	./
-%End
-
-%Headers
-	/.
-		private final XpandFactory xpandFactory;
-	./
-%End
-
-%Start
-	template
-%End
-
-%Import
-	../../../../../../../../org.eclipse.m2m.qvt.oml.cst.parser/cst/ImperativeOCL.gi
-
-%DropRules
-	primaryNotNameCS -> switchExpCS
-	primaryNotNameCS -> whileExpCS
-	primaryNotNameCS -> computeExpCS
-	primaryNotNameCS -> newExpCS
-	IterateExpCS ::= primaryExpCS '->' switch '(' switchDeclaratorCS ')' switchBodyExpCS
-	IteratorExpCS ::= primaryExpCS '->' forExpCS
-	ifExpBodyCS -> expression_block
-	OclExpressionCS -> assignStatementCS
-	OclExpressionCS ::= primaryOCLExpressionCS
-	OclExpressionCS -> returnExpCS
-	OclExpressionCS -> var_init_exp
-
-%DropSymbols
-	logExpCS logWhenExp logWhenExpOpt
-	assertExpCS assertWithLogExp assertWithLogExpOpt severityKindCS severityKindCSOpt
-	oclExpressionCSOpt 
-	expression_statement
-	expression_block
-	switchExpCS
-	switchDeclaratorCS
-	switchBodyExpCS
-	switchAltExpCS
-	switchElseExpCSOpt
-	switchElseExpCS
-	switchAltExpCSList
-	whileExpCS
-	whileBodyCS
-	computeExpCS
-	forExpCS
-	forOpCode
-	forExpDeclaratorList
-	forExpConditionOpt
-	--
-	assignStatementCS
-	primaryOCLExpressionCS
-	returnExpCS
-	var_init_group_exp
-	var_init_exp
-	expression_list
-	expression_listOpt
-	expression_semi_list
-	expression_semi_list_element
-	var_init_declarator_list
-	var_init_declarator
-	var_init_op
-	newExpCS
-	qualifier
-	qualifierList
-	param
-	param_list
-	param_listOpt
-	colon_param_listOpt
-	complete_signature
-	simple_signature
-	simple_signatureOpt
-	param_direction 
-	param_directionOpt
-	typespec
-	typeCS2
-	scoped_identifier
-	scoped_identifier2
-	scoped_identifier_list
-	semicolonOpt
-	qualifiedNameCS
-	qvtIdentifierCS
-	reservedKeywordCS
-	otherKeywordCS
-	otherKeyword
---	simpleNameCS
-	newTypespecCS
-%End
-
--- FIXME need to fix $Notice section from EssentialOCL.g
-
--- factory method for QVT CST constructs
-%Include
-	AbstractQVTParser.gi
-%End
-
--- factory method for OCL CST constructs
-%Include
-	AbstractOCLParser.gi
-%End
-
--- unquote and setOffsets methods
-%Include
-	AbstractParser.gi
-%End
-
-%Define
-	-- definition of init code should go *after* import
-	$initialization_code /.xpandFactory = new XpandFactory(lexStream.getFileName());./
-	-- not to include all the stuff from EssentialOCL.g but rules
-	$parserCore /../
-	$copyright_contributions /.*   Borland Software Corporation - Xpand integration/support./
-
-	-- need to redefine so that one from ImperativeOCL.g doesn't inject it's own debug stuff
-	$BeginActions
-	/.
-		@SuppressWarnings("unchecked")
-		public void ruleAction(int ruleNumber) {
-			switch (ruleNumber) {
-	./
-	-- do not inject DEBUG variable as well.
-	$DebugModeOff /../
-%End
-
-%Terminals
-	IMPORT EXTENSION
-	AROUND ENDAROUND
-	DEFINE ENDDEFINE
-	ERROR
-	EXPAND
-	FOR SEPARATOR AS ITERATOR 
-	FOREACH ENDFOREACH
-	FILE ENDFILE
-	IF ELSEIF ELSE ENDIF
-	LET ENDLET
-	PROTECT CSTART CEND ID DISABLE ENDPROTECT
-
-	LG ::= '\u00AB'
-
---	RG ::= '\u00BB' -- useless
-%End
-
-%Rules
-
-	template ::= emptyTemplate
-		/.$BeginCode
-			setResult(xpandFactory.createTemplate(Collections.EMPTY_LIST, Collections.EMPTY_LIST, Collections.EMPTY_LIST, Collections.EMPTY_LIST, getRightIToken()));
-		$EndCode./
-
-	-- original xpand allows empty templates, not sure what for; added support to handle comments-only content
-	emptyTemplate -> %empty | LG TEXT commentTextPairAny
-
-	-- unlike original xpand, do not allow mixed order of imports (ext and regular)
-	template ::= LG commentTextPairAny imports extensionImports defineOrAroundSeq
-		/.$BeginCode
-			List imports = (List) getRhsSym(3);
-			List extensionImports = (List) getRhsSym(4);
-			List defineOrAround = (List) getRhsSym(5);
-			List<Advice> advices = new LinkedList<Advice>();
-			List<Definition> defines = new LinkedList<Definition>();
-			for (Object o : defineOrAround) {
-				if (o instanceof Definition) {
-					defines.add((Definition) o);
-				} else if (o instanceof Advice) {
-					advices.add((Advice) o);
-				} else {
-					throw new IllegalStateException();// assert false?
-				}
-			}
-			setResult(xpandFactory.createTemplate(imports, extensionImports, defines, advices, getRightIToken()));
-		$EndCode./
-
-	defineOrAroundSeq ::= define TEXT commentTextPairAny defineOrAroundSuffix
-		/.$BeginCode
-			List result = new LinkedList();
-			result.add(getRhsSym(1));
-			result.addAll((List) getRhsSym(4));
-			setResult(result);
-		$EndCode./
-	defineOrAroundSeq ::= around TEXT commentTextPairAny defineOrAroundSuffix 
-		/.$BeginCode
-			List result = new LinkedList();
-			result.add(getRhsSym(1));
-			result.addAll((List) getRhsSym(4));
-			setResult(result);
-		$EndCode./
-	defineOrAroundSuffix ::= %empty
-		/.$BeginCode
-			setResult(Collections.EMPTY_LIST);
-		$EndCode./
-	defineOrAroundSuffix -> defineOrAroundSeq
-
-	commentTextPairAny -> %empty | TEXT commentTextPairAny
-
-	imports ::= %empty
-		/.$BeginCode
-			setResult(Collections.EMPTY_LIST);
-		$EndCode./
-	imports ::= anImport imports
-		/.$BeginCode
-			List res = new LinkedList();
-			res.add(getRhsSym(1));
-			res.addAll((List) getRhsSym(2));
-			setResult(res);
-		$EndCode./
-
-	anImport ::= "IMPORT" StringLiteralExpCS TEXT commentTextPairAny 
-		/.$BeginCode
-			setResult(xpandFactory.createNamespaceImport(getLeftIToken(), (StringLiteralExpCS) getRhsSym(2)));
-		$EndCode./
-
-	extensionImports ::= %empty
-		/.$BeginCode
-			setResult(Collections.EMPTY_LIST);
-		$EndCode./
-	extensionImports ::= anExtensionImport extensionImports
-		/.$BeginCode
-			List res = new LinkedList();
-			res.add(getRhsSym(1));
-			res.addAll((List) getRhsSym(2));
-			setResult(res);
-		$EndCode./
-
-	anExtensionImport ::= "EXTENSION" pathNameCS TEXT commentTextPairAny 
-		/.$BeginCode
-			setResult(xpandFactory.createImportDeclaration(getLeftIToken(), (PathNameCS) getRhsSym(2)));
-		$EndCode./
-
-	around ::= "AROUND" pointcut "FOR" typeCS sequence "ENDAROUND"
-		/.$BeginCode
-			setResult(xpandFactory.createAround(getLeftIToken(), getRightIToken(), (Identifier) getRhsSym(2), Collections.<VariableCS>emptyList(), false, (TypeCS) getRhsSym(4), (List) getRhsSym(5)));
-		$EndCode./
-	around ::= "AROUND" pointcut LPAREN parametersList RPAREN "FOR" typeCS sequence "ENDAROUND"
-		/.$BeginCode
-			setResult(xpandFactory.createAround(getLeftIToken(), getRightIToken(), (Identifier) getRhsSym(2), (List<VariableCS>) getRhsSym(4), false, (TypeCS) getRhsSym(7), (List) getRhsSym(8)));
-		$EndCode./
-	around ::= "AROUND" pointcut LPAREN parametersList COMMA MULTIPLY RPAREN "FOR" typeCS sequence "ENDAROUND"
-		/.$BeginCode
-			setResult(xpandFactory.createAround(getLeftIToken(), getRightIToken(), (Identifier) getRhsSym(2), (List<VariableCS>) getRhsSym(4), true, (TypeCS) getRhsSym(9), (List) getRhsSym(10)));
-		$EndCode./
-	around ::= "AROUND" pointcut LPAREN MULTIPLY RPAREN "FOR" typeCS sequence "ENDAROUND"
-		/.$BeginCode
-			setResult(xpandFactory.createAround(getLeftIToken(), getRightIToken(), (Identifier) getRhsSym(2), Collections.<VariableCS>emptyList(), true, (TypeCS) getRhsSym(7), (List) getRhsSym(8)));
-		$EndCode./
-
-	pointcut ::= MULTIPLY pointcutSuffix 
-		/.$BeginCode
-//			FIXME: may use SimpleNameCS here, though need more sophisticated code to update end position
-//			SimpleNameCS simpleNameCS = createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL, getTokenText(getRhsTokenIndex(1)));
-//			setOffsets(simpleNameCS, getLeftIToken());
-			Identifier res = xpandFactory.createIdentifier(getLeftIToken());
-			if (getRhsSym(2) != null) {
-				res = res.append((Identifier) getRhsSym(2));
-			}
-			setResult(res);
-		$EndCode./
-	pointcut ::= IDENTIFIER pointcutSuffix
-		/.$BeginCode
-			Identifier res = xpandFactory.createIdentifier(getLeftIToken());
-			if (getRhsSym(2) != null) {
-				res = res.append((Identifier) getRhsSym(2));
-			}
-			setResult(res);
-		$EndCode./
-
-	pointcutSuffix ::= %empty
-		/.$BeginCode
-			setResult(null);
-		$EndCode./
-	pointcutSuffix -> pointcut
-	pointcutSuffix ::= COLONCOLON pointcutSuffix
-		/.$BeginCode
-			Identifier res = xpandFactory.createIdentifier(getLeftIToken());
-			if (getRhsSym(2) != null) {
-				res = res.append((Identifier) getRhsSym(2));
-			}
-			setResult(res);
-		$EndCode./
-
-	define ::= "DEFINE" IDENTIFIER "FOR" typeCS sequence "ENDDEFINE"
-		/.$BeginCode
-			setResult(xpandFactory.createDefinition(getLeftIToken(), getRightIToken(), getRhsIToken(2), Collections.<VariableCS>emptyList(), (TypeCS) getRhsSym(4), (List) getRhsSym(5)));
-		$EndCode./
-	define ::= "DEFINE" IDENTIFIER LPAREN parametersList RPAREN "FOR" typeCS sequence "ENDDEFINE"
-		/.$BeginCode
-			setResult(xpandFactory.createDefinition(getLeftIToken(), getRightIToken(), getRhsIToken(2), (List<VariableCS>) getRhsSym(4), (TypeCS) getRhsSym(7), (List) getRhsSym(8)));
-		$EndCode./
-		
-	parametersList ::= parameter 
-		/.$BeginCode
-			VariableCS param = (VariableCS) getRhsSym(1);
-			LinkedList res = new LinkedList();
-			res.add(param);
-			setResult(res);
-		$EndCode./
-
-	parametersList ::= parametersList ',' parameter 
-		/.$BeginCode
-			VariableCS param = (VariableCS) getRhsSym(3);
-			LinkedList res = new LinkedList();
-			res.addAll((List) getRhsSym(1));
-			res.add(param);
-			setResult(res);
-		$EndCode./
-
-	parameter -> declarator
-
-	parameter ::= typeCS IDENTIFIER
-		/.$BeginCode
-			VariableCS result = createVariableCS(getRhsIToken(2).toString(), (TypeCS) getRhsSym(1), null);
-			setOffsets(result, (TypeCS) getRhsSym(1), getRhsIToken(2));
-			setResult(result);
-		$EndCode./
-	
-	sequence ::= text sequenceSuffix
-		/.$BeginCode
-			List res = new LinkedList();
-			res.addAll((List) getRhsSym(1));
-			res.addAll((List) getRhsSym(2));
-			setResult(res);
-		$EndCode./
-	sequenceSuffix ::= %empty
-		/.$BeginCode
-			setResult(Collections.EMPTY_LIST);
-		$EndCode./
-	sequenceSuffix ::= statement text sequenceSuffix
-		/.$BeginCode
-			List res = new LinkedList();
-			res.add(getRhsSym(1));
-			res.addAll((List) getRhsSym(2));
-			res.addAll((List) getRhsSym(3));
-			setResult(res);
-		$EndCode./
-
-
---
--- Statements
---
---
-	statement -> simpleStatement | fileStatement | foreachStatement | ifStatement | letStatement | protectStatement
-
-	text ::= minusOpt TEXT textSuffix 
-		/.$BeginCode
-			List res = new LinkedList();
-			res.add(xpandFactory.createTextStatement(getRhsIToken(2), (IToken) getRhsSym(1)));
-			res.addAll((List) getRhsSym(3));
-			setResult(res);
-		$EndCode./
-
-	textSuffix ::= %empty
-		/.$BeginCode
-			setResult(Collections.EMPTY_LIST);
-		$EndCode./
-	textSuffix ::= minusOpt TEXT textSuffix
-		/.$BeginCode
-			List res = new LinkedList();
-			res.add(xpandFactory.createTextStatement(getRhsIToken(2), (IToken) getRhsSym(1)));
-			res.addAll((List) getRhsSym(3));
-			setResult(res);
-		$EndCode./
-
-	minusOpt ::= %empty
-		/.$BeginCode
-			setResult(null);
-		$EndCode./
-	minusOpt ::= MINUS
-		/.$BeginCode
-			setResult(getLeftIToken());
-		$EndCode./
-
-	simpleStatement -> errorStatement | expandStatement | expressionStmt
-
-	errorStatement ::= "ERROR" OclExpressionCS
-		/.$BeginCode
-			setResult(xpandFactory.createErrorStatement(getLeftIToken(), (OCLExpressionCS) getRhsSym(2)));
-		$EndCode./
-
-
-	expandStatement ::= "EXPAND" definitionName parameterListOpt
-		/.$BeginCode
-			setResult(xpandFactory.createExpandStatement(getLeftIToken(), (PathNameCS) getRhsSym(2), (List) getRhsSym(3), null, false, null));
-		$EndCode./
-	expandStatement ::= "EXPAND" definitionName parameterListOpt "FOR" OclExpressionCS
-		/.$BeginCode
-			setResult(xpandFactory.createExpandStatement(getLeftIToken(), (PathNameCS) getRhsSym(2), (List) getRhsSym(3), (OCLExpressionCS) getRhsSym(5), false, null));
-		$EndCode./
-	expandStatement ::= "EXPAND" definitionName parameterListOpt "FOREACH" OclExpressionCS separatorOpt
-		/.$BeginCode
-			setResult(xpandFactory.createExpandStatement(getLeftIToken(), (PathNameCS) getRhsSym(2), (List) getRhsSym(3), (OCLExpressionCS) getRhsSym(5), true, (OCLExpressionCS) getRhsSym(6)));
-		$EndCode./
-
-	parameterListOpt ::= %empty
-		/.$BeginCode
-			setResult(Collections.EMPTY_LIST);
-		$EndCode./
-	parameterListOpt ::= LPAREN argumentsCS RPAREN
-		/.$BeginCode
-			setResult(getRhsSym(2));
-		$EndCode./
-
-
-	definitionName -> pathNameCS
-
-	expressionStmt ::= OclExpressionCS
-		/.$BeginCode
-			// XXX OCL CST doesn't keep track of line numbers, but we use them (perhaps, might refactor to stop using?)
-			int lineNumber = getLeftIToken().getLine();
-			setResult(xpandFactory.createExpressionStatement((OCLExpressionCS) getRhsSym(1), lineNumber));
-		$EndCode./
-
-	fileStatement ::= "FILE" OclExpressionCS identOpt sequence "ENDFILE"
-		/.$BeginCode
-			setResult(xpandFactory.createFileStatement(getLeftIToken(), getRightIToken(), (OCLExpressionCS) getRhsSym(2), (Identifier) getRhsSym(3), (List) getRhsSym(4)));
-		$EndCode./
-
-	-- XXX may use simpleNameCSopt instead, however not sure about self and String/Real/etc as possible values there.
-	identOpt ::= %empty
-		/.$BeginCode
-			setResult(null);
-		$EndCode./
-	identOpt ::= IDENTIFIER
-		/.$BeginCode
-			setResult(xpandFactory.createIdentifier(getLeftIToken()));
-		$EndCode./
-
-	foreachStatement ::= "FOREACH" OclExpressionCS "AS" IDENTIFIER iteratorOpt separatorOpt sequence "ENDFOREACH"
-		/.$BeginCode
-			setResult(xpandFactory.createForEachStatement(getLeftIToken(), getRightIToken(), (OCLExpressionCS) getRhsSym(2), getRhsIToken(4), (OCLExpressionCS) getRhsSym(6), (IToken) getRhsSym(5), (List) getRhsSym(7)));
-		$EndCode./
-
-	iteratorOpt ::= %empty
-		/.$BeginCode
-			setResult(null);
-		$EndCode./
-	iteratorOpt ::= "ITERATOR" IDENTIFIER
-		/.$BeginCode
-			setResult(getRightIToken());
-		$EndCode./
-
-	separatorOpt ::= %empty
-		/.$BeginCode
-			setResult(null);
-		$EndCode./
-	separatorOpt ::= "SEPARATOR" OclExpressionCS
-		/.$BeginCode
-			setResult(getRhsSym(2));
-		$EndCode./
-
-
-	ifStatement ::= "IF" OclExpressionCS sequence elseifAny elseOpt "ENDIF"
-		/.$BeginCode
-			IfStatement i = xpandFactory.createIfStatement(getLeftIToken(), (OCLExpressionCS) getRhsSym(2), (List) getRhsSym(3), null);
-			IfStatement elseIf = (IfStatement) getRhsSym(4);
-			IfStatement elseStmt = (IfStatement) getRhsSym(5);
-			if (elseIf != null) {
-				i.setElseIf(elseIf);
-				IfStatement curElseIf = elseIf;
-				// get the latest one in the chain
-				while (curElseIf.getElseIf() != null) {
-					curElseIf = curElseIf.getElseIf();
-				}
-				curElseIf.setElseIf(elseStmt);
-			} else {
-				i.setElseIf(elseStmt);
-			}
-			setResult(i);
-		$EndCode./
-
-	elseifAny ::= %empty
-		/.$BeginCode
-			setResult(null);
-		$EndCode./
-	elseifAny ::= "ELSEIF" OclExpressionCS sequence elseifAny
-		/.$BeginCode
-			IfStatement elseIf = xpandFactory.createIfStatement(getLeftIToken(), (OCLExpressionCS) getRhsSym(2), (List) getRhsSym(3), null);
-			IfStatement restElseIf = (IfStatement) getRhsSym(4);
-			elseIf.setElseIf(restElseIf);
-			setResult(elseIf);
-		$EndCode./
-
-	elseOpt ::= %empty
-		/.$BeginCode
-			setResult(null);
-		$EndCode./
-	elseOpt ::= "ELSE" sequence
-		/.$BeginCode
-			setResult(xpandFactory.createIfStatement(getLeftIToken(), null, (List) getRhsSym(2), null));
-		$EndCode./
-
-	letStatement ::= "LET" OclExpressionCS "AS" IDENTIFIER sequence "ENDLET"
-		/.$BeginCode
-			setResult(xpandFactory.createLetStatement(getLeftIToken(), getRightIToken(), (OCLExpressionCS) getRhsSym(2), getRhsIToken(4), (List) getRhsSym(5)));
-		$EndCode./
-	
-	protectStatement ::= "PROTECT" "CSTART" OclExpressionCS "CEND" OclExpressionCS "ID" OclExpressionCS disabledOpt sequence "ENDPROTECT"
-		/.$BeginCode
-			setResult(xpandFactory.createProtectStatement(getLeftIToken(), getRightIToken(), (OCLExpressionCS) getRhsSym(3), (OCLExpressionCS) getRhsSym(5), (OCLExpressionCS) getRhsSym(7), (IToken) getRhsSym(8), (List) getRhsSym(9)));
-		$EndCode./
-
-	disabledOpt ::= %empty
-		/.$BeginCode
-			setResult(null);
-		$EndCode./
-	disabledOpt ::= "DISABLE"
-		/.$BeginCode
-			setResult(getLeftIToken());
-		$EndCode./
-
-%End
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParser.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParser.java
deleted file mode 100644
index 72968520d71..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParser.java
+++ /dev/null
@@ -1,3256 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-import java.text.StringCharacterIterator;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.m2m.internal.qvt.oml.cst.CompleteSignatureCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.DictLiteralExpCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.DictLiteralPartCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.DictionaryTypeCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.DirectionKindCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.DirectionKindEnum;
-import org.eclipse.m2m.internal.qvt.oml.cst.ImperativeIterateExpCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.ImperativeOperationCallExpCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.LibraryImportCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.ListLiteralExpCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.ListTypeCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.ParameterDeclarationCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.SimpleSignatureCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.StatementCS;
-import org.eclipse.m2m.internal.qvt.oml.cst.TypeSpecCS;
-import org.eclipse.ocl.cst.BooleanLiteralExpCS;
-import org.eclipse.ocl.cst.CSTFactory;
-import org.eclipse.ocl.cst.CSTNode;
-import org.eclipse.ocl.cst.CallExpCS;
-import org.eclipse.ocl.cst.CollectionLiteralExpCS;
-import org.eclipse.ocl.cst.CollectionLiteralPartCS;
-import org.eclipse.ocl.cst.CollectionRangeCS;
-import org.eclipse.ocl.cst.CollectionTypeCS;
-import org.eclipse.ocl.cst.CollectionTypeIdentifierEnum;
-import org.eclipse.ocl.cst.DotOrArrowEnum;
-import org.eclipse.ocl.cst.FeatureCallExpCS;
-import org.eclipse.ocl.cst.IfExpCS;
-import org.eclipse.ocl.cst.IntegerLiteralExpCS;
-import org.eclipse.ocl.cst.InvalidLiteralExpCS;
-import org.eclipse.ocl.cst.IsMarkedPreCS;
-import org.eclipse.ocl.cst.IterateExpCS;
-import org.eclipse.ocl.cst.IteratorExpCS;
-import org.eclipse.ocl.cst.LetExpCS;
-import org.eclipse.ocl.cst.LiteralExpCS;
-import org.eclipse.ocl.cst.NullLiteralExpCS;
-import org.eclipse.ocl.cst.OCLExpressionCS;
-import org.eclipse.ocl.cst.OperationCallExpCS;
-import org.eclipse.ocl.cst.PathNameCS;
-import org.eclipse.ocl.cst.PrimitiveTypeCS;
-import org.eclipse.ocl.cst.RealLiteralExpCS;
-import org.eclipse.ocl.cst.SimpleNameCS;
-import org.eclipse.ocl.cst.SimpleTypeEnum;
-import org.eclipse.ocl.cst.StringLiteralExpCS;
-import org.eclipse.ocl.cst.TupleLiteralExpCS;
-import org.eclipse.ocl.cst.TupleTypeCS;
-import org.eclipse.ocl.cst.TypeCS;
-import org.eclipse.ocl.cst.UnlimitedNaturalLiteralExpCS;
-import org.eclipse.ocl.cst.VariableCS;
-import org.eclipse.ocl.cst.VariableExpCS;
-import org.eclipse.ocl.lpg.ProblemHandler;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Advice;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Definition;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.IfStatement;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Template;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.Identifier;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException.ErrorLocationInfo;
-
-import lpg.runtime.BadParseException;
-import lpg.runtime.BadParseSymFileException;
-import lpg.runtime.DeterministicParser;
-import lpg.runtime.DiagnoseParser;
-import lpg.runtime.ErrorToken;
-import lpg.runtime.IToken;
-import lpg.runtime.LexStream;
-import lpg.runtime.Monitor;
-import lpg.runtime.NotDeterministicParseTableException;
-import lpg.runtime.NullExportedSymbolsException;
-import lpg.runtime.NullTerminalSymbolsException;
-import lpg.runtime.ParseTable;
-import lpg.runtime.PrsStream;
-import lpg.runtime.RuleAction;
-import lpg.runtime.TokenStream;
-import lpg.runtime.UndefinedEofSymbolException;
-import lpg.runtime.UnimplementedTerminalsException;
-
-public class XpandParser extends PrsStream implements RuleAction {
-
-	private static ParseTable prs = new XpandParserprs();
-
-	private DeterministicParser dtParser;
-
-	public DeterministicParser getParser() {
-		return dtParser;
-	}
-
-	private void setResult(Object object) {
-		dtParser.setSym1(object);
-	}
-
-	public Object getRhsSym(int i) {
-		return dtParser.getSym(i);
-	}
-
-	public int getRhsTokenIndex(int i) {
-		return dtParser.getToken(i);
-	}
-
-	public IToken getRhsIToken(int i) {
-		return super.getIToken(getRhsTokenIndex(i));
-	}
-
-	public int getRhsFirstTokenIndex(int i) {
-		return dtParser.getFirstToken(i);
-	}
-
-	public IToken getRhsFirstIToken(int i) {
-		return super.getIToken(getRhsFirstTokenIndex(i));
-	}
-
-	public int getRhsLastTokenIndex(int i) {
-		return dtParser.getLastToken(i);
-	}
-
-	public IToken getRhsLastIToken(int i) {
-		return super.getIToken(getRhsLastTokenIndex(i));
-	}
-
-	public int getLeftSpan() {
-		return dtParser.getFirstToken();
-	}
-
-	public IToken getLeftIToken() {
-		return super.getIToken(getLeftSpan());
-	}
-
-	public int getRightSpan() {
-		return dtParser.getLastToken();
-	}
-
-	public IToken getRightIToken() {
-		return super.getIToken(getRightSpan());
-	}
-
-	public int getRhsErrorTokenIndex(int i) {
-		int index = dtParser.getToken(i);
-		IToken err = super.getIToken(index);
-		return (err instanceof ErrorToken ? index : 0);
-	}
-
-	public ErrorToken getRhsErrorIToken(int i) {
-		int index = dtParser.getToken(i);
-		IToken err = super.getIToken(index);
-		return (ErrorToken) (err instanceof ErrorToken ? err : null);
-	}
-
-	public XpandParser(LexStream lexStream) {
-		super(lexStream);
-		xpandFactory = new XpandFactory(lexStream.getFileName());
-
-		try {
-			super.remapTerminalSymbols(orderedTerminalSymbols(), XpandParserprs.EOFT_SYMBOL);
-		} catch (NullExportedSymbolsException e) {
-		} catch (NullTerminalSymbolsException e) {
-		} catch (UnimplementedTerminalsException e) {
-			java.util.ArrayList<?> unimplemented_symbols = e.getSymbols();
-			System.out.println("The Lexer will not scan the following token(s):");
-			for (int i = 0; i < unimplemented_symbols.size(); i++) {
-				Integer id = (Integer) unimplemented_symbols.get(i);
-				System.out.println("    " + XpandParsersym.orderedTerminalSymbols[id.intValue()]);
-			}
-			System.out.println();
-		} catch (UndefinedEofSymbolException e) {
-			throw new Error(new UndefinedEofSymbolException("The Lexer does not implement the Eof symbol " + XpandParsersym.orderedTerminalSymbols[XpandParserprs.EOFT_SYMBOL]));
-		}
-	}
-
-	public String[] orderedTerminalSymbols() {
-		return XpandParsersym.orderedTerminalSymbols;
-	}
-
-	public String getTokenKindName(int kind) {
-		return XpandParsersym.orderedTerminalSymbols[kind];
-	}
-
-	public int getEOFTokenKind() {
-		return XpandParserprs.EOFT_SYMBOL;
-	}
-
-	public PrsStream getParseStream() {
-		return (PrsStream) this;
-	}
-
-	public Template parser() {
-		return parser(null, 0);
-	}
-
-	public Template parser(Monitor monitor) {
-		return parser(monitor, 0);
-	}
-
-	public Template parser(int error_repair_count) {
-		return parser(null, error_repair_count);
-	}
-
-	public Template parser(Monitor monitor, int error_repair_count) {
-		try {
-			resetErrors();
-			dtParser = new DeterministicParser(monitor, (TokenStream) this, prs, (RuleAction) this);
-		} catch (NotDeterministicParseTableException e) {
-			throw new Error(new NotDeterministicParseTableException("Regenerate XpandParserprs.java with -NOBACKTRACK option"));
-		} catch (BadParseSymFileException e) {
-			throw new Error(new BadParseSymFileException("Bad Parser Symbol File -- XpandParsersym.java. Regenerate XpandParserprs.java"));
-		}
-
-		try {
-			return (Template) dtParser.parse();
-		} catch (BadParseException e) {
-			reset(e.error_token); // point to error token
-
-			DiagnoseParser diagnoseParser = new DiagnoseParser(this, prs);
-			diagnoseParser.diagnose(e.error_token);
-		}
-
-		return null;
-	}
-
-	public ErrorLocationInfo[] getErrors() {
-		return errors.toArray(new ErrorLocationInfo[errors.size()]);
-	}
-
-	private void resetErrors() {
-		errors.clear();
-	}
-
-	private final List<ErrorLocationInfo> errors = new LinkedList<ErrorLocationInfo>();
-
-	@Override
-	public void reportError(int errorCode, int leftToken, int errorToken, int rightToken, String errorInfo[]) {
-		StringBuilder sb = new StringBuilder("(");
-		sb.append(errorCode);
-		sb.append(") ");
-		if (errorInfo != null) {
-			for (int i = 0; i < errorInfo.length; i++) {
-				if (sb.length() > 0) {
-					sb.append("; ");
-				}
-				sb.append(errorInfo[i]);
-			}
-		}
-		errors.add(new ErrorLocationInfo(sb.toString(), getLine(leftToken), getColumn(leftToken), getEndLine(rightToken), getEndColumn(rightToken)));
-	}
-
-	private final XpandFactory xpandFactory;
-
-	/**
-	 * A convenience method to obtain the text of a right hand side IToken.
-	 * 
-	 * @param i
-	 *            the right hand side token index
-	 * @result the text of the correspondent right hand side IToken.
-	 * 
-	 * @since 3.0
-	 */
-	protected String getRhsTokenText(int i) {
-		return this.getTokenText(getRhsTokenIndex(i));
-	}
-
-	@SuppressWarnings("unchecked")
-	private static final EList ourEmptyEList = new BasicEList.UnmodifiableEList(0, new Object[0]);
-
-	private void diagnozeErrorToken(int token_index) {
-		// IToken token = getIToken(token_index);
-		// if (token instanceof lpg.runtime.ErrorToken) {
-		// token = ((lpg.runtime.ErrorToken) token).getErrorToken();
-		// }
-		// reportError(lpg.runtime.ParseErrorCodes.MISPLACED_CODE,
-		// token.getTokenIndex(), token.getTokenIndex(),
-		// "'" +
-		// token.toString() + "'");
-
-		this.reset(token_index); // point to error token
-		DiagnoseParser diagnoseParser = new DiagnoseParser(this, prs);
-		diagnoseParser.diagnose(token_index);
-		setResult(null);
-	}
-
-	private ImperativeIterateExpCS createImperativeIterateExpCS(SimpleNameCS simpleNameCS, EList<VariableCS> iterators, VariableCS target, OCLExpressionCS body, OCLExpressionCS condition) {
-		ImperativeIterateExpCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createImperativeIterateExpCS();
-		result.setSimpleNameCS(simpleNameCS);
-		if (iterators.size() > 0) {
-			result.setVariable1(iterators.get(0));
-			if (iterators.size() > 1) {
-				result.setVariable2(iterators.get(1));
-			}
-		}
-		if (target != null) {
-			result.setTarget(target);
-		}
-		result.setBody(body);
-		result.setCondition(condition);
-		return result;
-	}
-
-	protected final CSTNode createCompleteSignatureCS(SimpleSignatureCS simpleSignatureCS, EList<ParameterDeclarationCS> resultList) {
-		CompleteSignatureCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createCompleteSignatureCS();
-		result.setSimpleSignature(simpleSignatureCS);
-		result.getResultParams().addAll(resultList);
-		return result;
-	}
-
-	protected final SimpleSignatureCS createSimpleSignatureCS(EList<ParameterDeclarationCS> paramsCS) {
-		SimpleSignatureCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createSimpleSignatureCS();
-		result.getParams().addAll(paramsCS);
-		return result;
-	}
-
-	protected final ParameterDeclarationCS createParameterDeclarationCS(DirectionKindCS sym, IToken tokenText, TypeSpecCS typeSpecCS) {
-		ParameterDeclarationCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createParameterDeclarationCS();
-		SimpleNameCS nameCS = null;
-		if (tokenText != null) {
-			nameCS = createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL, tokenText.toString());
-			setOffsets(nameCS, tokenText);
-		} else {
-			//nameCS = createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL, ""); //$NON-NLS-1
-		}
-		result.setSimpleNameCS(nameCS);
-		result.setTypeSpecCS(typeSpecCS);
-		if (sym != null) {
-			result.setDirectionKind(sym.getDirectionKind());
-		}
-		return result;
-	}
-
-	protected final CSTNode createLibraryImportCS(PathNameCS sym) {
-		LibraryImportCS imp = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createLibraryImportCS();
-		imp.setPathNameCS(sym);
-		return imp;
-	}
-
-	protected final CSTNode createDirectionKindCS(DirectionKindEnum kind) {
-		DirectionKindCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createDirectionKindCS();
-		result.setDirectionKind(kind);
-		return result;
-	}
-
-	protected final TypeSpecCS createTypeSpecCS(TypeCS typeCS, IToken extentLocation) {
-		TypeSpecCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createTypeSpecCS();
-		result.setTypeCS(typeCS);
-		setOffsets(result, typeCS);
-		if (extentLocation != null) {
-			SimpleNameCS nameCS = createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL, extentLocation.toString());
-			setOffsets(nameCS, extentLocation);
-			result.setSimpleNameCS(nameCS);
-			result.setEndOffset(extentLocation.getEndOffset());
-		}
-		return result;
-	}
-
-	private ListTypeCS createListTypeCS(TypeCS typeCS) {
-		ListTypeCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createListTypeCS();
-		result.setTypeCS(typeCS);
-		return result;
-	}
-
-	private DictLiteralExpCS createDictLiteralExpCS(EList<DictLiteralPartCS> parts) {
-		DictLiteralExpCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createDictLiteralExpCS();
-		result.getParts().addAll(parts);
-		return result;
-	}
-
-	private DictionaryTypeCS createDictTypeCS(TypeCS keyTypeCS, TypeCS valueTypeCS) {
-		DictionaryTypeCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createDictionaryTypeCS();
-		result.setKey(keyTypeCS);
-		result.setValue(valueTypeCS);
-		return result;
-	}
-
-	private DictLiteralPartCS createDictLiteralPartCS(LiteralExpCS keyLiteralCS, OCLExpressionCS valueExpCS) {
-		DictLiteralPartCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createDictLiteralPartCS();
-		result.setKey(keyLiteralCS);
-		result.setValue(valueExpCS);
-		return result;
-	}
-
-	private final StatementCS createBreakCS() {
-		StatementCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createBreakExpCS();
-		return result;
-	}
-
-	private final StatementCS createContinueCS() {
-		StatementCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createContinueExpCS();
-		return result;
-	}
-
-	private ListLiteralExpCS createListLiteralExpCS(EList<CollectionLiteralPartCS> collectionLiteralParts) {
-		ListLiteralExpCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createListLiteralExpCS();
-		result.getCollectionLiteralParts().addAll(collectionLiteralParts);
-		return result;
-	}
-
-	private boolean isTokenOfType(IToken token, int kind) {
-		return (token != null) && (token.getKind() == kind);
-	}
-
-	private ImperativeOperationCallExpCS createFeatureFQNOperationCallExpCS(SimpleNameCS moduleName, SimpleNameCS operationName, EList<OCLExpressionCS> arguments) {
-		ImperativeOperationCallExpCS result = org.eclipse.m2m.internal.qvt.oml.cst.CSTFactory.eINSTANCE.createImperativeOperationCallExpCS();
-		return setupImperativeOperationCallExpCS(moduleName, operationName, arguments, result);
-	}
-
-	private OperationCallExpCS createDotOperationCallExpCS(OCLExpressionCS oclExpressionCS, PathNameCS pathNameCs, SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS,
-			EList<OCLExpressionCS> arguments) {
-		if (pathNameCs != null && pathNameCs.getSimpleNames().size() == 1) {
-			ImperativeOperationCallExpCS result = createFeatureFQNOperationCallExpCS(pathNameCs.getSimpleNames().get(0), simpleNameCS, arguments);
-			if (oclExpressionCS != null) {
-				result.setSource(oclExpressionCS);
-				result.setIsAtomic(true);
-			}
-			result.setAccessor(oclExpressionCS != null ? DotOrArrowEnum.DOT_LITERAL : DotOrArrowEnum.NONE_LITERAL);
-			if (isAtPre(isMarkedPreCS)) {
-				result.setIsMarkedPreCS(isMarkedPreCS);
-			}
-			return result;
-		}
-		OperationCallExpCS result = createOperationCallExpCS(oclExpressionCS, DotOrArrowEnum.DOT_LITERAL, pathNameCs, simpleNameCS, isMarkedPreCS, arguments);
-		if (oclExpressionCS != null) {
-			result.setIsAtomic(true);
-		}
-		return result;
-	}
-
-	private ImperativeOperationCallExpCS setupImperativeOperationCallExpCS(SimpleNameCS moduleName, SimpleNameCS operationName, EList<OCLExpressionCS> arguments, ImperativeOperationCallExpCS result) {
-		result.setModule(moduleName);
-		result.setSimpleNameCS(operationName);
-		result.getArguments().addAll(arguments);
-		return result;
-	}
-
-	protected VariableCS createVariableCS(IToken token, TypeCS typeCS, OCLExpressionCS oclExpressionCS) {
-		VariableCS result = CSTFactory.eINSTANCE.createVariableCS();
-		result.setName(unSingleQuote(token));
-		result.setTypeCS(typeCS);
-		result.setInitExpression(oclExpressionCS);
-		return result;
-	}
-
-	private OperationCallExpCS createArrowOperationCallExpCS(OCLExpressionCS oclExpressionCS, SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS, EList<OCLExpressionCS> arguments) {
-		return createOperationCallExpCS(oclExpressionCS, DotOrArrowEnum.ARROW_LITERAL, null, simpleNameCS, isMarkedPreCS, arguments);
-	}
-
-	private OperationCallExpCS createOperationCallExpCS(OCLExpressionCS oclExpressionCS, DotOrArrowEnum dotOrArrow, PathNameCS pathNameCS, SimpleNameCS simpleNameCS, IsMarkedPreCS isMarkedPreCS,
-			EList<OCLExpressionCS> arguments) {
-		OperationCallExpCS result = CSTFactory.eINSTANCE.createOperationCallExpCS();
-		result.setSource(oclExpressionCS);
-		result.setAccessor(oclExpressionCS != null ? dotOrArrow : DotOrArrowEnum.NONE_LITERAL);
-		result.setPathNameCS((pathNameCS != null) && (pathNameCS.getSimpleNames().size() > 0) ? pathNameCS : null);
-		result.setSimpleNameCS(simpleNameCS);
-		result.getArguments().addAll(arguments);
-
-		if (isAtPre(isMarkedPreCS)) {
-			result.setIsMarkedPreCS(isMarkedPreCS);
-		}
-
-		return result;
-	}
-
-	private OperationCallExpCS createOperationCallExpCS(OCLExpressionCS oclExpressionCS, SimpleNameCS simpleNameCS, EList<OCLExpressionCS> arguments) {
-		return createOperationCallExpCS(oclExpressionCS, null, null, simpleNameCS, null, arguments);
-	}
-
-	private VariableExpCS createVariableExpCS(SimpleNameCS simpleNameCS, EList<OCLExpressionCS> arguments, IsMarkedPreCS isMarkedPreCS) {
-		VariableExpCS result = CSTFactory.eINSTANCE.createVariableExpCS();
-		result.setSimpleNameCS(simpleNameCS);
-		result.getArguments().addAll(arguments);
-		result.setIsMarkedPreCS(isMarkedPreCS);
-		return result;
-	}
-
-	private SimpleNameCS createSimpleNameCS(SimpleTypeEnum type, String value) {
-		SimpleNameCS result = CSTFactory.eINSTANCE.createSimpleNameCS();
-		result.setType(type);
-		result.setValue(unquote(value));
-		return result;
-	}
-
-	private PrimitiveTypeCS createPrimitiveTypeCS(SimpleTypeEnum type, String value) {
-		PrimitiveTypeCS result = CSTFactory.eINSTANCE.createPrimitiveTypeCS();
-		result.setType(type);
-		result.setValue(value);
-		return result;
-	}
-
-	private PathNameCS createPathNameCS(SimpleNameCS name) {
-		PathNameCS result = CSTFactory.eINSTANCE.createPathNameCS();
-		result.getSimpleNames().add(name);
-		return result;
-	}
-
-	private PathNameCS extendPathNameCS(PathNameCS path, SimpleNameCS name) {
-		path.getSimpleNames().add(name);
-		return path;
-	}
-
-	private CollectionLiteralExpCS createCollectionLiteralExpCS(CollectionTypeCS typeCS, EList<CollectionLiteralPartCS> collectionLiteralParts) {
-		CollectionLiteralExpCS result = CSTFactory.eINSTANCE.createCollectionLiteralExpCS();
-		result.setCollectionType(typeCS.getCollectionTypeIdentifier());
-		result.getCollectionLiteralParts().addAll(collectionLiteralParts);
-		return result;
-	}
-
-	private CollectionLiteralPartCS createCollectionLiteralPartCS(OCLExpressionCS oclExpressionCS) {
-		CollectionLiteralPartCS result = CSTFactory.eINSTANCE.createCollectionLiteralPartCS();
-		result.setExpressionCS(oclExpressionCS);
-		return result;
-	}
-
-	private CollectionRangeCS createCollectionRangeCS(OCLExpressionCS oclExpressionCS, OCLExpressionCS lastOCLExpressionCS) {
-		CollectionRangeCS result = CSTFactory.eINSTANCE.createCollectionRangeCS();
-		result.setExpressionCS(oclExpressionCS);
-		result.setLastExpressionCS(lastOCLExpressionCS);
-		return result;
-	}
-
-	private TupleLiteralExpCS createTupleLiteralExpCS(EList<VariableCS> variables) {
-		TupleLiteralExpCS result = CSTFactory.eINSTANCE.createTupleLiteralExpCS();
-		result.getVariables().addAll(variables);
-		return result;
-	}
-
-	private IntegerLiteralExpCS createIntegerLiteralExpCS(String string) {
-		IntegerLiteralExpCS result = CSTFactory.eINSTANCE.createIntegerLiteralExpCS();
-		result.setSymbol(string);
-		result.setIntegerSymbol(Integer.valueOf(string));
-		return result;
-	}
-
-	@SuppressWarnings("nls")
-	private UnlimitedNaturalLiteralExpCS createUnlimitedNaturalLiteralExpCS(String string) {
-		UnlimitedNaturalLiteralExpCS result = CSTFactory.eINSTANCE.createUnlimitedNaturalLiteralExpCS();
-		result.setSymbol(string);
-		if ("*".equals(string)) {
-			result.setIntegerSymbol(-1);
-		} else {
-			result.setIntegerSymbol(Integer.valueOf(string));
-		}
-		return result;
-	}
-
-	private RealLiteralExpCS createRealLiteralExpCS(String string) {
-		RealLiteralExpCS result = CSTFactory.eINSTANCE.createRealLiteralExpCS();
-		result.setSymbol(string);
-		result.setRealSymbol(Double.valueOf(string));
-		return result;
-	}
-
-	private BooleanLiteralExpCS createBooleanLiteralExpCS(String string) {
-		BooleanLiteralExpCS result = CSTFactory.eINSTANCE.createBooleanLiteralExpCS();
-		result.setSymbol(string);
-		result.setBooleanSymbol(Boolean.valueOf(string));
-		return result;
-	}
-
-	private NullLiteralExpCS createNullLiteralExpCS(String string) {
-		NullLiteralExpCS result = CSTFactory.eINSTANCE.createNullLiteralExpCS();
-		result.setValue(string);
-		result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
-		return result;
-	}
-
-	private InvalidLiteralExpCS createInvalidLiteralExpCS(String string) {
-		InvalidLiteralExpCS result = CSTFactory.eINSTANCE.createInvalidLiteralExpCS();
-		result.setValue(string);
-		result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
-		return result;
-	}
-
-	protected IteratorExpCS createIteratorExpCS(OCLExpressionCS source, SimpleNameCS simpleNameCS, VariableCS variable1, VariableCS variable2, OCLExpressionCS oclExpressionCS) {
-		IteratorExpCS result = CSTFactory.eINSTANCE.createIteratorExpCS();
-		result.setSource(source);
-		result.setAccessor(DotOrArrowEnum.ARROW_LITERAL);
-		result.setSimpleNameCS(simpleNameCS);
-		result.setVariable1(variable1);
-		result.setVariable2(variable2);
-		result.setBody(oclExpressionCS);
-		return result;
-	}
-
-	protected IterateExpCS createIterateExpCS(OCLExpressionCS source, SimpleNameCS simpleNameCS, VariableCS variable1, VariableCS variable2, OCLExpressionCS oclExpressionCS) {
-		IterateExpCS result = CSTFactory.eINSTANCE.createIterateExpCS();
-		result.setSource(source);
-		result.setAccessor(DotOrArrowEnum.ARROW_LITERAL);
-		result.setSimpleNameCS(simpleNameCS);
-		result.setVariable1(variable1);
-		result.setVariable2(variable2);
-		result.setBody(oclExpressionCS);
-		return result;
-	}
-
-	private VariableCS createVariableCS(String varName, TypeCS typeCS, OCLExpressionCS oclExpressionCS) {
-		VariableCS result = CSTFactory.eINSTANCE.createVariableCS();
-		result.setName(unquote(varName));
-		result.setTypeCS(typeCS);
-		result.setInitExpression(oclExpressionCS);
-		return result;
-	}
-
-	private VariableCS createVariableCS(SimpleNameCS varName, TypeCS typeCS, OCLExpressionCS oclExpressionCS) {
-		VariableCS result = CSTFactory.eINSTANCE.createVariableCS();
-		result.setName(unquote(varName.getValue()));
-		result.setTypeCS(typeCS);
-		result.setInitExpression(oclExpressionCS);
-		return result;
-	}
-
-	protected CollectionTypeCS createCollectionTypeCS(CollectionTypeIdentifierEnum collectionType, String value) {
-		CollectionTypeCS result = CSTFactory.eINSTANCE.createCollectionTypeCS();
-		result.setType(SimpleTypeEnum.IDENTIFIER_LITERAL);
-		result.setValue(unquote(value));
-		result.setCollectionTypeIdentifier(collectionType);
-		return result;
-	}
-
-	private TupleTypeCS createTupleTypeCS(EList<VariableCS> variables) {
-		TupleTypeCS result = CSTFactory.eINSTANCE.createTupleTypeCS();
-		result.getVariables().addAll(variables);
-		return result;
-	}
-
-	private FeatureCallExpCS createFeatureCallExpCS(OCLExpressionCS source, PathNameCS pathNameCS, SimpleNameCS simpleNameCS, EList<OCLExpressionCS> arguments, IsMarkedPreCS isMarkedPreCS) {
-		FeatureCallExpCS result = CSTFactory.eINSTANCE.createFeatureCallExpCS();
-		result.setSource(source);
-		result.setAccessor(source != null ? DotOrArrowEnum.DOT_LITERAL : DotOrArrowEnum.NONE_LITERAL);
-		result.setPathNameCS((pathNameCS != null) && (pathNameCS.getSimpleNames().size() > 0) ? pathNameCS : null);
-		result.setSimpleNameCS(simpleNameCS);
-		result.getArguments().addAll(arguments);
-
-		if (isAtPre(isMarkedPreCS)) {
-			result.setIsMarkedPreCS(isMarkedPreCS);
-		}
-
-		return result;
-	}
-
-	private LetExpCS createLetExpCS(EList<VariableCS> variables, OCLExpressionCS oclExpressionCS) {
-		LetExpCS result = CSTFactory.eINSTANCE.createLetExpCS();
-		result.getVariables().addAll(variables);
-		result.setInExpression(oclExpressionCS);
-		return result;
-	}
-
-	private IfExpCS createIfExpCS(OCLExpressionCS condition, OCLExpressionCS thenExpression, OCLExpressionCS elseExpression) {
-		IfExpCS result = CSTFactory.eINSTANCE.createIfExpCS();
-		result.setCondition(condition);
-		result.setThenExpression(thenExpression);
-		result.setElseExpression(elseExpression);
-		return result;
-	}
-
-	protected SimpleNameCS createConceptualOperationNameCS(IToken token) {
-		SimpleNameCS result = CSTFactory.eINSTANCE.createSimpleNameCS();
-		result.setType(SimpleTypeEnum.KEYWORD_LITERAL);
-		String conceptualName = token.toString();
-		result.setValue(conceptualName);
-		ProblemHandler.Severity sev = ProblemHandler.Severity.OK;
-		/*
-		 * [AS]: TODO log error here
-		 * 
-		 * BasicEnvironment benv = getEnvironment(); if (benv != null) { sev =
-		 * benv.getValue(ProblemOption.CONCEPTUAL_OPERATION_NAME); }
-		 * 
-		 * if ((sev != null) && (sev != ProblemHandler.Severity.OK)) {
-		 * benv.problem(sev, ProblemHandler.Phase.PARSER, OCLMessages
-		 * .bind(OCLMessages.Conceptual_Operation_Name_, conceptualName),
-		 * "unquote", //-NLS-1 token); }
-		 */
-		return result;
-	}
-
-	protected SimpleNameCS createSimpleNameCS(SimpleTypeEnum type, IToken token) {
-		SimpleNameCS result = CSTFactory.eINSTANCE.createSimpleNameCS();
-		result.setType(type);
-		result.setValue(unDoubleQuote(token));
-		return result;
-	}
-
-	protected StringLiteralExpCS createStringLiteralExpCS(IToken token) {
-		StringLiteralExpCS result = CSTFactory.eINSTANCE.createStringLiteralExpCS();
-		String unquoted = unSingleQuote(token);
-		result.setSymbol(unquoted);
-		result.setStringSymbol(unquoted);
-		result.setUnescapedStringSymbol(unquoted);
-		return result;
-	}
-
-	protected StringLiteralExpCS extendStringLiteralExpCS(StringLiteralExpCS string, IToken token) {
-		String oldString = string.getUnescapedStringSymbol();
-		String newString = unSingleQuote(token);
-		int oldFinish = string.getEndOffset();
-		int newStart = token.getStartOffset();
-		String joinedString;
-		if (newStart - oldFinish > 1) {
-			joinedString = oldString + newString;
-		} else {
-			joinedString = oldString + '\'' + newString;
-			/*
-			 * [AS]: TODO log error here ProblemHandler.Severity sev =
-			 * getEnvironment().getValue(
-			 * ProblemOption.STRING_SINGLE_QUOTE_ESCAPE); if ((sev != null) &&
-			 * (sev != ProblemHandler.Severity.OK)) { getEnvironment().problem(
-			 * sev, ProblemHandler.Phase.PARSER,
-			 * OCLMessages.bind(OCLMessages.NonStd_SQuote_Escape_,
-			 * joinedString), "STRING_LITERAL", //-NLS-1 joinedString); }
-			 */
-		}
-		string.setSymbol(joinedString);
-		string.setStringSymbol(joinedString);
-		string.setUnescapedStringSymbol(joinedString);
-		return string;
-	}
-
-	protected Set<String> iteratorNames = null;
-
-	@SuppressWarnings("nls")
-	protected Set<String> createIteratorNames() {
-		Set<String> iteratorNames = new HashSet<String>();
-		iteratorNames.add("any");
-		iteratorNames.add("collect");
-		iteratorNames.add("collectNested");
-		iteratorNames.add("exists");
-		iteratorNames.add("forAll");
-		iteratorNames.add("isUnique");
-		iteratorNames.add("one");
-		iteratorNames.add("reject");
-		iteratorNames.add("select");
-		iteratorNames.add("sortedBy");
-
-		iteratorNames.add("closure");
-		return iteratorNames;
-	}
-
-	protected boolean isIterator(String name) {
-		if (iteratorNames == null) {
-			iteratorNames = createIteratorNames();
-		}
-		return iteratorNames.contains(name);
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code> to the
-	 * start and end offsets of the given <code>IToken</code>
-	 * 
-	 * @param cstNode
-	 *            <code>CSTNode</code> to set offsets
-	 * @param startEnd
-	 *            <code>IToken</code> to retrieve offsets from
-	 */
-	private void setOffsets(CSTNode cstNode, IToken startEnd) {
-		cstNode.setStartOffset(startEnd.getStartOffset());
-		cstNode.setEndOffset(startEnd.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code> to the
-	 * start and end offsets of the 2nd given <code>CSTNode</code>
-	 * 
-	 * @param cstNode
-	 *            <code>CSTNode</code> to set offsets
-	 * @param startEnd
-	 *            <code>CSTNode</code> to retrieve offsets from
-	 */
-	private void setOffsets(CSTNode cstNode, CSTNode startEnd) {
-		cstNode.setStartOffset(startEnd.getStartOffset());
-		cstNode.setEndOffset(startEnd.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code> to the
-	 * start offset of the 2nd given <code>CSTNode</code> and the end offset of
-	 * the 3rd given <code>CSTNode</code>
-	 * 
-	 * @param cstNode
-	 *            <code>CSTNode</code> to set offsets
-	 * @param start
-	 *            <code>CSTNode</code> to retrieve start offset from
-	 * @param end
-	 *            <code>CSTNode</code> to retrieve end offset from
-	 */
-	private void setOffsets(CSTNode cstNode, CSTNode start, CSTNode end) {
-		cstNode.setStartOffset(start.getStartOffset());
-		cstNode.setEndOffset(end.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code> to the
-	 * start offset of the 2nd given <code>CSTNode</code> and the end offset of
-	 * the given <code>IToken</code>
-	 * 
-	 * @param cstNode
-	 *            <code>CSTNode</code> to set offsets
-	 * @param start
-	 *            <code>CSTNode</code> to retrieve start offset from
-	 * @param end
-	 *            <code>IToken</code> to retrieve end offset from
-	 */
-	private void setOffsets(CSTNode cstNode, CSTNode start, IToken end) {
-		cstNode.setStartOffset(start.getStartOffset());
-		cstNode.setEndOffset(end.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code> to the
-	 * start offset of the given <code>IToken</code> and the end offset of the
-	 * 2nd given <code>CSTNode</code>
-	 * 
-	 * @param cstNode
-	 *            <code>CSTNode</code> to set offsets
-	 * @param start
-	 *            <code>IToken</code> to retrieve start offset from
-	 * @param end
-	 *            <code>CSTNode</code> to retrieve end offset from
-	 */
-	private void setOffsets(CSTNode cstNode, IToken start, CSTNode end) {
-		cstNode.setStartOffset(start.getStartOffset());
-		cstNode.setEndOffset(end.getEndOffset());
-	}
-
-	/**
-	 * Sets the start and end offsets of the given <code>CSTNode</code> to the
-	 * start offset of the 1std given <code>IToken</code> and the end offset of
-	 * the 2nd given <code>IToken</code>
-	 * 
-	 * @param cstNode
-	 *            <code>CSTNode</code> to set offsets
-	 * @param start
-	 *            <code>IToken</code> to retrieve start offset from
-	 * @param end
-	 *            <code>IToken</code> to retrieve end offset from
-	 */
-	private void setOffsets(CSTNode cstNode, IToken start, IToken end) {
-		cstNode.setStartOffset(start.getStartOffset());
-		cstNode.setEndOffset(end.getEndOffset());
-	}
-
-	/**
-	 * Removes the "s surrounding a quoted string, if any.
-	 * 
-	 * @param quoted
-	 *            a possibly quoted string
-	 * @return <code>quoted</code> without the surrounding quotes, or just
-	 *         <code>quoted</code> verbatim if there were none
-	 */
-	private String unquote(String quoted) {
-		String result = quoted;
-
-		if ((result != null) && (result.length() > 1)) {
-			int max = result.length() - 1;
-
-			if ((result.charAt(0) == '"') && (quoted.charAt(max) == '"')) {
-				result = result.substring(1, max);
-			}
-
-			// this is a regexp, so the backslash needs to be
-			// re-escaped, thus "\\" is rendered in a Java
-			// string literal as "\\\\"
-			result = result.replaceAll("\\\\\"", "\""); // -NLS-2//-NLS-1
-			/*
-			 * [artem] removed extra error handling fon non-spec escape
-			 * processing
-			 */
-		}
-
-		return result;
-	}
-
-	private boolean isAtPre(IsMarkedPreCS atPreCS) {
-		return atPreCS != null;
-	}
-
-	protected String unDoubleQuote(IToken token) {
-		if (token == null) {
-			return null;
-		}
-		String quoted = token.toString();
-		if (quoted == null) {
-			return null;
-		}
-		int quotedLength = quoted.length();
-		if ((quotedLength < 2) || (quoted.charAt(0) != '"') || (quoted.charAt(quotedLength - 1) != '"')) {
-			return quoted;
-		}
-		ProblemHandler.Severity sev = ProblemHandler.Severity.OK;
-		/*
-		 * BasicEnvironment benv = getEnvironment();
-		 * 
-		 * if (benv != null) { sev = benv
-		 * .getValue(ProblemOption.ELEMENT_NAME_QUOTE_ESCAPE); } if ((sev !=
-		 * null) && (sev != ProblemHandler.Severity.OK)) { benv.problem(sev,
-		 * ProblemHandler.Phase.PARSER, OCLMessages
-		 * .bind(OCLMessages.NonStd_DQuote_Escape_, quoted), "unquote", //-NLS-1
-		 * token); }
-		 */
-		return decodeString(token, quoted.substring(1, quotedLength - 1));
-	}
-
-	protected String unSingleQuote(IToken token) {
-		if (token == null) {
-			return null;
-		}
-		String quoted = token.toString();
-		if (quoted == null) {
-			return null;
-		}
-		int quotedLength = quoted.length();
-		if ((quotedLength < 2) || (quoted.charAt(0) != '\'') || (quoted.charAt(quotedLength - 1) != '\'')) {
-			return quoted;
-		}
-		String unquoted = quoted.substring(1, quotedLength - 1);
-		Boolean backslashProcessingEnabled = true;
-		/*
-		 * BasicEnvironment benv = getEnvironment(); if (benv != null) {
-		 * backslashProcessingEnabled = benv
-		 * .getValue(ParsingOptions.USE_BACKSLASH_ESCAPE_PROCESSING); }
-		 */
-		if ((backslashProcessingEnabled == null) || !backslashProcessingEnabled) {
-			return unquoted;
-		}
-		return decodeString(token, unquoted);
-	}
-
-	protected String decodeString(IToken token, String string) {
-		if (string.indexOf('\\') < 0) {
-			return string;
-		}
-		StringBuffer s = new StringBuffer();
-		StringCharacterIterator i = new StringCharacterIterator(string);
-		for (char c = i.first(); c != StringCharacterIterator.DONE; c = i.next()) {
-			if (c != '\\') {
-				s.append(c);
-			} else {
-				int iStart = i.getIndex();
-				char ch = decodeEscapeSequence(i);
-				if (ch != StringCharacterIterator.DONE) {
-					s.append(ch);
-				} else {
-					/*
-					 * [AS]: TODO: report error here
-					 * 
-					 * BasicEnvironment benv = getEnvironment();
-					 * benv.problem(ProblemHandler.Severity.ERROR,
-					 * ProblemHandler.Phase.PARSER, OCLMessages
-					 * .bind(OCLMessages.InvalidEscapeSequence_ERROR,
-					 * string.substring(iStart, i.getIndex())), "unquote",
-					 * //-NLS-1 token);
-					 */
-					return string;
-				}
-			}
-		}
-		return s.toString();
-	}
-
-	protected char decodeEscapeSequence(StringCharacterIterator i) {
-		int savedIndex = i.getIndex();
-		char c = i.next();
-		switch (c) {
-		case 'b':
-			return '\b';
-		case 'f':
-			return '\f';
-		case 't':
-			return '\t';
-		case 'n':
-			return '\n';
-		case 'r':
-			return '\r';
-		case '\\':
-			return '\\';
-		case '\'':
-			return '\'';
-		case '"':
-			return '\"';
-		case '0':
-		case '1':
-		case '2':
-		case '3': {
-			int c1 = c - '0';
-			int c2 = decodeOctalCharacter(i);
-			if (c2 < 0) {
-				return (char) (c1);
-			}
-			int c3 = decodeOctalCharacter(i);
-			if (c3 < 0) {
-				return (char) ((c1 << 3) + c2);
-			}
-			return (char) ((c1 << 6) + (c2 << 3) + c3);
-		}
-		case '4':
-		case '5':
-		case '6':
-		case '7': {
-			int c1 = c - '0';
-			int c2 = decodeOctalCharacter(i);
-			if (c2 < 0) {
-				i.previous();
-				return (char) (c1);
-			}
-			return (char) ((c1 << 3) + c2);
-		}
-		case 'x': {
-			int c1 = decodeHexCharacter(i.next());
-			int c2 = decodeHexCharacter(i.next());
-			if ((c1 < 0) || (c2 < 0)) {
-				break;
-			}
-			return (char) ((c1 << 4) + c2);
-		}
-		case 'u': {
-			int c1 = decodeHexCharacter(i.next());
-			int c2 = decodeHexCharacter(i.next());
-			int c3 = decodeHexCharacter(i.next());
-			int c4 = decodeHexCharacter(i.next());
-			if ((c1 < 0) || (c2 < 0) || (c3 < 0) || (c4 < 0)) {
-				break;
-			}
-			return (char) ((c1 << 12) + (c2 << 8) + (c3 << 4) + c4);
-		}
-		}
-		i.setIndex(savedIndex); // Give derived augmentations the same starting
-								// point
-		return StringCharacterIterator.DONE;
-	}
-
-	protected int decodeOctalCharacter(StringCharacterIterator i) {
-		char c = i.next();
-		if (c == StringCharacterIterator.DONE) {
-			return -1;
-		}
-		if (('0' <= c) && (c <= '7')) {
-			return c - '0';
-		}
-		i.previous();
-		return -1;
-	}
-
-	protected int decodeHexCharacter(char c) {
-		if (('0' <= c) && (c <= '9')) {
-			return c - '0';
-		}
-		if (('A' <= c) && (c <= 'F')) {
-			return 10 + c - 'A';
-		}
-		if (('a' <= c) && (c <= 'f')) {
-			return 10 + c - 'a';
-		}
-		return -1;
-	}
-
-	@SuppressWarnings("unchecked")
-	public void ruleAction(int ruleNumber) {
-		switch (ruleNumber) {
-
-		//
-		// Rule 16: conceptualOperationNameCS ::= conceptualOperationName
-		//
-		case 16: {
-
-			IToken iToken = getRhsIToken(1);
-			SimpleNameCS result = createConceptualOperationNameCS(iToken);
-			setOffsets(result, iToken);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 28: tupleKeywordCS ::= Tuple
-			//
-		case 28:
-
-			//
-			// Rule 32: selfKeywordCS ::= self
-			//
-		case 32: {
-
-			IToken iToken = getRhsIToken(1);
-			SimpleNameCS result = createSimpleNameCS(SimpleTypeEnum.SELF_LITERAL, iToken);
-			setOffsets(result, iToken);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 33: simpleNameCS ::= IDENTIFIER
-			//
-		case 33: {
-
-			IToken iToken = getRhsIToken(1);
-			SimpleNameCS result = createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL, iToken);
-			setOffsets(result, iToken);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 36: pathNameCS ::= simpleNameCS
-			//
-		case 36: {
-
-			SimpleNameCS simpleName = (SimpleNameCS) getRhsSym(1);
-			PathNameCS result = createPathNameCS(simpleName);
-			setOffsets(result, simpleName);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 37: pathNameCS ::= pathNameCS :: unreservedSimpleNameCS
-			//
-		case 37: {
-
-			PathNameCS result = (PathNameCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			result = extendPathNameCS(result, simpleNameCS);
-			setOffsets(result, result, simpleNameCS);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 38: primitiveTypeCS ::= Boolean
-			//
-		case 38: {
-
-			PrimitiveTypeCS result = createPrimitiveTypeCS(SimpleTypeEnum.BOOLEAN_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 39: primitiveTypeCS ::= Integer
-			//
-		case 39: {
-
-			PrimitiveTypeCS result = createPrimitiveTypeCS(SimpleTypeEnum.INTEGER_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 40: primitiveTypeCS ::= Real
-			//
-		case 40: {
-
-			PrimitiveTypeCS result = createPrimitiveTypeCS(SimpleTypeEnum.REAL_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 41: primitiveTypeCS ::= String
-			//
-		case 41: {
-
-			PrimitiveTypeCS result = createPrimitiveTypeCS(SimpleTypeEnum.STRING_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 42: primitiveTypeCS ::= UnlimitedNatural
-			//
-		case 42: {
-
-			PrimitiveTypeCS result = createPrimitiveTypeCS(SimpleTypeEnum.UNLIMITED_NATURAL_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 43: primitiveTypeCS ::= OclAny
-			//
-		case 43: {
-
-			PrimitiveTypeCS result = createPrimitiveTypeCS(SimpleTypeEnum.OCL_ANY_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 44: primitiveTypeCS ::= OclInvalid
-			//
-		case 44: {
-
-			PrimitiveTypeCS result = createPrimitiveTypeCS(SimpleTypeEnum.OCL_INVALID_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 45: primitiveTypeCS ::= OclVoid
-			//
-		case 45: {
-
-			PrimitiveTypeCS result = createPrimitiveTypeCS(SimpleTypeEnum.OCL_VOID_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 46: CollectionTypeIdentifierCS ::= Set
-			//
-		case 46: {
-
-			SimpleNameCS result = createCollectionTypeCS(CollectionTypeIdentifierEnum.SET_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 47: CollectionTypeIdentifierCS ::= Bag
-			//
-		case 47: {
-
-			SimpleNameCS result = createCollectionTypeCS(CollectionTypeIdentifierEnum.BAG_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 48: CollectionTypeIdentifierCS ::= Sequence
-			//
-		case 48: {
-
-			SimpleNameCS result = createCollectionTypeCS(CollectionTypeIdentifierEnum.SEQUENCE_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 49: CollectionTypeIdentifierCS ::= Collection
-			//
-		case 49: {
-
-			SimpleNameCS result = createCollectionTypeCS(CollectionTypeIdentifierEnum.COLLECTION_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 50: CollectionTypeIdentifierCS ::= OrderedSet
-			//
-		case 50: {
-
-			SimpleNameCS result = createCollectionTypeCS(CollectionTypeIdentifierEnum.ORDERED_SET_LITERAL, getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 55: collectionTypeCS ::= CollectionTypeIdentifierCS ( typeCS
-			// )
-			//
-		case 55: {
-
-			CollectionTypeCS result = (CollectionTypeCS) getRhsSym(1);
-			result.setTypeCS((TypeCS) getRhsSym(3));
-			setOffsets(result, result, getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 56: tupleTypeCS ::= Tuple ( tupleTypePartsCSopt )
-			//
-		case 56: {
-
-			TupleTypeCS result = createTupleTypeCS((EList<VariableCS>) getRhsSym(3));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 57: tupleTypePartsCSopt ::= $Empty
-			//
-		case 57: {
-
-			setResult(new BasicEList<VariableCS>());
-			break;
-		}
-
-			//
-			// Rule 59: tupleTypePartsCS ::= typedUninitializedVariableCS
-			//
-		case 59: {
-
-			EList<VariableCS> result = new BasicEList<VariableCS>();
-			result.add((VariableCS) getRhsSym(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 60: tupleTypePartsCS ::= tupleTypePartsCS ,
-			// typedUninitializedVariableCS
-			//
-		case 60: {
-
-			EList<VariableCS> result = (EList<VariableCS>) getRhsSym(1);
-			result.add((VariableCS) getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 61: untypedUninitializedVariableCS ::= simpleNameCS
-			//
-		case 61: {
-
-			SimpleNameCS name = (SimpleNameCS) getRhsSym(1);
-			VariableCS result = createVariableCS(name, null, null);
-			setOffsets(result, name);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 62: typedUninitializedVariableCS ::= simpleNameCS : typeCS
-			//
-		case 62: {
-
-			SimpleNameCS name = (SimpleNameCS) getRhsSym(1);
-			TypeCS type = (TypeCS) getRhsSym(3);
-			VariableCS result = createVariableCS(name, type, null);
-			setOffsets(result, name, type);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 63: untypedInitializedVariableCS ::= simpleNameCS =
-			// OclExpressionCS
-			//
-		case 63: {
-
-			SimpleNameCS name = (SimpleNameCS) getRhsSym(1);
-			OCLExpressionCS initExpression = (OCLExpressionCS) getRhsSym(3);
-			VariableCS result = createVariableCS(name, null, initExpression);
-			setOffsets(result, name, initExpression);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 64: typedInitializedVariableCS ::= simpleNameCS : typeCS =
-			// OclExpressionCS
-			//
-		case 64: {
-
-			SimpleNameCS name = (SimpleNameCS) getRhsSym(1);
-			TypeCS type = (TypeCS) getRhsSym(3);
-			OCLExpressionCS initExpression = (OCLExpressionCS) getRhsSym(5);
-			VariableCS result = createVariableCS(name, type, initExpression);
-			setOffsets(result, name, initExpression);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 77: CollectionLiteralExpCS ::= CollectionTypeIdentifierCS {
-			// CollectionLiteralPartsCSopt }
-			//
-		case 77: {
-
-			CollectionTypeCS typeCS = (CollectionTypeCS) getRhsSym(1);
-			CollectionLiteralExpCS result = createCollectionLiteralExpCS(typeCS, (EList<CollectionLiteralPartCS>) getRhsSym(3));
-			setOffsets(result, typeCS, getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 78: CollectionLiteralPartsCSopt ::= $Empty
-			//
-		case 78: {
-
-			setResult(new BasicEList<CollectionLiteralPartCS>());
-			break;
-		}
-
-			//
-			// Rule 80: CollectionLiteralPartsCS ::= CollectionLiteralPartCS
-			//
-		case 80: {
-
-			EList<CollectionLiteralPartCS> result = new BasicEList<CollectionLiteralPartCS>();
-			result.add((CollectionLiteralPartCS) getRhsSym(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 81: CollectionLiteralPartsCS ::= CollectionLiteralPartsCS ,
-			// CollectionLiteralPartCS
-			//
-		case 81: {
-
-			EList<CollectionLiteralPartCS> result = (EList<CollectionLiteralPartCS>) getRhsSym(1);
-			result.add((CollectionLiteralPartCS) getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 83: CollectionLiteralPartCS ::= OclExpressionCS
-			//
-		case 83: {
-
-			CollectionLiteralPartCS result = createCollectionLiteralPartCS((OCLExpressionCS) getRhsSym(1));
-			setOffsets(result, (CSTNode) getRhsSym(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 84: CollectionRangeCS ::= OclExpressionCS .. OclExpressionCS
-			//
-		case 84: {
-
-			CollectionLiteralPartCS result = createCollectionRangeCS((OCLExpressionCS) getRhsSym(1), (OCLExpressionCS) getRhsSym(3));
-			setOffsets(result, (CSTNode) getRhsSym(1), (CSTNode) getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 92: TupleLiteralExpCS ::= Tuple { TupleLiteralPartsCS }
-			//
-		case 92: {
-
-			TupleLiteralExpCS result = createTupleLiteralExpCS((EList<VariableCS>) getRhsSym(3));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 93: TupleLiteralPartsCS ::= initializedVariableCS
-			//
-		case 93: {
-
-			EList<VariableCS> result = new BasicEList<VariableCS>();
-			result.add((VariableCS) getRhsSym(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 94: TupleLiteralPartsCS ::= TupleLiteralPartsCS ,
-			// initializedVariableCS
-			//
-		case 94: {
-
-			EList<VariableCS> result = (EList<VariableCS>) getRhsSym(1);
-			result.add((VariableCS) getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 95: IntegerLiteralExpCS ::= INTEGER_LITERAL
-			//
-		case 95: {
-
-			IntegerLiteralExpCS result = createIntegerLiteralExpCS(getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 96: RealLiteralExpCS ::= REAL_LITERAL
-			//
-		case 96: {
-
-			RealLiteralExpCS result = createRealLiteralExpCS(getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 97: StringLiteralExpCS ::= STRING_LITERAL
-			//
-		case 97: {
-
-			IToken literalToken = getRhsIToken(1);
-			StringLiteralExpCS result = createStringLiteralExpCS(literalToken);
-			setOffsets(result, literalToken);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 98: StringLiteralExpCS ::= StringLiteralExpCS STRING_LITERAL
-			//
-		case 98: {
-
-			StringLiteralExpCS string = (StringLiteralExpCS) getRhsSym(1);
-			IToken literalToken = getRhsIToken(2);
-			StringLiteralExpCS result = extendStringLiteralExpCS(string, literalToken);
-			setOffsets(result, string, literalToken);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 99: BooleanLiteralExpCS ::= true
-			//
-		case 99: {
-
-			BooleanLiteralExpCS result = createBooleanLiteralExpCS(getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 100: BooleanLiteralExpCS ::= false
-			//
-		case 100: {
-
-			BooleanLiteralExpCS result = createBooleanLiteralExpCS(getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 101: UnlimitedNaturalLiteralExpCS ::= *
-			//
-		case 101: {
-
-			UnlimitedNaturalLiteralExpCS result = createUnlimitedNaturalLiteralExpCS(getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 102: InvalidLiteralExpCS ::= invalid
-			//
-		case 102: {
-
-			InvalidLiteralExpCS result = createInvalidLiteralExpCS(getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 103: NullLiteralExpCS ::= null
-			//
-		case 103: {
-
-			NullLiteralExpCS result = createNullLiteralExpCS(getRhsTokenText(1));
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 104: TypeLiteralExpCS ::= primitiveTypeCS
-			//
-		case 104:
-
-			//
-			// Rule 105: TypeLiteralExpCS ::= collectionTypeCS
-			//
-		case 105:
-
-			//
-			// Rule 106: TypeLiteralExpCS ::= tupleTypeCS
-			//
-		case 106: {
-
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(1);
-			VariableExpCS result = createVariableExpCS(simpleNameCS, new BasicEList<OCLExpressionCS>(), null);
-			setOffsets(result, simpleNameCS);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 111: IteratorExpCS ::= primaryExpCS -> simpleNameCS (
-			// uninitializedVariableCS | OclExpressionCS )
-			//
-		case 111: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			IteratorExpCS result = createIteratorExpCS(source, simpleNameCS, (VariableCS) getRhsSym(5), null, (OCLExpressionCS) getRhsSym(7));
-			setOffsets(result, source, getRhsIToken(8));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 112: IteratorExpCS ::= primaryExpCS -> simpleNameCS (
-			// simpleNameCS , uninitializedVariableCS | OclExpressionCS )
-			//
-		case 112: {
-
-			SimpleNameCS name = (SimpleNameCS) getRhsSym(5);
-			VariableCS variableCS = createVariableCS(name, null, null);
-			setOffsets(variableCS, name);
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			IteratorExpCS result = createIteratorExpCS(source, simpleNameCS, variableCS, (VariableCS) getRhsSym(7), (OCLExpressionCS) getRhsSym(9));
-			setOffsets(result, source, getRhsIToken(10));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 113: IteratorExpCS ::= primaryExpCS -> simpleNameCS (
-			// typedUninitializedVariableCS , uninitializedVariableCS |
-			// OclExpressionCS )
-			//
-		case 113: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			IteratorExpCS result = createIteratorExpCS(source, simpleNameCS, (VariableCS) getRhsSym(5), (VariableCS) getRhsSym(7), (OCLExpressionCS) getRhsSym(9));
-			setOffsets(result, source, getRhsIToken(10));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 114: IterateExpCS ::= primaryExpCS -> simpleNameCS (
-			// typedInitializedVariableCS | OclExpressionCS )
-			//
-		case 114: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			IterateExpCS result = createIterateExpCS(source, simpleNameCS, (VariableCS) getRhsSym(5), null, (OCLExpressionCS) getRhsSym(7));
-			setOffsets(result, source, getRhsIToken(8));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 115: IterateExpCS ::= primaryExpCS -> simpleNameCS (
-			// uninitializedVariableCS ; typedInitializedVariableCS |
-			// OclExpressionCS )
-			//
-		case 115: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			IterateExpCS result = createIterateExpCS(source, simpleNameCS, (VariableCS) getRhsSym(5), (VariableCS) getRhsSym(7), (OCLExpressionCS) getRhsSym(9));
-			setOffsets(result, source, getRhsIToken(10));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 119: OperationCallExpCS ::= primaryExpCS -> simpleNameCS ( )
-			//
-		case 119: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			OperationCallExpCS result = createArrowOperationCallExpCS(source, (SimpleNameCS) getRhsSym(3), null, new BasicEList<OCLExpressionCS>());
-			setOffsets(result, source, getRhsIToken(5));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 120: OperationCallExpCS ::= primaryExpCS -> simpleNameCS (
-			// OclExpressionCS )
-			//
-		case 120: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			OCLExpressionCS arg = (OCLExpressionCS) getRhsSym(5);
-			OCLExpressionCS result;
-			if (isIterator(simpleNameCS.getValue())) {
-				result = createIteratorExpCS(source, simpleNameCS, null, null, arg);
-			} else {
-				EList<OCLExpressionCS> args = new BasicEList<OCLExpressionCS>();
-				args.add(arg);
-				result = createArrowOperationCallExpCS(source, simpleNameCS, null, args);
-			}
-			setOffsets(result, source, getRhsIToken(6));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 121: OperationCallExpCS ::= primaryExpCS -> simpleNameCS (
-			// notNameExpressionCS , argumentsCS )
-			//
-		case 121: {
-
-			EList<OCLExpressionCS> args = (EList<OCLExpressionCS>) getRhsSym(7);
-			args.add(0, (OCLExpressionCS) getRhsSym(5));
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			OperationCallExpCS result = createArrowOperationCallExpCS(source, (SimpleNameCS) getRhsSym(3), null, args);
-			setOffsets(result, source, getRhsIToken(8));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 122: OperationCallExpCS ::= primaryExpCS -> simpleNameCS (
-			// simpleNameCS , argumentsCS )
-			//
-		case 122: {
-
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(5);
-			OCLExpressionCS variableExpCS = createVariableExpCS(simpleNameCS, new BasicEList<OCLExpressionCS>(), null);
-			setOffsets(variableExpCS, simpleNameCS);
-			EList<OCLExpressionCS> args = (EList<OCLExpressionCS>) getRhsSym(7);
-			args.add(0, variableExpCS);
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			OperationCallExpCS result = createArrowOperationCallExpCS(source, (SimpleNameCS) getRhsSym(3), null, args);
-			setOffsets(result, source, getRhsIToken(8));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 123: OperationCallExpCS ::= primaryExpCS .
-			// conceptualOperationNameCS isMarkedPreCSopt ( argumentsCSopt )
-			//
-		case 123:
-
-			//
-			// Rule 124: OperationCallExpCS ::= primaryExpCS . simpleNameCS
-			// isMarkedPreCSopt ( argumentsCSopt )
-			//
-		case 124: {
-
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			CallExpCS result = createDotOperationCallExpCS(source, null, simpleNameCS, (IsMarkedPreCS) getRhsSym(4), (EList<OCLExpressionCS>) getRhsSym(6));
-			setOffsets(result, source, getRhsIToken(7));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 125: OperationCallExpCS ::= simpleNameCS isMarkedPreCSopt (
-			// argumentsCSopt )
-			//
-		case 125: {
-
-			OperationCallExpCS result = createDotOperationCallExpCS(null, null, (SimpleNameCS) getRhsSym(1), (IsMarkedPreCS) getRhsSym(2), (EList<OCLExpressionCS>) getRhsSym(4));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(5));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 126: OperationCallExpCS ::= pathNameCS ::
-			// unreservedSimpleNameCS ( argumentsCSopt )
-			//
-		case 126: {
-
-			PathNameCS pathNameCS = (PathNameCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			OperationCallExpCS result = createDotOperationCallExpCS(null, pathNameCS, simpleNameCS, null, (EList<OCLExpressionCS>) getRhsSym(5));
-			setOffsets(result, pathNameCS, getRhsIToken(6));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 127: OperationCallExpCS ::= primaryExpCS . pathNameCS ::
-			// unreservedSimpleNameCS isMarkedPreCSopt ( argumentsCSopt )
-			//
-		case 127: {
-
-			PathNameCS pathNameCS = (PathNameCS) getRhsSym(3);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(5);
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			CallExpCS result = createDotOperationCallExpCS(source, pathNameCS, simpleNameCS, (IsMarkedPreCS) getRhsSym(6), (EList<OCLExpressionCS>) getRhsSym(8));
-			setOffsets(result, source, getRhsIToken(9));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 129: PropertyCallExpCS ::= pathNameCS ::
-			// unreservedSimpleNameCS isMarkedPreCSopt
-			//
-		case 129: {
-
-			PathNameCS pathNameCS = (PathNameCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS) getRhsSym(4);
-			FeatureCallExpCS result = createFeatureCallExpCS(null, pathNameCS, simpleNameCS, new BasicEList<OCLExpressionCS>(), isMarkedPreCS);
-			if (isMarkedPreCS != null) {
-				setOffsets(result, pathNameCS, isMarkedPreCS);
-			} else {
-				setOffsets(result, pathNameCS, simpleNameCS);
-			}
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 130: PropertyCallExpCS ::= primaryExpCS . pathNameCS ::
-			// unreservedSimpleNameCS isMarkedPreCSopt
-			//
-		case 130: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			PathNameCS pathNameCS = (PathNameCS) getRhsSym(3);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(5);
-			IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS) getRhsSym(6);
-			FeatureCallExpCS result = createFeatureCallExpCS(source, pathNameCS, simpleNameCS, new BasicEList<OCLExpressionCS>(), isMarkedPreCS);
-			if (isMarkedPreCS != null) {
-				setOffsets(result, source, isMarkedPreCS);
-			} else {
-				setOffsets(result, source, simpleNameCS);
-			}
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 131: AssociationClassCallExpCS ::= primaryExpCS .
-			// simpleNameCS isMarkedPreCSopt
-			//
-		case 131: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			IsMarkedPreCS isMarkedPreCS = (IsMarkedPreCS) getRhsSym(4);
-			FeatureCallExpCS result = createFeatureCallExpCS(source, null, simpleNameCS, new BasicEList<OCLExpressionCS>(), isMarkedPreCS);
-			if (isMarkedPreCS != null) {
-				setOffsets(result, source, isMarkedPreCS);
-			} else {
-				setOffsets(result, source, simpleNameCS);
-			}
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 132: isMarkedPreCSopt ::= $Empty
-			//
-		case 132: {
-
-			setResult(null);
-			break;
-		}
-
-			//
-			// Rule 133: argumentsCSopt ::= $Empty
-			//
-		case 133: {
-
-			setResult(new BasicEList<OCLExpressionCS>());
-			break;
-		}
-
-			//
-			// Rule 135: argumentsCS ::= OclExpressionCS
-			//
-		case 135: {
-
-			EList<OCLExpressionCS> result = new BasicEList<OCLExpressionCS>();
-			result.add((OCLExpressionCS) getRhsSym(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 136: argumentsCS ::= argumentsCS , OclExpressionCS
-			//
-		case 136: {
-
-			EList<OCLExpressionCS> result = (EList<OCLExpressionCS>) getRhsSym(1);
-			result.add((OCLExpressionCS) getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 139: VariableExpCS ::= selfKeywordCS
-			//
-		case 139: {
-
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(1);
-			VariableExpCS result = createVariableExpCS(simpleNameCS, new BasicEList<OCLExpressionCS>(), null);
-			setOffsets(result, simpleNameCS);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 140: SimpleNameExpCS ::= simpleNameCS
-			//
-		case 140: {
-
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(1);
-			VariableExpCS result = createVariableExpCS(simpleNameCS, new BasicEList<OCLExpressionCS>(), null);
-			setOffsets(result, simpleNameCS);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 146: impliesNotNameNotLetCS ::= impliesNotLetCS implies
-			// xorNotLetCS
-			//
-		case 146:
-
-			//
-			// Rule 148: impliesWithLetCS ::= impliesNotLetCS implies
-			// xorWithLetCS
-			//
-		case 148:
-
-			//
-			// Rule 152: xorNotNameNotLetCS ::= xorNotLetCS xor orNotLetCS
-			//
-		case 152:
-
-			//
-			// Rule 154: xorWithLetCS ::= xorNotLetCS xor orWithLetCS
-			//
-		case 154:
-
-			//
-			// Rule 158: orNotNameNotLetCS ::= orNotLetCS or andNotLetCS
-			//
-		case 158:
-
-			//
-			// Rule 160: orWithLetCS ::= orNotLetCS or andWithLetCS
-			//
-		case 160:
-
-			//
-			// Rule 164: andNotNameNotLetCS ::= andNotLetCS and equalityNotLetCS
-			//
-		case 164:
-
-			//
-			// Rule 166: andWithLetCS ::= andNotLetCS and equalityWithLetCS
-			//
-		case 166:
-
-			//
-			// Rule 170: equalityNotNameNotLetCS ::= equalityNotLetCS =
-			// relationalNotLetCS
-			//
-		case 170:
-
-			//
-			// Rule 171: equalityNotNameNotLetCS ::= equalityNotLetCS <>
-			// relationalNotLetCS
-			//
-		case 171:
-
-			//
-			// Rule 173: equalityWithLetCS ::= equalityNotLetCS =
-			// relationalWithLetCS
-			//
-		case 173:
-
-			//
-			// Rule 174: equalityWithLetCS ::= equalityNotLetCS <>
-			// relationalWithLetCS
-			//
-		case 174:
-
-			//
-			// Rule 178: relationalNotNameNotLetCS ::= relationalNotLetCS >
-			// additiveNotLetCS
-			//
-		case 178:
-
-			//
-			// Rule 179: relationalNotNameNotLetCS ::= relationalNotLetCS <
-			// additiveNotLetCS
-			//
-		case 179:
-
-			//
-			// Rule 180: relationalNotNameNotLetCS ::= relationalNotLetCS >=
-			// additiveNotLetCS
-			//
-		case 180:
-
-			//
-			// Rule 181: relationalNotNameNotLetCS ::= relationalNotLetCS <=
-			// additiveNotLetCS
-			//
-		case 181:
-
-			//
-			// Rule 183: relationalWithLetCS ::= relationalNotLetCS >
-			// additiveWithLetCS
-			//
-		case 183:
-
-			//
-			// Rule 184: relationalWithLetCS ::= relationalNotLetCS <
-			// additiveWithLetCS
-			//
-		case 184:
-
-			//
-			// Rule 185: relationalWithLetCS ::= relationalNotLetCS >=
-			// additiveWithLetCS
-			//
-		case 185:
-
-			//
-			// Rule 186: relationalWithLetCS ::= relationalNotLetCS <=
-			// additiveWithLetCS
-			//
-		case 186:
-
-			//
-			// Rule 190: additiveNotNameNotLetCS ::= additiveNotLetCS +
-			// multiplicativeNotLetCS
-			//
-		case 190:
-
-			//
-			// Rule 191: additiveNotNameNotLetCS ::= additiveNotLetCS -
-			// multiplicativeNotLetCS
-			//
-		case 191:
-
-			//
-			// Rule 193: additiveWithLetCS ::= additiveNotLetCS +
-			// multiplicativeWithLetCS
-			//
-		case 193:
-
-			//
-			// Rule 194: additiveWithLetCS ::= additiveNotLetCS -
-			// multiplicativeWithLetCS
-			//
-		case 194:
-
-			//
-			// Rule 198: multiplicativeNotNameNotLetCS ::=
-			// multiplicativeNotLetCS * unaryNotLetCS
-			//
-		case 198:
-
-			//
-			// Rule 199: multiplicativeNotNameNotLetCS ::=
-			// multiplicativeNotLetCS / unaryNotLetCS
-			//
-		case 199:
-
-			//
-			// Rule 201: multiplicativeWithLetCS ::= multiplicativeNotLetCS *
-			// unaryWithLetCS
-			//
-		case 201:
-
-			//
-			// Rule 202: multiplicativeWithLetCS ::= multiplicativeNotLetCS /
-			// unaryWithLetCS
-			//
-		case 202: {
-
-			SimpleNameCS simpleNameCS = createSimpleNameCS(SimpleTypeEnum.KEYWORD_LITERAL, getRhsIToken(2));
-			setOffsets(simpleNameCS, getRhsIToken(2));
-			OCLExpressionCS left = (OCLExpressionCS) getRhsSym(1);
-			OCLExpressionCS right = (OCLExpressionCS) getRhsSym(3);
-			EList<OCLExpressionCS> args = new BasicEList<OCLExpressionCS>();
-			args.add(right);
-			OperationCallExpCS result = createOperationCallExpCS(left, simpleNameCS, args);
-			setOffsets(result, left, right);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 206: unaryNotNameNotLetCS ::= - unaryNotLetCS
-			//
-		case 206:
-
-			//
-			// Rule 207: unaryNotNameNotLetCS ::= not unaryNotLetCS
-			//
-		case 207:
-
-			//
-			// Rule 209: unaryWithLetCS ::= - unaryWithLetCS
-			//
-		case 209:
-
-			//
-			// Rule 210: unaryWithLetCS ::= not unaryWithLetCS
-			//
-		case 210: {
-
-			SimpleNameCS simpleNameCS = createSimpleNameCS(SimpleTypeEnum.KEYWORD_LITERAL, getRhsIToken(1));
-			setOffsets(simpleNameCS, getRhsIToken(1));
-			OCLExpressionCS expr = (OCLExpressionCS) getRhsSym(2);
-			OperationCallExpCS result = createOperationCallExpCS(expr, simpleNameCS, new BasicEList<OCLExpressionCS>());
-			setOffsets(result, simpleNameCS, expr);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 217: primaryNotNameCS ::= ( OclExpressionCS )
-			//
-		case 217: {
-
-			OCLExpressionCS result = (OCLExpressionCS) getRhsSym(2);
-			if (result instanceof OperationCallExpCS) {
-				((OperationCallExpCS) result).setIsAtomic(true);
-			}
-			setOffsets(result, getRhsIToken(1), getRhsIToken(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 218: LetExpCS ::= let letVariablesCS in OclExpressionCS
-			//
-		case 218: {
-
-			OCLExpressionCS expr = (OCLExpressionCS) getRhsSym(4);
-			LetExpCS result = createLetExpCS((EList<VariableCS>) getRhsSym(2), expr);
-			setOffsets(result, getRhsIToken(1), expr);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 219: letVariablesCS ::= typedInitializedVariableCS
-			//
-		case 219: {
-
-			EList<VariableCS> result = new BasicEList<VariableCS>();
-			result.add((VariableCS) getRhsSym(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 220: letVariablesCS ::= letVariablesCS ,
-			// typedInitializedVariableCS
-			//
-		case 220: {
-
-			EList<VariableCS> result = (EList<VariableCS>) getRhsSym(1);
-			result.add((VariableCS) getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 222: listTypeCS ::= List ( typeCS )
-			//
-		case 222: {
-
-			CSTNode result = createListTypeCS((TypeCS) getRhsSym(3));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 223: listLiteralCS ::= List { CollectionLiteralPartsCSopt }
-			//
-		case 223: {
-
-			CSTNode result = createListLiteralExpCS((EList) getRhsSym(3));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 225: dictTypeCS ::= Dict ( typeCS , typeCS )
-			//
-		case 225: {
-
-			CSTNode result = createDictTypeCS((TypeCS) getRhsSym(3), (TypeCS) getRhsSym(5));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(6));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 226: dictLiteralCS ::= Dict { dictLiteralPartListCSopt }
-			//
-		case 226: {
-
-			CSTNode result = createDictLiteralExpCS((EList<DictLiteralPartCS>) getRhsSym(3));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 230: dictLiteralPartCS ::= literalSimpleCS = OclExpressionCS
-			//
-		case 230: {
-
-			CSTNode result = createDictLiteralPartCS((LiteralExpCS) getRhsSym(1), (OCLExpressionCS) getRhsSym(3));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 232: dictLiteralPartListCSopt ::= $Empty
-			//
-		case 232:
-			setResult(new BasicEList<Object>());
-			break;
-
-		//
-		// Rule 233: dictLiteralPartListCS ::= dictLiteralPartCS
-		//
-		case 233: {
-
-			EList result = new BasicEList();
-			result.add(getRhsSym(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 234: dictLiteralPartListCS ::= dictLiteralPartListCS ,
-			// dictLiteralPartCS
-			//
-		case 234: {
-
-			EList result = (EList) getRhsSym(1);
-			result.add(getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 235: dictLiteralPartListCS ::= dictLiteralPartListCS
-			// qvtErrorToken
-			//
-		case 235: {
-
-			EList result = (EList) getRhsSym(1);
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 236: IteratorExpCS ::= primaryExpCS -> simpleNameCS (
-			// qvtErrorToken
-			//
-		case 236: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS simpleNameCS = (SimpleNameCS) getRhsSym(3);
-			CSTNode result = createIteratorExpCS(source, simpleNameCS, null, null, null);
-			setOffsets(result, source, getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 237: argumentsCS ::= qvtErrorToken
-			//
-		case 237:
-			setResult(new BasicEList<Object>());
-			break;
-
-		//
-		// Rule 240: IfExpCS ::= if OclExpressionCS then ifExpBodyCS else
-		// ifExpBodyCS endif
-		//
-		case 240: {
-
-			CSTNode result = createIfExpCS((OCLExpressionCS) getRhsSym(2), (OCLExpressionCS) getRhsSym(4), (OCLExpressionCS) getRhsSym(6));
-			setOffsets(result, getRhsIToken(1), getRhsIToken(7));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 241: IfExpCS ::= if OclExpressionCS then ifExpBodyCS endif
-			//
-		case 241: {
-
-			CSTNode result = createIfExpCS((OCLExpressionCS) getRhsSym(2), (OCLExpressionCS) getRhsSym(4), null);
-			setOffsets(result, getRhsIToken(1), getRhsIToken(5));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 242: IfExpCS ::= if OclExpressionCS then ifExpBodyCS else
-			// ifExpBodyCS qvtErrorToken
-			//
-		case 242: {
-
-			CSTNode result = createIfExpCS((OCLExpressionCS) getRhsSym(2), (OCLExpressionCS) getRhsSym(4), (OCLExpressionCS) getRhsSym(6));
-			setOffsets(result, getRhsIToken(1), (CSTNode) getRhsSym(6));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 243: IfExpCS ::= if OclExpressionCS then ifExpBodyCS else
-			// qvtErrorToken
-			//
-		case 243: {
-
-			CSTNode result = createIfExpCS((OCLExpressionCS) getRhsSym(2), (OCLExpressionCS) getRhsSym(4), null);
-			setOffsets(result, getRhsIToken(1), getRhsIToken(5));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 244: IfExpCS ::= if OclExpressionCS then ifExpBodyCS
-			// qvtErrorToken
-			//
-		case 244: {
-
-			CSTNode result = createIfExpCS((OCLExpressionCS) getRhsSym(2), (OCLExpressionCS) getRhsSym(4), null);
-			setOffsets(result, getRhsIToken(1), (CSTNode) getRhsSym(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 245: IfExpCS ::= if OclExpressionCS then qvtErrorToken
-			//
-		case 245: {
-
-			CSTNode result = createIfExpCS((OCLExpressionCS) getRhsSym(2), null, null);
-			setOffsets(result, getRhsIToken(1), getRhsIToken(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 246: IfExpCS ::= if OclExpressionCS qvtErrorToken
-			//
-		case 246: {
-
-			CSTNode result = createIfExpCS((OCLExpressionCS) getRhsSym(2), null, null);
-			setOffsets(result, getRhsIToken(1), (CSTNode) getRhsSym(2));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 247: IfExpCS ::= if qvtErrorToken
-			//
-		case 247: {
-
-			OCLExpressionCS invalidCondition = createInvalidLiteralExpCS("");
-			invalidCondition.setStartOffset(getRhsIToken(1).getEndOffset());
-			invalidCondition.setEndOffset(getRhsIToken(1).getEndOffset());
-			CSTNode result = createIfExpCS(invalidCondition, null, null);
-			setOffsets(result, getRhsIToken(1), getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 248: IterateExpCS ::= primaryExpCS -> imperativeIterateExpCS
-			//
-		case 248: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			ImperativeIterateExpCS iterateExpCS = (ImperativeIterateExpCS) getRhsSym(3);
-			iterateExpCS.setSource(source);
-			setOffsets(iterateExpCS, source, iterateExpCS);
-			setResult(iterateExpCS);
-			break;
-		}
-
-			//
-			// Rule 257: imperativeIterateExpCS ::=
-			// imperativeIteratorExpCSToken12 ( imperativeIterContents12 )
-			//
-		case 257:
-
-			//
-			// Rule 258: imperativeIterateExpCS ::=
-			// imperativeIteratorExpCSToken3 ( imperativeIterContents3 )
-			//
-		case 258: {
-
-			String opCode = getRhsTokenText(1);
-			SimpleNameCS simpleNameCS = createSimpleNameCS(SimpleTypeEnum.KEYWORD_LITERAL, getRhsIToken(1));
-			setOffsets(simpleNameCS, getRhsIToken(1));
-			Object[] iterContents = (Object[]) getRhsSym(3);
-			OCLExpressionCS bodyCS = null;
-			OCLExpressionCS conditionCS = null;
-			if ("xcollect".equals(opCode) || "collectOne".equals(opCode)) {
-				bodyCS = (OCLExpressionCS) iterContents[2];
-			} else {
-				conditionCS = (OCLExpressionCS) iterContents[2];
-			}
-			CSTNode result = createImperativeIterateExpCS(simpleNameCS, (EList<VariableCS>) iterContents[0], (VariableCS) iterContents[1], bodyCS, conditionCS);
-			setOffsets(result, getRhsIToken(1), getRhsIToken(4));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 259: imperativeIterateExpCS ::= imperativeIteratorExpCSToken
-			// qvtErrorToken
-			//
-		case 259: {
-
-			SimpleNameCS simpleNameCS = createSimpleNameCS(SimpleTypeEnum.KEYWORD_LITERAL, getRhsIToken(1));
-			setOffsets(simpleNameCS, getRhsIToken(1));
-			CSTNode result = createImperativeIterateExpCS(simpleNameCS, ourEmptyEList, null, null, null);
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 260: imperativeIterContents12 ::= OclExpressionCS
-			//
-		case 260: {
-
-			setResult(new Object[] { ourEmptyEList, null, getRhsSym(1) });
-			break;
-		}
-
-			//
-			// Rule 261: imperativeIterContents12 ::= uninitializedVariableCS |
-			// OclExpressionCS
-			//
-		case 261: {
-
-			EList iters = new BasicEList();
-			iters.add(getRhsSym(1));
-
-			setResult(new Object[] { iters, null, getRhsSym(3) });
-			break;
-		}
-
-			//
-			// Rule 262: imperativeIterContents12 ::= simpleNameCS ,
-			// variableDeclarationListCS | OclExpressionCS
-			//
-		case 262: {
-
-			SimpleNameCS name = (SimpleNameCS) getRhsSym(1);
-			CSTNode variableCS = createVariableCS(name, null, null);
-			setOffsets(variableCS, name);
-
-			EList iters = (EList) getRhsSym(3);
-			iters.add(0, variableCS);
-
-			setResult(new Object[] { iters, null, getRhsSym(5) });
-			break;
-		}
-
-			//
-			// Rule 263: imperativeIterContents3 ::= variableDeclarationListCS ;
-			// initializedVariableCS | OclExpressionCS
-			//
-		case 263: {
-
-			setResult(new Object[] { getRhsSym(1), getRhsSym(3), getRhsSym(5) });
-			break;
-		}
-
-			//
-			// Rule 264: variableDeclarationListCS ::= uninitializedVariableCS
-			//
-		case 264: {
-
-			EList result = new BasicEList();
-			result.add(getRhsSym(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 265: variableDeclarationListCS ::= variableDeclarationListCS
-			// , uninitializedVariableCS
-			//
-		case 265: {
-
-			EList result = (EList) getRhsSym(1);
-			result.add(getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 266: exclamationOpt ::= $Empty
-			//
-		case 266:
-			setResult(null);
-			break;
-
-		//
-		// Rule 268: declarator_vsep ::= IDENTIFIER |
-		//
-		case 268: {
-
-			CSTNode result = createVariableCS(getRhsIToken(1), null, null);
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 269: declarator_vsepOpt ::= $Empty
-			//
-		case 269:
-			setResult(null);
-			break;
-
-		//
-		// Rule 271: IterateExpCS ::= primaryExpCS exclamationOpt [
-		// declarator_vsepOpt OclExpressionCS ]
-		//
-		case 271: {
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			if (source instanceof ImperativeIterateExpCS) {
-				String opCode = isTokenOfType(getRhsIToken(2), XpandParsersym.TK_EXCLAMATION_MARK) ? "collectselectOne" : "collectselect";
-				SimpleNameCS simpleNameCS = createSimpleNameCS(SimpleTypeEnum.KEYWORD_LITERAL, opCode);
-				setOffsets(simpleNameCS, getRhsIToken(3), getRhsIToken(6));
-
-				ImperativeIterateExpCS result = (ImperativeIterateExpCS) source;
-				result.setSimpleNameCS(simpleNameCS);
-
-				VariableCS variableCS = (VariableCS) getRhsSym(4);
-				if (variableCS != null) {
-					result.setTarget(variableCS);
-				}
-				result.setCondition((OCLExpressionCS) getRhsSym(5));
-
-				setOffsets(result, getRhsIToken(1), getRhsIToken(6));
-				setResult(result);
-			} else {
-				String opCode = isTokenOfType(getRhsIToken(2), XpandParsersym.TK_EXCLAMATION_MARK) ? "selectOne" : "xselect";
-				SimpleNameCS simpleNameCS = createSimpleNameCS(SimpleTypeEnum.KEYWORD_LITERAL, opCode);
-				setOffsets(simpleNameCS, getRhsIToken(3), getRhsIToken(6));
-
-				CallExpCS result = createImperativeIterateExpCS(simpleNameCS, ourEmptyEList, (VariableCS) getRhsSym(4), null, (OCLExpressionCS) getRhsSym(5));
-				result.setSource(source);
-				setOffsets(result, getRhsIToken(1), getRhsIToken(6));
-				setResult(result);
-			}
-			break;
-		}
-
-			//
-			// Rule 272: IterateExpCS ::= primaryExpCS -> simpleNameCS
-			//
-		case 272: {
-
-			String opCode = "xcollect";
-			SimpleNameCS simpleNameCS = createSimpleNameCS(SimpleTypeEnum.KEYWORD_LITERAL, opCode);
-
-			OCLExpressionCS source = (OCLExpressionCS) getRhsSym(1);
-			SimpleNameCS featureNameCS = (SimpleNameCS) getRhsSym(3);
-			OCLExpressionCS featureCallExpCS = createFeatureCallExpCS(source, null, featureNameCS, new BasicEList(), null);
-			setOffsets(featureCallExpCS, source, featureNameCS);
-
-			ImperativeIterateExpCS result = createImperativeIterateExpCS(simpleNameCS, ourEmptyEList, null, null, null);
-			result.setSource(featureCallExpCS);
-			setOffsets(result, getRhsIToken(1), getRhsIToken(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 273: primaryNotNameCS ::= break
-			//
-		case 273: {
-
-			OCLExpressionCS result = createBreakCS();
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 274: primaryNotNameCS ::= continue
-			//
-		case 274: {
-
-			OCLExpressionCS result = createContinueCS();
-			setOffsets(result, getRhsIToken(1));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 277: declarator1 ::= IDENTIFIER : typeCS
-			//
-		case 277: {
-
-			CSTNode result = createVariableCS(getRhsIToken(1), (TypeCS) getRhsSym(3), null);
-			setOffsets(result, getRhsIToken(1), (CSTNode) getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 278: declarator1 ::= IDENTIFIER : typeCS = OclExpressionCS
-			//
-		case 278: {
-
-			CSTNode result = createVariableCS(getRhsIToken(1), (TypeCS) getRhsSym(3), (OCLExpressionCS) getRhsSym(5));
-			setOffsets(result, getRhsIToken(1), (CSTNode) getRhsSym(5));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 279: declarator1 ::= IDENTIFIER : typeCS := OclExpressionCS
-			//
-		case 279: {
-
-			CSTNode result = createVariableCS(getRhsIToken(1), (TypeCS) getRhsSym(3), (OCLExpressionCS) getRhsSym(5));
-			setOffsets(result, getRhsIToken(1), (CSTNode) getRhsSym(5));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 280: declarator2 ::= IDENTIFIER := OclExpressionCS
-			//
-		case 280: {
-
-			CSTNode result = createVariableCS(getRhsIToken(1), null, (OCLExpressionCS) getRhsSym(3));
-			setOffsets(result, getRhsIToken(1), (CSTNode) getRhsSym(3));
-			setResult(result);
-			break;
-		}
-
-			//
-			// Rule 281: qvtErrorToken ::= ERROR_TOKEN
-			//
-		case 281: {
-
-			diagnozeErrorToken(getRhsTokenIndex(1));
-			break;
-		}
-
-			//
-			// Rule 282: template ::= emptyTemplate
-			//
-		case 282: {
-
-			setResult(xpandFactory.createTemplate(Collections.EMPTY_LIST, Collections.EMPTY_LIST, Collections.EMPTY_LIST, Collections.EMPTY_LIST, getRightIToken()));
-			break;
-		}
-			//
-			// Rule 285: template ::= LG commentTextPairAny imports
-			// extensionImports defineOrAroundSeq
-			//
-		case 285: {
-
-			List imports = (List) getRhsSym(3);
-			List extensionImports = (List) getRhsSym(4);
-			List defineOrAround = (List) getRhsSym(5);
-			List<Advice> advices = new LinkedList<Advice>();
-			List<Definition> defines = new LinkedList<Definition>();
-			for (Object o : defineOrAround) {
-				if (o instanceof Definition) {
-					defines.add((Definition) o);
-				} else if (o instanceof Advice) {
-					advices.add((Advice) o);
-				} else {
-					throw new IllegalStateException();// assert false?
-				}
-			}
-			setResult(xpandFactory.createTemplate(imports, extensionImports, defines, advices, getRightIToken()));
-			break;
-		}
-			//
-			// Rule 286: defineOrAroundSeq ::= define TEXT commentTextPairAny
-			// defineOrAroundSuffix
-			//
-		case 286: {
-
-			List result = new LinkedList();
-			result.add(getRhsSym(1));
-			result.addAll((List) getRhsSym(4));
-			setResult(result);
-			break;
-		}
-			//
-			// Rule 287: defineOrAroundSeq ::= around TEXT commentTextPairAny
-			// defineOrAroundSuffix
-			//
-		case 287: {
-
-			List result = new LinkedList();
-			result.add(getRhsSym(1));
-			result.addAll((List) getRhsSym(4));
-			setResult(result);
-			break;
-		}
-			//
-			// Rule 288: defineOrAroundSuffix ::= $Empty
-			//
-		case 288: {
-
-			setResult(Collections.EMPTY_LIST);
-			break;
-		}
-			//
-			// Rule 292: imports ::= $Empty
-			//
-		case 292: {
-
-			setResult(Collections.EMPTY_LIST);
-			break;
-		}
-			//
-			// Rule 293: imports ::= anImport imports
-			//
-		case 293: {
-
-			List res = new LinkedList();
-			res.add(getRhsSym(1));
-			res.addAll((List) getRhsSym(2));
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 294: anImport ::= IMPORT StringLiteralExpCS TEXT
-			// commentTextPairAny
-			//
-		case 294: {
-
-			setResult(xpandFactory.createNamespaceImport(getLeftIToken(), (StringLiteralExpCS) getRhsSym(2)));
-			break;
-		}
-			//
-			// Rule 295: extensionImports ::= $Empty
-			//
-		case 295: {
-
-			setResult(Collections.EMPTY_LIST);
-			break;
-		}
-			//
-			// Rule 296: extensionImports ::= anExtensionImport extensionImports
-			//
-		case 296: {
-
-			List res = new LinkedList();
-			res.add(getRhsSym(1));
-			res.addAll((List) getRhsSym(2));
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 297: anExtensionImport ::= EXTENSION pathNameCS TEXT
-			// commentTextPairAny
-			//
-		case 297: {
-
-			setResult(xpandFactory.createImportDeclaration(getLeftIToken(), (PathNameCS) getRhsSym(2)));
-			break;
-		}
-			//
-			// Rule 298: around ::= AROUND pointcut FOR typeCS sequence
-			// ENDAROUND
-			//
-		case 298: {
-
-			setResult(xpandFactory.createAround(getLeftIToken(), getRightIToken(), (Identifier) getRhsSym(2), Collections.<VariableCS> emptyList(), false, (TypeCS) getRhsSym(4), (List) getRhsSym(5)));
-			break;
-		}
-			//
-			// Rule 299: around ::= AROUND pointcut LPAREN parametersList RPAREN
-			// FOR typeCS sequence ENDAROUND
-			//
-		case 299: {
-
-			setResult(xpandFactory.createAround(getLeftIToken(), getRightIToken(), (Identifier) getRhsSym(2), (List<VariableCS>) getRhsSym(4), false, (TypeCS) getRhsSym(7), (List) getRhsSym(8)));
-			break;
-		}
-			//
-			// Rule 300: around ::= AROUND pointcut LPAREN parametersList COMMA
-			// MULTIPLY RPAREN FOR typeCS sequence ENDAROUND
-			//
-		case 300: {
-
-			setResult(xpandFactory.createAround(getLeftIToken(), getRightIToken(), (Identifier) getRhsSym(2), (List<VariableCS>) getRhsSym(4), true, (TypeCS) getRhsSym(9), (List) getRhsSym(10)));
-			break;
-		}
-			//
-			// Rule 301: around ::= AROUND pointcut LPAREN MULTIPLY RPAREN FOR
-			// typeCS sequence ENDAROUND
-			//
-		case 301: {
-
-			setResult(xpandFactory.createAround(getLeftIToken(), getRightIToken(), (Identifier) getRhsSym(2), Collections.<VariableCS> emptyList(), true, (TypeCS) getRhsSym(7), (List) getRhsSym(8)));
-			break;
-		}
-			//
-			// Rule 302: pointcut ::= MULTIPLY pointcutSuffix
-			//
-		case 302: {
-
-			// FIXME: may use SimpleNameCS here, though need more sophisticated
-			// code to update end position
-			// SimpleNameCS simpleNameCS =
-			// createSimpleNameCS(SimpleTypeEnum.IDENTIFIER_LITERAL,
-			// getTokenText(getRhsTokenIndex(1)));
-			// setOffsets(simpleNameCS, getLeftIToken());
-			Identifier res = xpandFactory.createIdentifier(getLeftIToken());
-			if (getRhsSym(2) != null) {
-				res = res.append((Identifier) getRhsSym(2));
-			}
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 303: pointcut ::= IDENTIFIER pointcutSuffix
-			//
-		case 303: {
-
-			Identifier res = xpandFactory.createIdentifier(getLeftIToken());
-			if (getRhsSym(2) != null) {
-				res = res.append((Identifier) getRhsSym(2));
-			}
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 304: pointcutSuffix ::= $Empty
-			//
-		case 304: {
-
-			setResult(null);
-			break;
-		}
-			//
-			// Rule 306: pointcutSuffix ::= COLONCOLON pointcutSuffix
-			//
-		case 306: {
-
-			Identifier res = xpandFactory.createIdentifier(getLeftIToken());
-			if (getRhsSym(2) != null) {
-				res = res.append((Identifier) getRhsSym(2));
-			}
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 307: define ::= DEFINE IDENTIFIER FOR typeCS sequence
-			// ENDDEFINE
-			//
-		case 307: {
-
-			setResult(xpandFactory.createDefinition(getLeftIToken(), getRightIToken(), getRhsIToken(2), Collections.<VariableCS> emptyList(), (TypeCS) getRhsSym(4), (List) getRhsSym(5)));
-			break;
-		}
-			//
-			// Rule 308: define ::= DEFINE IDENTIFIER LPAREN parametersList
-			// RPAREN FOR typeCS sequence ENDDEFINE
-			//
-		case 308: {
-
-			setResult(xpandFactory.createDefinition(getLeftIToken(), getRightIToken(), getRhsIToken(2), (List<VariableCS>) getRhsSym(4), (TypeCS) getRhsSym(7), (List) getRhsSym(8)));
-			break;
-		}
-			//
-			// Rule 309: parametersList ::= parameter
-			//
-		case 309: {
-
-			VariableCS param = (VariableCS) getRhsSym(1);
-			LinkedList res = new LinkedList();
-			res.add(param);
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 310: parametersList ::= parametersList , parameter
-			//
-		case 310: {
-
-			VariableCS param = (VariableCS) getRhsSym(3);
-			LinkedList res = new LinkedList();
-			res.addAll((List) getRhsSym(1));
-			res.add(param);
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 312: parameter ::= typeCS IDENTIFIER
-			//
-		case 312: {
-
-			VariableCS result = createVariableCS(getRhsIToken(2).toString(), (TypeCS) getRhsSym(1), null);
-			setOffsets(result, (TypeCS) getRhsSym(1), getRhsIToken(2));
-			setResult(result);
-			break;
-		}
-			//
-			// Rule 313: sequence ::= text sequenceSuffix
-			//
-		case 313: {
-
-			List res = new LinkedList();
-			res.addAll((List) getRhsSym(1));
-			res.addAll((List) getRhsSym(2));
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 314: sequenceSuffix ::= $Empty
-			//
-		case 314: {
-
-			setResult(Collections.EMPTY_LIST);
-			break;
-		}
-			//
-			// Rule 315: sequenceSuffix ::= statement text sequenceSuffix
-			//
-		case 315: {
-
-			List res = new LinkedList();
-			res.add(getRhsSym(1));
-			res.addAll((List) getRhsSym(2));
-			res.addAll((List) getRhsSym(3));
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 322: text ::= minusOpt TEXT textSuffix
-			//
-		case 322: {
-
-			List res = new LinkedList();
-			res.add(xpandFactory.createTextStatement(getRhsIToken(2), (IToken) getRhsSym(1)));
-			res.addAll((List) getRhsSym(3));
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 323: textSuffix ::= $Empty
-			//
-		case 323: {
-
-			setResult(Collections.EMPTY_LIST);
-			break;
-		}
-			//
-			// Rule 324: textSuffix ::= minusOpt TEXT textSuffix
-			//
-		case 324: {
-
-			List res = new LinkedList();
-			res.add(xpandFactory.createTextStatement(getRhsIToken(2), (IToken) getRhsSym(1)));
-			res.addAll((List) getRhsSym(3));
-			setResult(res);
-			break;
-		}
-			//
-			// Rule 325: minusOpt ::= $Empty
-			//
-		case 325: {
-
-			setResult(null);
-			break;
-		}
-			//
-			// Rule 326: minusOpt ::= MINUS
-			//
-		case 326: {
-
-			setResult(getLeftIToken());
-			break;
-		}
-			//
-			// Rule 330: errorStatement ::= ERROR OclExpressionCS
-			//
-		case 330: {
-
-			setResult(xpandFactory.createErrorStatement(getLeftIToken(), (OCLExpressionCS) getRhsSym(2)));
-			break;
-		}
-			//
-			// Rule 331: expandStatement ::= EXPAND definitionName
-			// parameterListOpt
-			//
-		case 331: {
-
-			setResult(xpandFactory.createExpandStatement(getLeftIToken(), (PathNameCS) getRhsSym(2), (List) getRhsSym(3), null, false, null));
-			break;
-		}
-			//
-			// Rule 332: expandStatement ::= EXPAND definitionName
-			// parameterListOpt FOR OclExpressionCS
-			//
-		case 332: {
-
-			setResult(xpandFactory.createExpandStatement(getLeftIToken(), (PathNameCS) getRhsSym(2), (List) getRhsSym(3), (OCLExpressionCS) getRhsSym(5), false, null));
-			break;
-		}
-			//
-			// Rule 333: expandStatement ::= EXPAND definitionName
-			// parameterListOpt FOREACH OclExpressionCS separatorOpt
-			//
-		case 333: {
-
-			setResult(xpandFactory.createExpandStatement(getLeftIToken(), (PathNameCS) getRhsSym(2), (List) getRhsSym(3), (OCLExpressionCS) getRhsSym(5), true, (OCLExpressionCS) getRhsSym(6)));
-			break;
-		}
-			//
-			// Rule 334: parameterListOpt ::= $Empty
-			//
-		case 334: {
-
-			setResult(Collections.EMPTY_LIST);
-			break;
-		}
-			//
-			// Rule 335: parameterListOpt ::= LPAREN argumentsCS RPAREN
-			//
-		case 335: {
-
-			setResult(getRhsSym(2));
-			break;
-		}
-			//
-			// Rule 337: expressionStmt ::= OclExpressionCS
-			//
-		case 337: {
-
-			// XXX OCL CST doesn't keep track of line numbers, but we use them
-			// (perhaps, might refactor to stop using?)
-			int lineNumber = getLeftIToken().getLine();
-			setResult(xpandFactory.createExpressionStatement((OCLExpressionCS) getRhsSym(1), lineNumber));
-			break;
-		}
-			//
-			// Rule 338: fileStatement ::= FILE OclExpressionCS identOpt
-			// sequence ENDFILE
-			//
-		case 338: {
-
-			setResult(xpandFactory.createFileStatement(getLeftIToken(), getRightIToken(), (OCLExpressionCS) getRhsSym(2), (Identifier) getRhsSym(3), (List) getRhsSym(4)));
-			break;
-		}
-			//
-			// Rule 339: identOpt ::= $Empty
-			//
-		case 339: {
-
-			setResult(null);
-			break;
-		}
-			//
-			// Rule 340: identOpt ::= IDENTIFIER
-			//
-		case 340: {
-
-			setResult(xpandFactory.createIdentifier(getLeftIToken()));
-			break;
-		}
-			//
-			// Rule 341: foreachStatement ::= FOREACH OclExpressionCS AS
-			// IDENTIFIER iteratorOpt separatorOpt sequence ENDFOREACH
-			//
-		case 341: {
-
-			setResult(xpandFactory.createForEachStatement(getLeftIToken(), getRightIToken(), (OCLExpressionCS) getRhsSym(2), getRhsIToken(4), (OCLExpressionCS) getRhsSym(6), (IToken) getRhsSym(5),
-					(List) getRhsSym(7)));
-			break;
-		}
-			//
-			// Rule 342: iteratorOpt ::= $Empty
-			//
-		case 342: {
-
-			setResult(null);
-			break;
-		}
-			//
-			// Rule 343: iteratorOpt ::= ITERATOR IDENTIFIER
-			//
-		case 343: {
-
-			setResult(getRightIToken());
-			break;
-		}
-			//
-			// Rule 344: separatorOpt ::= $Empty
-			//
-		case 344: {
-
-			setResult(null);
-			break;
-		}
-			//
-			// Rule 345: separatorOpt ::= SEPARATOR OclExpressionCS
-			//
-		case 345: {
-
-			setResult(getRhsSym(2));
-			break;
-		}
-			//
-			// Rule 346: ifStatement ::= IF OclExpressionCS sequence elseifAny
-			// elseOpt ENDIF
-			//
-		case 346: {
-
-			IfStatement i = xpandFactory.createIfStatement(getLeftIToken(), (OCLExpressionCS) getRhsSym(2), (List) getRhsSym(3), null);
-			IfStatement elseIf = (IfStatement) getRhsSym(4);
-			IfStatement elseStmt = (IfStatement) getRhsSym(5);
-			if (elseIf != null) {
-				i.setElseIf(elseIf);
-				IfStatement curElseIf = elseIf;
-				// get the latest one in the chain
-				while (curElseIf.getElseIf() != null) {
-					curElseIf = curElseIf.getElseIf();
-				}
-				curElseIf.setElseIf(elseStmt);
-			} else {
-				i.setElseIf(elseStmt);
-			}
-			setResult(i);
-			break;
-		}
-			//
-			// Rule 347: elseifAny ::= $Empty
-			//
-		case 347: {
-
-			setResult(null);
-			break;
-		}
-			//
-			// Rule 348: elseifAny ::= ELSEIF OclExpressionCS sequence elseifAny
-			//
-		case 348: {
-
-			IfStatement elseIf = xpandFactory.createIfStatement(getLeftIToken(), (OCLExpressionCS) getRhsSym(2), (List) getRhsSym(3), null);
-			IfStatement restElseIf = (IfStatement) getRhsSym(4);
-			elseIf.setElseIf(restElseIf);
-			setResult(elseIf);
-			break;
-		}
-			//
-			// Rule 349: elseOpt ::= $Empty
-			//
-		case 349: {
-
-			setResult(null);
-			break;
-		}
-			//
-			// Rule 350: elseOpt ::= ELSE sequence
-			//
-		case 350: {
-
-			setResult(xpandFactory.createIfStatement(getLeftIToken(), null, (List) getRhsSym(2), null));
-			break;
-		}
-			//
-			// Rule 351: letStatement ::= LET OclExpressionCS AS IDENTIFIER
-			// sequence ENDLET
-			//
-		case 351: {
-
-			setResult(xpandFactory.createLetStatement(getLeftIToken(), getRightIToken(), (OCLExpressionCS) getRhsSym(2), getRhsIToken(4), (List) getRhsSym(5)));
-			break;
-		}
-			//
-			// Rule 352: protectStatement ::= PROTECT CSTART OclExpressionCS
-			// CEND OclExpressionCS ID OclExpressionCS disabledOpt sequence
-			// ENDPROTECT
-			//
-		case 352: {
-
-			setResult(xpandFactory.createProtectStatement(getLeftIToken(), getRightIToken(), (OCLExpressionCS) getRhsSym(3), (OCLExpressionCS) getRhsSym(5), (OCLExpressionCS) getRhsSym(7),
-					(IToken) getRhsSym(8), (List) getRhsSym(9)));
-			break;
-		}
-			//
-			// Rule 353: disabledOpt ::= $Empty
-			//
-		case 353: {
-
-			setResult(null);
-			break;
-		}
-			//
-			// Rule 354: disabledOpt ::= DISABLE
-			//
-		case 354: {
-
-			setResult(getLeftIToken());
-			break;
-		}
-
-		default:
-			break;
-		}
-		return;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParserprs.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParserprs.java
deleted file mode 100644
index 06452b2a6aa..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParserprs.java
+++ /dev/null
@@ -1,2156 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-public class XpandParserprs implements lpg.runtime.ParseTable, XpandParsersym {
-    public final static int ERROR_SYMBOL = 42;
-    public final int getErrorSymbol() { return ERROR_SYMBOL; }
-
-    public final static int SCOPE_UBOUND = 64;
-    public final int getScopeUbound() { return SCOPE_UBOUND; }
-
-    public final static int SCOPE_SIZE = 65;
-    public final int getScopeSize() { return SCOPE_SIZE; }
-
-    public final static int MAX_NAME_LENGTH = 30;
-    public final int getMaxNameLength() { return MAX_NAME_LENGTH; }
-
-    public final static int NUM_STATES = 316;
-    public final int getNumStates() { return NUM_STATES; }
-
-    public final static int NT_OFFSET = 192;
-    public final int getNtOffset() { return NT_OFFSET; }
-
-    public final static int LA_STATE_OFFSET = 5439;
-    public final int getLaStateOffset() { return LA_STATE_OFFSET; }
-
-    public final static int MAX_LA = 2;
-    public final int getMaxLa() { return MAX_LA; }
-
-    public final static int NUM_RULES = 354;
-    public final int getNumRules() { return NUM_RULES; }
-
-    public final static int NUM_NONTERMINALS = 150;
-    public final int getNumNonterminals() { return NUM_NONTERMINALS; }
-
-    public final static int NUM_SYMBOLS = 342;
-    public final int getNumSymbols() { return NUM_SYMBOLS; }
-
-    public final static int SEGMENT_SIZE = 8192;
-    public final int getSegmentSize() { return SEGMENT_SIZE; }
-
-    public final static int START_STATE = 4558;
-    public final int getStartState() { return START_STATE; }
-
-    public final static int IDENTIFIER_SYMBOL = 3;
-    public final int getIdentifier_SYMBOL() { return IDENTIFIER_SYMBOL; }
-
-    public final static int EOFT_SYMBOL = 69;
-    public final int getEoftSymbol() { return EOFT_SYMBOL; }
-
-    public final static int EOLT_SYMBOL = 69;
-    public final int getEoltSymbol() { return EOLT_SYMBOL; }
-
-    public final static int ACCEPT_ACTION = 5084;
-    public final int getAcceptAction() { return ACCEPT_ACTION; }
-
-    public final static int ERROR_ACTION = 5085;
-    public final int getErrorAction() { return ERROR_ACTION; }
-
-    public final static boolean BACKTRACK = false;
-    public final boolean getBacktrack() { return BACKTRACK; }
-
-    public final int getStartSymbol() { return lhs(0); }
-    public final boolean isValidForParser() { return XpandParsersym.isValidForParser; }
-
-
-    public interface IsNullable {
-        public final static byte isNullable[] = {0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            1,0,0,0,0,1,0,0,0,1,
-            1,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,1,1,0,
-            0,0,0,0,1,1,1,0,0,0,
-            1,0,0,0,0,0,0,0,1,0,
-            0,0,1,1,1,0,0,1,0,0,
-            0,1,0,0,0,0,0,0,0,1,
-            0,1,1,0,1,1,1,1,1,0,
-            0,0
-        };
-    };
-    public final static byte isNullable[] = IsNullable.isNullable;
-    public final boolean isNullable(int index) { return isNullable[index] != 0; }
-
-    public interface ProsthesesIndex {
-        public final static char prosthesesIndex[] = {0,
-            11,8,9,13,15,16,38,30,36,37,
-            39,40,41,42,10,27,28,29,31,44,
-            45,46,47,48,49,50,51,52,57,58,
-            59,84,86,87,88,89,92,94,81,82,
-            83,78,79,80,75,76,77,72,73,74,
-            69,70,71,66,67,68,63,64,65,22,
-            53,60,61,62,14,91,93,99,138,129,
-            125,19,54,55,20,23,25,115,56,85,
-            111,112,113,124,128,6,7,12,21,24,
-            34,35,118,119,121,127,32,33,96,97,
-            100,107,116,117,120,122,123,126,130,131,
-            132,133,134,135,136,137,139,140,141,142,
-            145,148,2,3,4,17,18,43,90,95,
-            98,101,102,103,104,105,106,108,109,110,
-            114,143,144,146,147,149,150,1,5,26
-        };
-    };
-    public final static char prosthesesIndex[] = ProsthesesIndex.prosthesesIndex;
-    public final int prosthesesIndex(int index) { return prosthesesIndex[index]; }
-
-    public interface IsKeyword {
-        public final static byte isKeyword[] = {0,
-            0,0,0,0,0,0,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            0,1,1,0,0,0,1,1,1,1,
-            1,1,1,1,1,1,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,1,1,0,1,0,0,1,
-            0,0,0,0,0,0,0,1,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,1,1,1,1,1,1,1,
-            1,1,0,0,0,0,0,1,1,1,
-            1,1,1,1,1,1,1,1,1,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0
-        };
-    };
-    public final static byte isKeyword[] = IsKeyword.isKeyword;
-    public final boolean isKeyword(int index) { return isKeyword[index] != 0; }
-
-    public interface BaseCheck {
-        public final static short baseCheck[] = {0,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,1,1,3,1,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            1,1,1,1,4,4,0,1,1,3,
-            1,3,3,5,1,1,1,1,1,1,
-            1,1,1,1,1,1,4,0,1,1,
-            3,1,1,3,1,1,1,1,1,1,
-            1,4,1,3,1,1,1,2,1,1,
-            1,1,1,1,1,1,1,1,1,1,
-            8,10,10,8,10,1,1,1,5,6,
-            8,8,7,7,5,6,9,1,4,6,
-            4,0,0,1,1,3,1,1,1,1,
-            1,1,1,1,1,3,1,3,1,1,
-            1,3,1,3,1,1,1,3,1,3,
-            1,1,1,3,1,3,1,1,1,3,
-            3,1,3,3,1,1,1,3,3,3,
-            3,1,3,3,3,3,1,1,1,3,
-            3,1,3,3,1,1,1,3,3,1,
-            3,3,1,1,1,2,2,1,2,2,
-            1,1,1,1,1,1,3,4,1,3,
-            1,4,4,1,6,4,1,1,1,3,
-            1,0,1,3,2,5,1,3,1,7,
-            5,7,6,5,4,3,2,3,1,1,
-            1,1,1,1,1,1,4,4,2,1,
-            3,5,5,1,3,0,1,2,0,1,
-            6,3,1,1,1,1,3,5,5,3,
-            1,1,0,3,5,4,4,0,1,0,
-            2,0,2,4,0,2,4,6,9,11,
-            9,2,2,0,1,2,6,9,1,3,
-            1,2,2,0,3,1,1,1,1,1,
-            1,3,0,3,0,1,1,1,1,2,
-            3,5,6,0,3,1,1,5,0,1,
-            8,0,2,0,2,6,0,4,0,2,
-            6,10,0,1,-58,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,-135,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,-210,-2,0,0,0,0,0,0,0,
-            0,-9,0,0,0,-150,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -136,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,-14,0,0,0,0,0,0,0,
-            0,0,-45,0,0,0,-224,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-13,0,-3,0,0,
-            -47,0,0,0,-281,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,-15,-72,0,0,0,-16,0,
-            -114,0,-126,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,-228,0,0,
-            0,0,-4,-6,0,0,0,0,0,0,
-            0,0,-28,0,0,0,-121,0,0,0,
-            -18,-29,-24,0,0,-222,0,0,0,0,
-            0,-128,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,-19,0,0,0,0,0,0,0,-23,
-            0,0,0,0,0,0,0,-26,0,-194,
-            0,-36,0,0,-279,0,0,-37,0,0,
-            -226,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,-166,-38,0,
-            -239,0,0,-39,-40,0,-41,0,-147,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-5,0,-164,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,-42,-17,-43,0,0,0,-277,0,
-            0,-283,0,0,-10,0,0,-218,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,-8,0,0,0,0,0,0,0,
-            0,-20,0,-116,-119,0,0,-248,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,-44,-21,0,
-            0,-22,-46,-155,-27,-48,0,-250,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,-50,-57,0,
-            0,-59,0,-165,-61,-305,0,-292,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,-30,-7,-12,0,-11,0,-25,-33,
-            0,-286,0,-231,0,-62,0,-183,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,-64,0,0,-66,0,0,
-            -67,-68,0,0,-69,0,0,0,-70,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -71,0,-167,0,-169,-249,-256,-153,0,-207,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,-284,0,0,0,0,0,
-            0,-262,0,-230,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,-123,0,
-            0,0,0,-73,-290,0,-74,-76,-77,-78,
-            -79,-80,-83,0,0,-84,-85,-86,-87,-88,
-            -89,-300,-159,-90,0,0,-263,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,-91,-92,-93,-94,
-            -98,-99,-100,-101,-102,-103,-111,-115,-120,-122,
-            -130,-137,-138,-139,-152,-154,-156,-158,-160,-162,
-            -163,-168,0,0,-151,-129,0,0,-280,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,-105,0,0,-170,0,-104,
-            -75,0,-81,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,-245,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,-172,0,0,
-            -55,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-82,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -106,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-107,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -108,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-109,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -110,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-148,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -149,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-157,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -195,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-219,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -227,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-229,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -232,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-235,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -236,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-241,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -243,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-264,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -276,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-278,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -285,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-288,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -291,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-307,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -308,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-309,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -310,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-311,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -131,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -132,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,-146,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,-133,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,-134,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,-142,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,-143,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,-144,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,-145,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,-95,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -96,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,-265,
-            -240,0,-173,-174,-124,0,-175,-177,-178,-179,
-            -180,-181,-182,-184,-185,-186,-187,-1,-188,-189,
-            -190,-266,-191,-192,-193,-197,-198,-199,-200,-201,
-            -202,-203,-204,-205,-206,-209,-211,-212,-214,-216,
-            0,-140,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            -141,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,-217,
-            0,0,-31,0,0,0,0,0,0,-34,
-            0,0,0,0,0,0,0,0,0,0,
-            0,-171,0,-220,-221,-176,0,-223,-234,-237,
-            -49,0,0,0,0,0,0,-233,0,-238,
-            0,-60,0,0,0,0,0,0,-125,-53,
-            0,-287,-244,-246,-247,0,0,0,0,0,
-            0,0,0,-251,-252,-253,-254,0,0,0,
-            -255,-257,-208,-258,0,0,0,-259,-260,-261,
-            -267,-268,-271,0,0,0,-272,0,-273,0,
-            0,0,0,0,0,0,0,0,-32,0,
-            0,0,0,0,0,0,0,0,0,-274,
-            0,0,0,0,-275,0,-293,0,-294,0,
-            -215,0,0,0,0,-295,0,-35,0,0,
-            0,0,0,0,-51,0,0,0,0,0,
-            0,0,0,0,-296,-297,-298,0,0,-52,
-            0,0,0,0,0,0,-54,0,0,0,
-            0,0,0,0,0,0,-56,0,0,0,
-            0,0,0,-242,-299,0,0,-301,0,0,
-            -63,0,0,0,0,0,0,-97,0,0,
-            0,0,0,0,0,-269,-302,-303,-304,0,
-            0,0,-65,0,0,0,0,0,0,-306,
-            -313,-314,-315,-316,0,0,0,-127,0,0,
-            0,0,0,0,-113,0,0,0,0,0,
-            0,0,0,0,-117,0,0,0,0,0,
-            0,-270,0,0,0,0,0,0,-118,0,
-            0,0,0,0,0,-161,0,0,0,0,
-            0,0,-289,0,0,0,0,0,0,0,
-            -196,0,0,0,0,0,0,-282,0,0,
-            0,0,0,0,-225,0,-112,0,-213,0,
-            0,0,0,0,-312,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0
-        };
-    };
-    public final static short baseCheck[] = BaseCheck.baseCheck;
-    public final int baseCheck(int index) { return baseCheck[index]; }
-    public final static short rhs[] = baseCheck;
-    public final int rhs(int index) { return rhs[index]; };
-
-    public interface BaseAction {
-        public final static char baseAction[] = {
-            123,124,124,124,124,124,124,124,124,124,
-            124,124,124,124,124,124,125,149,149,149,
-            149,149,149,149,149,149,149,149,86,87,
-            87,87,15,1,88,88,4,4,3,3,
-            3,3,3,3,3,3,2,2,2,2,
-            2,65,65,65,65,5,6,126,126,127,
-            127,75,72,89,76,90,90,77,77,150,
-            150,150,150,16,16,16,16,17,97,97,
-            98,98,91,91,92,8,8,8,8,8,
-            8,8,18,128,128,9,10,7,7,11,
-            11,12,13,14,19,19,19,20,20,22,
-            22,23,23,23,24,24,21,21,21,26,
-            26,26,26,26,26,26,26,26,28,27,
-            27,29,74,79,79,73,73,60,60,31,
-            30,61,61,64,64,62,62,63,63,58,
-            58,57,57,59,59,55,55,54,54,56,
-            56,52,52,51,51,53,53,49,49,48,
-            48,48,50,50,50,46,46,45,45,45,
-            45,45,47,47,47,47,47,43,43,42,
-            42,42,44,44,44,40,40,39,39,39,
-            41,41,41,80,80,32,32,32,33,33,
-            33,25,25,34,34,34,34,34,35,129,
-            129,65,66,37,65,67,38,99,16,16,
-            100,130,130,131,131,131,23,73,73,101,
-            36,36,36,36,36,36,36,36,24,133,
-            133,133,133,134,134,135,135,132,132,132,
-            136,136,136,137,102,102,138,138,139,140,
-            140,24,24,34,34,81,81,82,82,82,
-            83,68,123,141,141,123,93,93,105,105,
-            78,78,103,103,106,104,104,107,95,95,
-            95,95,84,84,96,96,96,94,94,108,
-            108,85,85,71,109,109,110,110,110,110,
-            110,110,70,117,117,69,69,111,111,111,
-            118,119,119,119,143,143,142,120,112,144,
-            144,113,145,145,121,121,114,122,122,146,
-            146,115,116,147,147,1,745,1742,104,1737,
-            105,106,1740,75,85,86,88,89,90,91,
-            139,215,73,74,76,213,107,108,109,110,
-            1931,116,117,118,128,1750,214,197,200,1734,
-            208,216,228,229,1743,1831,192,1747,1830,182,
-            1746,1832,172,1749,1829,165,1748,1833,159,1754,
-            1828,153,1751,1834,147,337,137,1835,142,1827,
-            380,745,1742,104,1737,105,106,1740,75,85,
-            86,88,89,90,91,139,215,73,74,76,
-            213,107,108,109,110,1931,116,117,118,128,
-            4563,214,197,200,1734,208,216,228,229,195,
-            4564,194,1062,87,313,1930,316,317,318,319,
-            320,321,170,327,328,329,1,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,337,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,4563,214,197,200,1734,208,216,228,229,
-            195,4565,193,714,4541,315,1930,316,317,318,
-            319,320,321,728,327,328,329,175,1587,1742,
-            104,1737,105,106,1740,75,85,86,88,89,
-            90,91,139,215,73,74,76,213,107,108,
-            109,110,1931,116,117,118,128,1750,214,197,
-            200,1734,208,216,228,229,1743,1831,192,1747,
-            1830,182,1746,1832,172,1749,1829,165,1748,1833,
-            159,1754,1828,153,1751,1834,147,4724,4731,1835,
-            142,1827,1402,355,1399,236,256,36,172,4727,
-            922,728,67,4725,4726,342,1752,1742,104,1737,
-            105,106,1740,75,85,86,88,89,90,91,
-            139,215,73,74,76,213,107,108,109,110,
-            1931,116,117,118,128,1750,214,197,200,1734,
-            208,216,228,229,1743,1831,192,1747,1830,182,
-            1746,1832,172,1749,1829,165,1748,1833,159,1754,
-            1828,153,1751,1834,147,135,137,1835,142,1827,
-            1402,355,1486,237,990,73,823,68,4835,992,
-            67,728,4807,417,745,1742,104,1737,105,106,
-            1740,75,85,86,88,89,90,91,139,215,
-            73,74,76,213,107,108,109,110,1931,116,
-            117,118,128,1750,214,197,200,1734,208,216,
-            228,229,1743,1831,192,1747,1830,182,1746,1832,
-            172,1749,1829,165,1748,1833,159,1754,1828,153,
-            1751,1834,147,4549,137,1835,142,1827,889,1839,
-            1402,355,1849,81,586,1740,227,85,86,88,
-            89,90,91,780,34,29,30,780,34,29,
-            30,401,678,719,80,82,780,34,29,30,
-            4548,4550,417,745,1742,104,1737,105,106,1740,
-            75,85,86,88,89,90,91,139,215,73,
-            74,76,213,107,108,109,110,1931,116,117,
-            118,128,1750,214,197,200,1734,208,216,228,
-            229,1743,1831,192,1747,1830,182,1746,1832,172,
-            1749,1829,165,1748,1833,159,1754,1828,153,1751,
-            1834,147,4549,137,1835,142,1827,4547,234,31,
-            35,37,39,31,35,1404,824,305,1477,1474,
-            77,1475,31,35,1586,289,749,744,607,303,
-            256,1844,648,80,82,256,4734,287,730,4553,
-            4550,380,1662,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,260,137,1835,142,1827,220,68,1041,657,
-            67,1078,4805,68,661,665,67,735,4740,380,
-            745,1742,104,1737,105,106,1740,75,85,86,
-            88,89,90,91,139,215,73,74,76,213,
-            107,108,109,110,1931,116,117,118,128,4573,
-            214,197,200,1734,208,216,228,229,1743,1831,
-            192,1747,1830,182,1746,1832,172,1749,1829,165,
-            1748,1833,159,155,4574,154,258,4739,89,745,
-            1742,104,1737,105,106,1740,75,85,86,88,
-            89,90,91,139,215,73,74,76,213,107,
-            108,109,110,1931,116,117,118,128,1750,214,
-            197,200,1734,208,216,228,229,1743,1831,192,
-            1747,1830,182,1746,1832,172,1749,1829,165,1748,
-            1833,159,1754,1828,153,1751,1834,147,135,137,
-            1835,142,1827,687,62,285,237,270,2786,256,
-            1844,4660,256,4734,472,258,4562,4580,132,745,
-            1742,104,1737,105,106,1740,75,85,86,88,
-            89,90,91,139,215,73,74,76,213,107,
-            108,109,110,1931,116,117,118,128,1750,214,
-            197,200,1734,208,216,228,229,1743,1831,192,
-            1747,1830,182,1746,1832,172,1749,1829,165,1748,
-            1833,159,1754,1828,153,1751,1834,147,135,137,
-            1835,142,1827,623,68,4779,237,67,930,265,
-            583,4660,258,291,728,256,1565,4714,218,745,
-            1742,104,1737,105,106,1740,75,85,86,88,
-            89,90,91,139,215,73,74,76,213,107,
-            108,109,110,1931,116,117,118,128,1750,214,
-            197,200,1734,208,216,228,229,1743,1831,192,
-            1747,1830,182,1746,1832,172,1749,1829,165,1748,
-            1833,159,1754,1828,153,1751,1834,147,135,137,
-            1835,142,1827,1402,355,1850,237,60,438,258,
-            294,4660,258,746,728,258,762,4749,261,745,
-            1742,104,1737,105,106,1740,75,85,86,88,
-            89,90,91,139,215,73,74,76,213,107,
-            108,109,110,1931,116,117,118,128,1750,214,
-            197,200,1734,208,216,228,229,1743,1831,192,
-            1747,1830,182,1746,1832,172,1749,1829,165,1748,
-            1833,159,1754,1828,153,1751,1834,147,135,137,
-            1835,142,1827,1402,355,462,237,842,769,824,
-            1473,4660,997,297,945,924,1150,4775,304,745,
-            1742,104,1737,105,106,1740,75,85,86,88,
-            89,90,91,139,215,73,74,76,213,107,
-            108,109,110,1931,116,117,118,128,1750,214,
-            197,200,1734,208,216,228,229,1743,1831,192,
-            1747,1830,182,1746,1832,172,1749,1829,165,1748,
-            1833,159,1754,1828,153,1751,1834,147,135,137,
-            1835,142,1827,678,81,586,237,569,129,719,
-            719,4660,256,4734,256,4552,748,4870,342,745,
-            1742,104,1737,105,106,1740,75,85,86,88,
-            89,90,91,139,215,73,74,76,213,107,
-            108,109,110,1931,116,117,118,128,1750,214,
-            197,200,1734,208,216,228,229,1743,1831,192,
-            1747,1830,182,1746,1832,172,1749,1829,165,1748,
-            1833,159,1754,1828,153,1751,1834,147,239,137,
-            1835,142,1827,4955,68,970,245,67,1006,264,
-            66,1007,1008,305,305,651,289,749,744,1009,
-            285,749,744,65,94,302,306,293,286,296,
-            1474,1013,1475,44,4858,1045,1094,899,1031,4698,
-            342,745,1742,104,1737,105,106,1740,75,85,
-            86,88,89,90,91,139,215,73,74,76,
-            213,107,108,109,110,1931,116,117,118,128,
-            1750,214,197,200,1734,208,216,228,229,1743,
-            1831,192,1747,1830,182,1746,1832,172,1749,1829,
-            165,1748,1833,159,1754,1828,153,1751,1834,147,
-            135,137,1835,142,1827,256,4552,4685,237,4688,
-            4770,1839,902,4690,380,745,1742,104,1737,105,
-            106,1740,75,85,86,88,89,90,91,139,
-            215,73,74,76,213,107,108,109,110,1931,
-            116,117,118,128,1750,214,197,200,1734,208,
-            216,228,229,1743,1831,192,1747,1830,182,1746,
-            1832,172,1749,1829,165,1748,1833,159,1754,1828,
-            153,1751,1834,147,4549,137,1835,142,1827,706,
-            1585,66,4733,1852,83,1062,1839,512,199,980,
-            820,840,892,802,65,4857,22,832,495,328,
-            626,458,904,728,1010,81,82,342,745,1742,
-            104,1737,105,106,1740,75,85,86,88,89,
-            90,91,139,215,73,74,76,213,107,108,
-            109,110,1931,116,117,118,128,1750,214,197,
-            200,1734,208,216,228,229,1743,1831,192,1747,
-            1830,182,1746,1832,172,1749,1829,165,1748,1833,
-            159,1754,1828,153,1751,1834,147,239,137,1835,
-            142,1827,1402,355,4579,243,1839,25,1018,707,
-            927,817,606,731,532,972,5,1019,1022,896,
-            173,1020,169,873,688,1028,1029,1033,1035,1037,
-            1039,1036,1043,16,1583,1025,871,348,4712,342,
-            745,1742,104,1737,105,106,1740,75,85,86,
-            88,89,90,91,139,215,73,74,76,213,
-            107,108,109,110,1931,116,117,118,128,1750,
-            214,197,200,1734,208,216,228,229,1743,1831,
-            192,1747,1830,182,1746,1832,172,1749,1829,165,
-            1748,1833,159,1754,1828,153,1751,1834,147,135,
-            137,1835,142,1827,246,256,36,237,1046,1845,
-            728,679,4806,342,745,1742,104,1737,105,106,
-            1740,75,85,86,88,89,90,91,139,215,
-            73,74,76,213,107,108,109,110,1931,116,
-            117,118,128,1750,214,197,200,1734,208,216,
-            228,229,1743,1831,192,1747,1830,182,1746,1832,
-            172,1749,1829,165,1748,1833,159,1754,1828,153,
-            1751,1834,147,1856,137,1835,142,1827,4575,1402,
-            476,247,342,745,1742,104,1737,105,106,1740,
-            75,85,86,88,89,90,91,139,215,73,
-            74,76,213,107,108,109,110,1931,116,117,
-            118,128,1750,214,197,200,1734,208,216,228,
-            229,1743,1831,192,1747,1830,182,1746,1832,172,
-            1749,1829,165,1748,1833,159,1754,1828,153,1751,
-            1834,147,136,137,1835,142,1827,1855,1049,1840,
-            238,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,280,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,1841,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,330,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,1588,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,1846,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,1324,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,1847,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,279,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,278,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,4578,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,218,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,4715,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,230,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,84,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,63,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,4540,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,332,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,4902,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,4747,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,64,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,4777,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,4786,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,261,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,345,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,1406,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,4871,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,4872,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,4873,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1750,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,1751,1834,
-            147,263,137,1835,142,1827,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,1750,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,1746,1832,172,1749,1829,165,1748,1833,159,
-            1754,1828,153,1751,1834,147,262,137,1835,142,
-            1827,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,4554,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,1748,1833,159,1754,1828,153,149,4555,
-            148,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,4556,214,197,200,1734,208,216,228,229,
-            1743,1831,192,1747,1830,182,1746,1832,172,1749,
-            1829,165,161,4557,160,380,745,1742,104,1737,
-            105,106,1740,75,85,86,88,89,90,91,
-            139,215,73,74,76,213,107,108,109,110,
-            1931,116,117,118,128,4571,214,197,200,1734,
-            208,216,228,229,1743,1831,192,1747,1830,182,
-            1746,1832,172,167,4572,166,380,745,1742,104,
-            1737,105,106,1740,75,85,86,88,89,90,
-            91,139,215,73,74,76,213,107,108,109,
-            110,1931,116,117,118,128,4559,214,197,200,
-            1734,208,216,228,229,1743,1831,192,1747,1830,
-            182,175,4560,174,380,745,1742,104,1737,105,
-            106,1740,75,85,86,88,89,90,91,139,
-            215,73,74,76,213,107,108,109,110,1931,
-            116,117,118,128,4559,214,197,200,1734,208,
-            216,228,229,1743,1831,192,1747,1830,182,175,
-            4561,173,380,745,1742,104,1737,105,106,1740,
-            75,85,86,88,89,90,91,139,215,73,
-            74,76,213,107,108,109,110,1931,116,117,
-            118,128,4566,214,197,200,1734,208,216,228,
-            229,1743,1831,192,187,4567,186,380,745,1742,
-            104,1737,105,106,1740,75,85,86,88,89,
-            90,91,139,215,73,74,76,213,107,108,
-            109,110,1931,116,117,118,128,4566,214,197,
-            200,1734,208,216,228,229,1743,1831,192,187,
-            4568,185,380,745,1742,104,1737,105,106,1740,
-            75,85,86,88,89,90,91,139,215,73,
-            74,76,213,107,108,109,110,1931,116,117,
-            118,128,4566,214,197,200,1734,208,216,228,
-            229,1743,1831,192,187,4569,184,380,745,1742,
-            104,1737,105,106,1740,75,85,86,88,89,
-            90,91,139,215,73,74,76,213,107,108,
-            109,110,1931,116,117,118,128,4566,214,197,
-            200,1734,208,216,228,229,1743,1831,192,187,
-            4570,183,380,745,1742,104,1737,105,106,1740,
-            75,85,86,88,89,90,91,139,215,73,
-            74,76,213,107,108,109,110,1931,116,117,
-            118,128,1842,214,203,210,1734,208,216,228,
-            229,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1842,214,203,209,1734,208,216,228,229,
-            1108,1084,207,1051,1053,710,1928,1054,1055,171,
-            1056,937,921,1057,727,1058,816,1060,712,885,
-            668,886,1108,255,947,953,784,952,961,962,
-            963,831,940,801,1061,948,1063,1064,1069,1070,
-            1072,206,380,745,1742,104,1737,105,106,1740,
-            75,85,86,88,89,90,91,139,215,73,
-            74,76,213,107,108,109,110,1931,116,117,
-            118,128,1842,214,203,202,1734,208,216,228,
-            229,380,745,1742,104,1737,105,106,1740,75,
-            85,86,88,89,90,91,139,215,73,74,
-            76,213,107,108,109,110,1931,116,117,118,
-            128,1842,214,203,201,1734,208,216,228,229,
-            1079,333,199,38,36,1027,51,1155,53,54,
-            682,36,1027,51,1155,53,54,248,4543,2068,
-            4682,463,1048,4923,1071,1080,814,4742,1086,1074,
-            975,602,36,1027,51,1155,53,54,684,282,
-            1082,198,682,36,1027,51,1155,53,54,882,
-            475,1565,42,1088,1089,1091,1740,227,85,86,
-            88,89,90,91,1097,1102,302,1103,1318,221,
-            224,1104,1117,728,1105,1318,221,224,981,1118,
-            1106,1120,1119,1126,311,275,276,1127,309,1128,
-            259,311,275,276,235,309,1318,221,224,627,
-            36,1027,51,1155,53,54,244,1318,221,224,
-            1129,948,311,275,276,1133,310,1136,1323,1131,
-            242,728,59,311,275,276,1138,310,627,36,
-            1027,51,1155,53,54,627,36,1027,51,1155,
-            53,54,1402,355,4700,1139,982,1143,4547,233,
-            627,36,1027,51,1155,53,54,627,36,1027,
-            51,1155,53,54,593,221,224,627,36,1027,
-            51,1155,53,54,728,983,1562,1569,1148,4544,
-            4686,627,36,1027,51,1155,53,54,256,1844,
-            1402,355,4713,671,221,224,728,1146,984,1149,
-            1558,221,224,627,36,1027,51,1155,53,54,
-            1152,1159,1160,1165,1151,1561,221,224,256,4552,
-            5085,5085,1581,221,224,627,36,1027,51,1155,
-            53,54,1836,221,224,627,36,1027,51,1155,
-            53,54,728,1402,355,4743,751,221,224,627,
-            36,1027,51,1155,53,54,627,36,1027,51,
-            1155,53,54,728,219,1402,355,350,1244,221,
-            224,627,36,1027,51,1155,53,54,627,36,
-            1027,51,1155,53,54,256,4734,901,5085,971,
-            1753,221,224,5085,66,728,5085,5085,5085,5085,
-            1851,221,224,5085,5085,5085,5085,65,93,5085,
-            5085,1402,355,1735,62,221,224,1843,5085,5085,
-            5085,4781,221,224,5085,5085,5085,5085,5085,5085,
-            5085,5085,1402,355,4859,5085,4689,221,224,5085,
-            5085,5085,5085,4838,221,224,4551,5085,5085,5085,
-            5085,5085,5085,5085,5085,5085,1848,68,1848,5085,
-            67,5085,264,5085,1402,355,4874,5085,5085,5085,
-            5085,5085,5085,5085,5085,5085,5085,5085,5085,5085,
-            5085,5085,5085,5085,5085,5085,5085,4738,5085,5085,
-            5085,5085,5085,5085,5085,5085,5085,5085,5085,5085,
-            5085,5085,5085,5085,322,5085,324,5085,5085,5085,
-            5085,5085,5085,5085,5085,5085,5085,5085,5085,5085,
-            5085,5085,4732,5085,5085
-        };
-    };
-    public final static char baseAction[] = BaseAction.baseAction;
-    public final int baseAction(int index) { return baseAction[index]; }
-    public final static char lhs[] = baseAction;
-    public final int lhs(int index) { return lhs[index]; };
-
-    public interface TermCheck {
-        public final static char termCheck[] = {0,
-            0,1,2,3,0,5,6,7,8,9,
-            10,11,12,13,14,15,16,17,18,19,
-            20,0,22,23,0,25,26,27,28,29,
-            30,31,32,33,34,35,36,0,0,2,
-            3,0,38,0,7,8,9,10,11,12,
-            13,14,15,16,17,18,19,20,0,22,
-            23,0,24,2,3,0,62,67,47,48,
-            49,50,0,1,74,75,0,1,40,79,
-            0,81,0,42,60,85,0,87,0,1,
-            2,3,4,5,6,7,8,9,10,11,
-            12,13,14,15,16,17,18,19,20,68,
-            22,23,40,25,26,27,28,29,30,31,
-            32,33,34,35,36,43,44,45,46,53,
-            42,0,1,2,3,4,5,6,7,8,
-            9,10,11,12,13,14,15,16,17,18,
-            19,20,72,22,23,69,25,26,27,28,
-            29,30,31,32,33,34,35,36,0,0,
-            0,0,0,42,0,1,2,3,4,5,
-            6,7,8,9,10,11,12,13,14,15,
-            16,17,18,19,20,24,22,23,0,25,
-            26,27,28,29,30,31,32,33,34,35,
-            36,43,44,45,46,43,42,0,1,2,
-            3,4,5,6,7,8,9,10,11,12,
-            13,14,15,16,17,18,19,20,69,22,
-            23,71,25,26,27,28,29,30,31,32,
-            33,34,35,36,0,0,58,0,3,42,
-            0,1,2,3,4,5,6,7,8,9,
-            10,11,12,13,14,15,16,17,18,19,
-            20,24,22,23,0,25,26,27,28,29,
-            30,31,32,33,34,35,36,43,44,45,
-            46,0,42,0,1,2,3,4,5,6,
-            7,8,9,10,11,12,13,14,15,16,
-            17,18,19,20,40,22,23,0,25,26,
-            27,28,29,30,31,32,33,34,35,36,
-            39,0,1,2,3,42,5,6,7,8,
-            9,10,11,12,13,14,15,16,17,18,
-            19,20,61,22,23,38,25,26,27,28,
-            29,30,31,32,33,34,35,36,51,0,
-            1,2,3,42,5,6,7,8,9,10,
-            11,12,13,14,15,16,17,18,19,20,
-            0,22,23,3,25,26,27,28,29,30,
-            31,32,33,34,35,36,0,1,2,3,
-            0,5,6,7,8,9,10,11,12,13,
-            14,15,16,17,18,19,20,0,22,23,
-            3,25,26,27,28,29,30,31,32,33,
-            34,35,36,0,1,2,3,0,5,6,
-            7,8,9,10,11,12,13,14,15,16,
-            17,18,19,20,0,22,23,3,25,26,
-            27,28,29,30,31,32,33,34,35,36,
-            0,1,2,3,0,5,6,7,8,9,
-            10,11,12,13,14,15,16,17,18,19,
-            20,0,22,23,57,25,26,27,28,29,
-            30,31,32,33,34,35,36,0,1,2,
-            3,0,5,6,7,8,9,10,11,12,
-            13,14,15,16,17,18,19,20,54,22,
-            23,40,25,26,27,28,29,30,31,32,
-            33,34,35,36,0,1,2,3,0,5,
-            6,7,8,9,10,11,12,13,14,15,
-            16,17,18,19,20,0,22,23,57,25,
-            26,27,28,29,30,31,32,33,34,35,
-            36,0,0,2,3,0,0,1,7,8,
-            9,10,11,12,13,14,15,16,17,18,
-            19,20,0,22,23,0,0,2,6,3,
-            5,63,64,7,8,9,10,11,12,13,
-            14,15,16,17,18,19,20,0,22,23,
-            0,4,47,48,49,50,0,1,73,53,
-            0,1,37,38,0,1,41,0,43,44,
-            45,46,47,48,49,50,51,0,0,54,
-            55,0,57,0,3,60,0,0,7,8,
-            9,10,11,12,13,14,15,16,17,18,
-            19,20,52,22,23,0,0,2,3,0,
-            5,0,3,0,47,48,49,50,0,6,
-            2,3,44,45,46,42,0,0,2,0,
-            0,5,5,4,0,1,31,24,52,52,
-            63,64,37,38,38,0,41,0,62,4,
-            21,68,47,48,49,50,51,51,40,54,
-            55,0,57,37,38,60,21,41,0,43,
-            44,45,46,47,48,49,50,51,95,0,
-            54,55,3,0,54,2,7,8,9,10,
-            11,12,13,14,15,16,17,18,19,20,
-            0,0,2,2,93,5,97,98,99,100,
-            101,102,65,0,53,0,0,2,2,0,
-            5,53,0,0,41,6,43,44,45,46,
-            0,0,2,0,21,5,5,37,38,0,
-            1,41,41,43,44,45,46,47,48,49,
-            50,51,37,38,54,42,41,41,43,44,
-            45,46,47,48,49,50,51,37,37,56,
-            0,41,0,43,44,45,46,47,48,49,
-            50,0,59,2,0,0,2,6,0,5,
-            2,0,1,21,6,0,1,58,0,1,
-            0,0,1,0,1,5,25,26,27,28,
-            29,30,42,25,26,27,28,29,30,21,
-            0,37,21,0,24,41,0,43,44,45,
-            46,5,47,48,49,50,0,39,40,0,
-            39,40,39,40,0,1,0,0,2,58,
-            52,0,0,52,2,52,5,21,38,61,
-            0,0,0,37,94,5,5,5,96,0,
-            0,0,52,4,0,5,53,38,4,0,
-            0,0,0,0,40,4,4,41,37,0,
-            51,0,56,41,24,21,0,37,37,37,
-            53,21,21,21,21,0,0,0,0,0,
-            4,4,0,24,67,24,4,0,0,0,
-            24,0,39,4,0,1,21,0,0,21,
-            0,60,0,3,0,0,0,58,0,4,
-            0,61,0,3,0,0,1,0,0,1,
-            0,1,0,0,0,0,0,0,24,0,
-            0,0,0,0,55,3,3,40,0,0,
-            0,0,55,0,53,4,21,0,0,0,
-            1,0,40,0,40,0,1,0,0,42,
-            0,38,4,0,66,59,0,59,66,21,
-            4,0,0,0,0,0,88,0,56,39,
-            56,38,56,54,57,55,0,0,0,0,
-            4,4,3,21,21,0,0,0,0,1,
-            0,4,0,40,65,0,4,0,0,4,
-            39,4,0,82,39,0,59,0,0,0,
-            0,0,0,0,77,4,52,89,0,0,
-            70,80,4,4,0,0,83,0,4,39,
-            0,0,0,0,0,0,24,39,0,0,
-            0,39,0,76,39,38,0,0,0,24,
-            0,24,39,0,24,24,24,24,24,0,
-            0,0,84,0,0,0,0,0,0,0,
-            0,86,0,0,0,0,90,0,0,0,
-            0,0,0,0,0,0,78,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            91,0,92,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,0,0,0
-        };
-    };
-    public final static char termCheck[] = TermCheck.termCheck;
-    public final int termCheck(int index) { return termCheck[index]; }
-
-    public interface TermAction {
-        public final static char termAction[] = {0,
-            314,2136,5186,5118,277,4501,5182,5131,5132,5133,
-            5134,5135,5126,5124,5127,5125,5123,1741,5128,5130,
-            5129,169,1738,1739,5085,5180,5181,5184,5185,5188,
-            5187,4462,5117,1933,4848,5358,5359,5085,5085,942,
-            1153,5085,2591,132,5131,5132,5133,5134,5135,5126,
-            5124,5127,5125,5123,1025,5128,5130,5129,5085,1019,
-            1024,5085,1325,1479,843,5085,2526,2331,175,175,
-            175,175,140,132,2201,1925,5085,4663,833,2266,
-            292,2396,205,5366,4021,2461,5085,1837,5085,2136,
-            5186,5118,133,4501,5182,5131,5132,5133,5134,5135,
-            5126,5124,5127,5125,5123,1741,5128,5130,5129,5325,
-            1738,1739,36,5180,5181,5184,5185,5188,5187,4462,
-            5117,1933,4848,5358,5359,211,211,211,211,4759,
-            5366,5085,2136,5186,5118,133,4501,5182,5131,5132,
-            5133,5134,5135,5126,5124,5127,5125,5123,1741,5128,
-            5130,5129,1233,1738,1739,5084,5180,5181,5184,5185,
-            5188,5187,4462,5117,1933,4848,5358,5359,204,291,
-            83,290,5085,5366,5085,2136,5186,5118,5204,4501,
-            5182,5131,5132,5133,5134,5135,5126,5124,5127,5125,
-            5123,1741,5128,5130,5129,1086,1738,1739,5085,5180,
-            5181,5184,5185,5188,5187,4462,5117,1933,4848,5358,
-            5359,212,212,212,212,1018,5366,5085,2136,5186,
-            5118,133,4501,5182,5131,5132,5133,5134,5135,5126,
-            5124,5127,5125,5123,1741,5128,5130,5129,284,1738,
-            1739,2916,5180,5181,5184,5185,5188,5187,4462,5117,
-            1933,4848,5358,5359,196,5085,4709,290,5118,5366,
-            5085,2136,5186,5118,133,4501,5182,5131,5132,5133,
-            5134,5135,5126,5124,5127,5125,5123,1741,5128,5130,
-            5129,1165,1738,1739,52,5180,5181,5184,5185,5188,
-            5187,4462,5117,1933,4848,5358,5359,212,212,212,
-            212,5085,5366,5085,2136,5186,5118,133,4501,5182,
-            5131,5132,5133,5134,5135,5126,5124,5127,5125,5123,
-            1741,5128,5130,5129,833,1738,1739,163,5180,5181,
-            5184,5185,5188,5187,4462,5117,1933,4848,5358,5359,
-            3436,5085,2136,5186,5118,5366,4501,5182,5131,5132,
-            5133,5134,5135,5126,5124,5127,5125,5123,1741,5128,
-            5130,5129,1159,1738,1739,167,5180,5181,5184,5185,
-            5188,5187,4462,5117,1933,4848,5358,5359,167,5085,
-            2136,5186,5118,5366,4501,5182,5131,5132,5133,5134,
-            5135,5126,5124,5127,5125,5123,1741,5128,5130,5129,
-            5085,1738,1739,938,5180,5181,5184,5185,5188,5187,
-            4462,5117,1933,4848,5358,5359,78,2136,5186,5118,
-            5085,4501,5182,5131,5132,5133,5134,5135,5126,5124,
-            5127,5125,5123,1741,5128,5130,5129,5085,1738,1739,
-            5397,5180,5181,5184,5185,5188,5187,4462,5117,1933,
-            4848,5358,5359,181,420,420,420,145,420,420,
-            420,420,420,420,420,420,420,420,420,420,
-            420,420,420,420,57,420,420,5118,420,420,
-            420,420,420,420,420,420,420,420,420,420,
-            180,420,420,420,157,420,420,420,420,420,
-            420,420,420,420,420,420,420,420,420,420,
-            420,5085,420,420,149,420,420,420,420,420,
-            420,420,420,420,420,420,420,179,420,420,
-            420,5085,420,420,420,420,420,420,420,420,
-            420,420,420,420,420,420,420,420,161,420,
-            420,837,420,420,420,420,420,420,420,420,
-            420,420,420,420,178,420,420,420,5085,420,
-            420,420,420,420,420,420,420,420,420,420,
-            420,420,420,420,420,295,420,420,1029,420,
-            420,420,420,420,420,420,420,420,420,420,
-            420,5085,5085,1555,1153,5085,5085,4670,5131,5132,
-            5133,5134,5135,5126,5124,5127,5125,5123,1025,5128,
-            5130,5129,5085,1019,1024,138,5085,196,5182,5118,
-            6605,1154,841,5131,5132,5133,5134,5135,5126,5124,
-            5127,5125,5123,1025,5128,5130,5129,5085,1019,1024,
-            5085,1326,4417,4372,4327,4282,5085,4795,666,4788,
-            5085,4810,188,168,5085,4710,196,171,212,212,
-            212,212,176,176,176,176,168,288,266,162,
-            156,5085,150,5085,1153,144,33,5085,5131,5132,
-            5133,5134,5135,5126,5124,5127,5125,5123,1025,5128,
-            5130,5129,4909,1019,1024,5085,5085,5099,5118,5085,
-            5098,283,5118,5085,4417,4372,4327,4282,304,5183,
-            1479,843,4545,1729,5352,5366,150,325,196,5085,
-            5085,6610,5411,1398,5085,4817,5088,1242,4827,4931,
-            1154,841,5097,5095,4234,5085,5100,5085,2071,1405,
-            4691,5326,5094,5091,5093,5092,5096,4186,1480,5086,
-            5089,5085,5090,188,168,5087,4702,196,5085,212,
-            212,212,212,176,176,176,176,168,1757,5085,
-            162,156,5118,188,4135,196,5131,5132,5133,5134,
-            5135,5126,5124,5127,5125,5123,5113,5128,5130,5129,
-            156,189,196,195,668,6614,5334,5335,5336,5337,
-            5338,5339,5392,5085,4841,162,5085,196,4621,87,
-            6611,4863,5085,5085,196,5183,212,212,212,212,
-            168,177,196,5085,818,6613,6592,188,168,5085,
-            4710,196,195,212,212,212,212,176,176,176,
-            176,168,188,168,162,5366,196,4582,212,212,
-            212,212,176,176,176,176,168,188,187,231,
-            5085,196,5085,212,212,212,212,176,176,176,
-            176,232,5383,5186,176,170,196,5182,5085,6612,
-            5186,5085,4817,940,5182,5085,1088,4878,140,132,
-            323,140,132,140,132,6607,5180,5181,5184,5185,
-            5188,5187,5366,5180,5181,5184,5185,5188,5187,675,
-            5085,188,1482,5085,325,196,5085,212,212,212,
-            212,420,4417,4372,4327,4282,5085,61,36,164,
-            61,36,61,36,132,1168,191,331,4621,852,
-            4938,181,190,4909,4621,4909,5893,1484,2981,61,
-            180,179,178,541,1488,5930,5967,6004,2721,5085,
-            323,141,4931,1838,5085,6607,4885,4234,5420,5085,
-            5085,5085,5085,5085,37,5206,5207,4582,541,5085,
-            4186,5085,5177,4582,325,2002,5085,541,541,541,
-            3111,1162,2002,2002,1162,5085,5085,5085,58,151,
-            5307,5141,5085,1319,3046,1322,5140,5085,5085,5085,
-            4947,5085,3956,5302,334,1590,4895,336,5085,1245,
-            339,143,5085,5425,5085,5085,5085,753,5085,5310,
-            269,1655,5085,6593,132,272,597,5085,256,4945,
-            255,951,5085,5085,5085,79,5085,146,4949,158,
-            152,347,5085,5085,155,1021,4834,833,5085,5085,
-            5085,5085,4081,5085,4916,5210,1664,342,134,5085,
-            1248,5085,846,349,36,131,1328,5085,5085,5366,
-            5085,2851,5211,132,4576,5386,5085,5384,4577,2002,
-            5205,5085,68,137,61,5085,2656,344,5311,5353,
-            5308,3306,5162,4135,1029,4081,5085,5085,5085,5085,
-            5343,5342,5428,945,1859,5085,5085,5085,130,1408,
-            5085,5208,5085,37,5393,5085,5209,5085,5085,5199,
-            3371,5196,5085,3176,3501,5085,5385,62,5085,353,
-            5085,5085,187,269,4741,5212,4909,3241,5085,5085,
-            5356,5423,5200,5198,5085,188,4856,323,5197,3696,
-            188,188,188,188,188,5085,177,3761,5085,5085,
-            5085,3826,5085,3566,3891,3306,5085,5085,5085,138,
-            5085,5411,4684,5085,150,162,176,168,156,5085,
-            5085,5085,5431,5085,5085,5085,5085,5085,5085,5085,
-            5085,5436,5085,5085,5085,5085,3631,5085,5085,5085,
-            5085,5085,5085,5085,5085,5085,5426,5085,5085,5085,
-            5085,5085,5085,5085,5085,5085,5085,5085,5085,5085,
-            5439,5085,5437
-        };
-    };
-    public final static char termAction[] = TermAction.termAction;
-    public final int termAction(int index) { return termAction[index]; }
-
-    public interface Asb {
-        public final static char asb[] = {0,
-            317,167,8,104,102,105,104,143,103,102,
-            106,105,402,5,51,51,150,402,94,8,
-            164,164,91,88,88,91,9,388,165,165,
-            385,386,88,386,386,280,279,92,92,92,
-            92,145,153,402,50,279,50,292,385,292,
-            386,386,332,386,370,386,169,354,51,386,
-            292,171,386,280,386,343,280,280,173,279,
-            280,14,16,148,196,261,261,222,260,260,
-            110,370,20,23,22,29,27,16,31,30,
-            263,265,267,270,370,370,402,219,255,273,
-            275,32,277,50,402,370,370,370,370,370,
-            282,353,386,50,292,50,386,386,402,92,
-            388,199,205,302,78,53,402,53,296,280,
-            370,370,370,370,370,370,16,284,173,370,
-            370,370,370,370,370,370,370,370,370,354,
-            288,287,201,294,50,294,370,51,50,169,
-            386,169,280,109,14,370,92,148,14,15,
-            328,299,299,86,315,322,86,310,311,311,
-            314,86,110,16,31,16,29,16,23,23,
-            16,20,20,402,370,386,16,22,22,22,
-            22,16,27,16,30,289,110,50,402,1,
-            402,320,353,171,50,280,279,109,370,162,
-            92,388,15,109,402,370,370,136,370,370,
-            402,370,326,315,370,370,279,330,97,2,
-            370,50,370,169,110,280,335,109,14,109,
-            280,162,337,160,279,175,280,340,342,280,
-            162,176,110,370,98,98,402,3,50,50,
-            345,347,280,15,280,370,402,370,402,110,
-            110,386,402,402,370,402,327,370,50,1,
-            370,109,280,162,280,162,279,162,279,176,
-            159,162,161,349,49,280,370,370,370,370,
-            370,50,280,280,280,351
-        };
-    };
-    public final static char asb[] = Asb.asb;
-    public final int asb(int index) { return asb[index]; }
-
-    public interface Asr {
-        public final static char asr[] = {0,
-            82,83,84,0,6,24,0,72,73,63,
-            64,24,0,40,1,43,44,45,46,2,
-            41,37,47,48,49,50,38,51,54,55,
-            57,60,4,56,70,39,21,71,76,66,
-            89,90,94,95,68,96,3,42,91,5,
-            24,0,34,5,31,1,35,36,33,7,
-            8,9,10,11,17,16,13,15,12,14,
-            18,20,19,23,22,32,3,25,26,6,
-            27,28,2,30,29,56,0,2,3,40,
-            53,1,0,40,24,0,77,5,24,76,
-            0,24,69,72,73,64,63,0,4,42,
-            34,5,31,1,35,36,33,7,8,9,
-            10,11,17,16,13,15,12,14,18,20,
-            19,23,22,32,3,25,26,27,28,2,
-            30,29,6,0,3,52,62,40,0,2,
-            3,0,5,4,62,3,24,40,38,61,
-            21,39,0,24,64,63,69,0,59,0,
-            65,0,52,0,61,37,5,2,41,47,
-            48,38,49,50,51,4,54,55,57,60,
-            39,40,1,52,21,46,44,45,43,0,
-            5,24,3,0,3,54,60,31,55,57,
-            48,50,49,47,38,51,37,5,2,41,
-            0,37,5,2,41,38,51,4,56,43,
-            70,44,39,21,45,71,46,76,66,89,
-            90,91,94,95,68,54,55,57,60,96,
-            3,24,42,6,47,48,49,50,0,1,
-            58,0,60,0,55,0,38,51,0,37,
-            5,0,54,0,57,0,38,62,21,4,
-            0,88,0,96,21,0,40,1,5,24,
-            67,53,0,66,0,42,94,0,42,1,
-            0,97,98,99,100,101,102,3,0,71,
-            56,21,0,52,38,0,69,93,0,89,
-            0,56,42,21,0,95,68,42,0,80,
-            0,4,3,0,70,0,39,61,0,39,
-            52,61,21,0,86,0,90,0,78,0,
-            92,0,24,59,65,78,80,82,83,84,
-            86,92,87,85,81,67,79,74,75,34,
-            5,31,1,35,36,33,29,30,27,28,
-            6,26,25,32,2,23,22,17,16,13,
-            15,12,14,18,20,19,7,8,9,10,
-            11,3,0
-        };
-    };
-    public final static char asr[] = Asr.asr;
-    public final int asr(int index) { return asr[index]; }
-
-    public interface Nasb {
-        public final static char nasb[] = {0,
-            118,22,23,30,23,32,30,52,22,23,
-            61,32,126,22,22,22,54,22,22,23,
-            23,23,22,40,40,22,23,34,36,36,
-            120,125,40,120,125,22,22,22,22,22,
-            22,22,22,22,13,22,13,22,124,22,
-            125,125,131,125,19,125,22,1,22,124,
-            22,22,125,22,125,22,22,22,22,22,
-            22,25,22,22,77,22,22,22,22,22,
-            18,19,22,22,22,22,22,22,22,22,
-            22,22,22,22,104,104,134,22,22,22,
-            22,22,22,13,126,19,19,19,19,19,
-            22,143,125,13,22,13,125,125,56,22,
-            34,22,70,113,128,19,137,19,75,22,
-            79,84,94,94,6,6,22,22,22,104,
-            104,99,99,99,99,89,49,19,19,1,
-            73,22,68,22,13,22,19,22,13,22,
-            125,22,22,19,25,45,25,22,25,22,
-            75,22,22,22,22,75,22,22,22,22,
-            22,22,18,22,22,22,22,22,22,22,
-            22,22,22,42,19,125,22,22,22,22,
-            22,22,22,22,22,22,19,13,22,11,
-            22,22,143,22,13,22,22,19,19,22,
-            22,34,22,16,140,19,19,27,19,19,
-            65,19,75,22,19,19,22,22,47,111,
-            19,13,19,22,18,22,22,19,25,19,
-            22,22,22,22,22,25,22,22,22,22,
-            22,25,18,19,109,109,22,22,13,13,
-            22,22,22,22,22,19,42,19,21,19,
-            19,125,21,65,19,21,75,19,13,11,
-            19,19,22,22,22,22,22,22,22,25,
-            22,22,22,22,59,22,19,19,19,19,
-            19,13,22,22,22,22
-        };
-    };
-    public final static char nasb[] = Nasb.nasb;
-    public final int nasb(int index) { return nasb[index]; }
-
-    public interface Nasr {
-        public final static char nasr[] = {0,
-            2,7,1,109,0,1,2,7,41,0,
-            122,0,69,70,0,72,76,68,2,7,
-            1,0,78,0,74,0,7,100,0,106,
-            0,107,0,88,0,94,95,105,0,96,
-            0,1,76,0,140,0,145,0,2,1,
-            56,7,0,84,0,1,72,0,147,0,
-            94,95,93,0,1,90,0,144,0,1,
-            125,0,143,0,68,0,138,0,1,2,
-            7,59,0,1,2,7,53,0,2,7,
-            1,50,0,1,2,7,47,0,2,7,
-            1,44,0,1,2,7,33,0,121,0,
-            146,0,133,134,1,132,0,123,0,4,
-            2,108,0,85,2,4,0,131,7,0,
-            127,1,0,1,129,0,1,128,0,1,
-            137,0,69,117,0
-        };
-    };
-    public final static char nasr[] = Nasr.nasr;
-    public final int nasr(int index) { return nasr[index]; }
-
-    public interface TerminalIndex {
-        public final static char terminalIndex[] = {0,
-            11,3,185,12,2,34,81,82,83,84,
-            85,86,87,88,89,90,91,92,93,94,
-            19,95,96,192,32,33,77,78,79,80,
-            73,65,66,75,97,112,1,7,18,21,
-            4,193,15,17,23,27,5,6,8,9,
-            10,20,45,70,71,14,72,13,40,74,
-            22,25,39,41,42,47,49,69,184,16,
-            24,37,38,43,44,46,48,50,51,52,
-            53,54,55,56,57,58,59,60,61,62,
-            63,64,30,67,68,76,100,101,102,103,
-            104,105,26,28,29,35,36,98,99,106,
-            107,108,109,110,111,113,114,115,116,117,
-            118,119,120,121,122,123,124,125,126,127,
-            128,129,130,131,132,133,134,135,136,137,
-            138,139,140,141,142,143,144,145,146,147,
-            148,149,150,151,152,153,154,155,156,157,
-            158,159,160,161,162,163,164,165,166,167,
-            168,169,170,171,172,173,174,175,176,177,
-            178,179,180,181,182,183,186,187,188,189,
-            190,191
-        };
-    };
-    public final static char terminalIndex[] = TerminalIndex.terminalIndex;
-    public final int terminalIndex(int index) { return terminalIndex[index]; }
-
-    public interface NonterminalIndex {
-        public final static char nonterminalIndex[] = {0,
-            196,195,0,198,0,0,208,0,0,0,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,210,0,0,0,0,213,
-            0,0,238,239,0,0,0,0,234,235,
-            236,231,232,233,228,229,230,225,226,227,
-            222,223,224,219,220,221,216,217,218,202,
-            211,214,0,215,199,0,0,244,0,262,
-            259,201,212,0,0,203,205,0,0,237,
-            0,0,0,258,261,0,0,197,0,204,
-            207,0,253,254,255,0,0,206,241,242,
-            245,252,0,0,0,256,257,260,0,263,
-            0,0,0,0,0,0,0,0,0,0,
-            0,0,0,0,194,0,200,209,240,0,
-            243,246,247,248,249,250,251,0,0,0,
-            0,264,0,0,0,0,0,0,0,0
-        };
-    };
-    public final static char nonterminalIndex[] = NonterminalIndex.nonterminalIndex;
-    public final int nonterminalIndex(int index) { return nonterminalIndex[index]; }
-
-    public interface ScopePrefix {
-        public final static char scopePrefix[] = {
-            1,295,331,341,229,29,263,271,317,351,
-            305,101,101,249,256,13,21,51,140,238,
-            289,279,325,39,84,84,244,84,84,84,
-            66,72,134,154,158,359,363,367,371,59,
-            146,76,168,76,162,76,76,76,76,76,
-            46,171,171,179,179,187,187,187,187,201,
-            201,209,214,219,224
-        };
-    };
-    public final static char scopePrefix[] = ScopePrefix.scopePrefix;
-    public final int scopePrefix(int index) { return scopePrefix[index]; }
-
-    public interface ScopeSuffix {
-        public final static char scopeSuffix[] = {
-            11,70,70,70,70,37,70,70,70,70,
-            313,79,118,70,70,19,27,57,70,70,
-            70,285,313,44,79,118,70,93,108,124,
-            70,70,138,138,70,138,138,70,70,63,
-            150,79,70,81,165,89,120,96,112,128,
-            48,173,176,181,184,189,192,195,198,203,
-            206,211,216,221,226
-        };
-    };
-    public final static char scopeSuffix[] = ScopeSuffix.scopeSuffix;
-    public final int scopeSuffix(int index) { return scopeSuffix[index]; }
-
-    public interface ScopeLhs {
-        public final static char scopeLhs[] = {
-            116,24,23,23,26,113,26,26,24,23,
-            24,36,36,26,26,115,114,24,67,26,
-            26,26,24,112,36,36,26,36,36,36,
-            132,132,38,37,66,18,17,6,5,137,
-            67,36,34,36,35,36,36,36,36,36,
-            109,41,41,44,44,47,47,47,47,50,
-            50,53,56,59,63
-        };
-    };
-    public final static char scopeLhs[] = ScopeLhs.scopeLhs;
-    public final int scopeLhs(int index) { return scopeLhs[index]; }
-
-    public interface ScopeLa {
-        public final static char scopeLa[] = {
-            92,4,4,4,4,78,4,4,4,4,
-            39,42,68,4,4,86,84,70,4,4,
-            4,21,39,80,42,68,4,95,95,95,
-            4,4,56,56,4,56,56,4,4,39,
-            21,42,4,94,96,94,94,94,94,94,
-            5,41,2,5,37,50,49,48,47,51,
-            38,54,55,57,60
-        };
-    };
-    public final static char scopeLa[] = ScopeLa.scopeLa;
-    public final int scopeLa(int index) { return scopeLa[index]; }
-
-    public interface ScopeStateSet {
-        public final static byte scopeStateSet[] = {
-            86,23,23,23,23,86,23,23,23,23,
-            23,23,23,23,23,86,86,23,89,23,
-            23,23,23,86,23,23,23,23,23,23,
-            3,3,23,23,89,23,23,5,5,1,
-            89,23,23,23,23,23,23,23,23,23,
-            86,27,27,29,29,33,33,33,33,35,
-            35,36,37,38,39
-        };
-    };
-    public final static byte scopeStateSet[] = ScopeStateSet.scopeStateSet;
-    public final int scopeStateSet(int index) { return scopeStateSet[index]; }
-
-    public interface ScopeRhs {
-        public final static char scopeRhs[] = {0,
-            263,339,252,90,252,89,252,88,87,0,
-            92,0,263,3,66,252,85,0,86,0,
-            338,314,263,252,81,0,84,0,263,313,
-            337,3,66,252,67,0,78,0,263,336,
-            252,79,0,80,0,302,0,262,301,0,
-            252,332,43,330,217,0,70,0,282,61,
-            294,0,39,252,0,329,1,326,0,4,
-            0,328,1,325,0,252,33,0,260,0,
-            94,260,0,293,94,252,33,0,94,293,
-            260,0,95,260,0,94,293,95,260,0,
-            293,95,293,94,252,33,0,95,293,260,
-            0,94,293,95,293,260,0,68,0,94,
-            293,68,0,95,293,68,0,94,293,95,
-            293,68,0,322,58,22,0,56,0,257,
-            21,257,1,22,0,257,1,22,0,21,
-            257,4,0,289,58,23,0,257,1,23,
-            0,321,34,0,96,252,0,252,1,0,
-            232,0,41,225,0,2,225,0,235,0,
-            5,233,0,37,233,0,238,0,50,236,
-            0,49,236,0,48,236,0,47,236,0,
-            241,0,51,239,0,38,239,0,244,0,
-            54,242,0,247,0,55,245,0,250,0,
-            57,248,0,256,0,60,251,0,271,1,
-            266,280,40,196,45,217,0,271,1,280,
-            40,196,0,271,1,266,193,0,271,1,
-            266,193,45,217,0,271,1,266,317,45,
-            217,0,265,21,193,1,193,44,217,0,
-            265,21,253,1,193,44,217,0,253,1,
-            193,44,217,0,21,265,4,0,252,1,
-            193,44,217,0,252,39,268,61,269,1,
-            193,44,217,0,268,61,269,1,193,44,
-            217,0,39,252,4,0,252,39,268,1,
-            193,44,217,0,268,1,193,44,217,0,
-            252,39,269,21,264,1,193,44,217,0,
-            252,39,269,21,193,1,193,44,217,0,
-            252,39,269,1,193,44,217,0,320,58,
-            17,0,289,58,194,0,318,1,17,0,
-            257,1,194,0
-        };
-    };
-    public final static char scopeRhs[] = ScopeRhs.scopeRhs;
-    public final int scopeRhs(int index) { return scopeRhs[index]; }
-
-    public interface ScopeState {
-        public final static char scopeState[] = {0,
-            4945,0,4545,0,4938,4931,4916,4909,4895,4885,
-            4863,4841,4702,4827,4817,4810,4795,4691,4788,4670,
-            4759,4663,4621,4582,4501,4462,541,420,4417,4372,
-            4327,4282,4234,4186,4135,4081,1029,4021,3956,3891,
-            3826,3761,3696,1408,3631,3566,3501,675,1859,3436,
-            3371,3306,1757,1328,1248,2002,3241,3176,3111,3046,
-            2981,1664,2916,2851,951,597,2786,1168,1590,2721,
-            1488,1088,2656,2591,2526,852,753,2461,2396,2331,
-            2266,2201,2136,1933,2071,476,355,0,4938,4931,
-            4916,4909,4895,4885,4863,4841,4702,4827,4817,4810,
-            4795,4691,4788,4670,4759,4663,0
-        };
-    };
-    public final static char scopeState[] = ScopeState.scopeState;
-    public final int scopeState(int index) { return scopeState[index]; }
-
-    public interface InSymb {
-        public final static char inSymb[] = {0,
-            0,315,93,270,24,295,298,72,270,24,
-            296,299,73,199,287,286,63,64,196,24,
-            24,24,276,3,2,3,24,40,270,270,
-            1,53,40,1,53,2,300,22,23,17,
-            194,3,196,257,257,300,257,4,21,4,
-            1,1,1,1,62,52,263,262,261,21,
-            4,263,53,2,53,257,257,318,193,319,
-            257,193,226,196,217,22,23,199,17,194,
-            33,1,231,237,234,243,240,222,249,246,
-            256,247,241,235,31,5,34,232,238,244,
-            250,254,257,302,75,74,79,67,81,85,
-            87,24,53,257,4,257,21,52,21,266,
-            40,330,45,44,58,58,58,58,252,252,
-            60,55,51,38,5,37,222,321,193,41,
-            2,50,49,48,47,54,57,62,38,262,
-            334,196,252,252,252,252,88,261,257,263,
-            53,263,257,1,280,43,317,196,193,193,
-            327,326,325,322,291,323,289,252,290,320,
-            193,289,94,222,250,222,244,222,238,238,
-            222,232,232,21,96,52,222,235,235,235,
-            235,222,241,222,247,335,1,336,66,263,
-            66,252,24,263,257,271,265,1,332,3,
-            266,40,266,1,1,1,38,21,71,21,
-            21,38,293,257,67,53,265,263,3,314,
-            82,3,89,263,21,271,252,1,280,1,
-            252,268,269,264,253,193,329,193,294,328,
-            269,193,95,38,252,337,77,338,83,252,
-            263,252,271,266,271,39,61,39,21,21,
-            21,52,21,61,39,21,293,76,313,263,
-            90,1,252,268,252,269,265,269,265,193,
-            257,282,294,263,252,271,39,39,39,39,
-            39,339,252,252,252,263
-        };
-    };
-    public final static char inSymb[] = InSymb.inSymb;
-    public final int inSymb(int index) { return inSymb[index]; }
-
-    public interface Name {
-        public final static String name[] = {
-            "",
-            "+",
-            "-",
-            "*",
-            "/",
-            ">",
-            "<",
-            "=",
-            ">=",
-            "<=",
-            "<>",
-            "(",
-            ")",
-            "{",
-            "}",
-            "[",
-            "]",
-            "->",
-            "|",
-            ",",
-            ":",
-            "::",
-            ";",
-            ".",
-            "..",
-            ":=",
-            "+=",
-            "!",
-            "::=",
-            "?",
-            "\\u00AB",
-            "$empty",
-            "INTEGER_LITERAL",
-            "REAL_LITERAL",
-            "STRING_LITERAL",
-            "SINGLE_LINE_COMMENT",
-            "MULTI_LINE_COMMENT",
-            "IMPORT",
-            "EXTENSION",
-            "AROUND",
-            "ENDAROUND",
-            "DEFINE",
-            "ENDDEFINE",
-            "ERROR",
-            "EXPAND",
-            "FOR",
-            "SEPARATOR",
-            "AS",
-            "ITERATOR",
-            "FOREACH",
-            "ENDFOREACH",
-            "FILE",
-            "ENDFILE",
-            "IF",
-            "ELSEIF",
-            "ELSE",
-            "ENDIF",
-            "LET",
-            "ENDLET",
-            "PROTECT",
-            "CSTART",
-            "CEND",
-            "ID",
-            "DISABLE",
-            "ENDPROTECT",
-            "self",
-            "if",
-            "then",
-            "else",
-            "endif",
-            "and",
-            "or",
-            "xor",
-            "not",
-            "implies",
-            "let",
-            "in",
-            "true",
-            "false",
-            "null",
-            "invalid",
-            "Set",
-            "Bag",
-            "Sequence",
-            "Collection",
-            "OrderedSet",
-            "String",
-            "Integer",
-            "UnlimitedNatural",
-            "Real",
-            "Boolean",
-            "Tuple",
-            "OclAny",
-            "OclVoid",
-            "OclInvalid",
-            "Dict",
-            "List",
-            "break",
-            "switch",
-            "case",
-            "xselect",
-            "xcollect",
-            "selectOne",
-            "collectOne",
-            "collectselect",
-            "collectselectOne",
-            "forEach",
-            "forOne",
-            "compute",
-            "return",
-            "var",
-            "while",
-            "continue",
-            "log",
-            "assert",
-            "with",
-            "new",
-            "static",
-            "init",
-            "end",
-            "out",
-            "object",
-            "transformation",
-            "import",
-            "library",
-            "metamodel",
-            "mapping",
-            "query",
-            "helper",
-            "inout",
-            "when",
-            "configuration",
-            "intermediate",
-            "property",
-            "opposites",
-            "class",
-            "population",
-            "map",
-            "xmap",
-            "late",
-            "resolve",
-            "resolveone",
-            "resolveIn",
-            "resolveoneIn",
-            "invresolve",
-            "invresolveone",
-            "invresolveIn",
-            "invresolveoneIn",
-            "modeltype",
-            "uses",
-            "where",
-            "refines",
-            "access",
-            "extends",
-            "blackbox",
-            "abstract",
-            "result",
-            "main",
-            "this",
-            "rename",
-            "disjuncts",
-            "merges",
-            "inherits",
-            "composes",
-            "constructor",
-            "datatype",
-            "default",
-            "derived",
-            "do",
-            "elif",
-            "enum",
-            "except",
-            "exception",
-            "from",
-            "literal",
-            "ordered",
-            "primitive",
-            "raise",
-            "readonly",
-            "references",
-            "tag",
-            "try",
-            "typedef",
-            "unlimited",
-            "EOF_TOKEN",
-            "IDENTIFIER",
-            "STEREOTYPE_QUALIFIER_OPEN",
-            "STEREOTYPE_QUALIFIER_CLOSE",
-            "MULTIPLICITY_RANGE",
-            "TILDE_SIGN",
-            "NOT_EQUAL_EXEQ",
-            "AT_SIGN",
-            "TEXT",
-            "ERROR_TOKEN",
-            "conceptualOperationNameCS",
-            "CollectionTypeIdentifierCS",
-            "simpleNameCS",
-            "unreservedSimpleNameCS",
-            "pathNameCS",
-            "typeCS",
-            "tupleTypePartsCS",
-            "typedUninitializedVariableCS",
-            "OclExpressionCS",
-            "typedInitializedVariableCS",
-            "initializedVariableCS",
-            "uninitializedVariableCS",
-            "CollectionLiteralPartsCS",
-            "CollectionLiteralPartCS",
-            "StringLiteralExpCS",
-            "TupleLiteralPartsCS",
-            "primaryExpCS",
-            "notNameExpressionCS",
-            "argumentsCS",
-            "SimpleNameExpCS",
-            "impliesNotNameNotLetCS",
-            "impliesNotLetCS",
-            "xorNotNameNotLetCS",
-            "xorNotLetCS",
-            "xorWithLetCS",
-            "orNotNameNotLetCS",
-            "orNotLetCS",
-            "orWithLetCS",
-            "andNotNameNotLetCS",
-            "andNotLetCS",
-            "andWithLetCS",
-            "equalityNotNameNotLetCS",
-            "equalityNotLetCS",
-            "equalityWithLetCS",
-            "relationalNotNameNotLetCS",
-            "relationalNotLetCS",
-            "relationalWithLetCS",
-            "additiveNotNameNotLetCS",
-            "additiveNotLetCS",
-            "additiveWithLetCS",
-            "multiplicativeNotNameNotLetCS",
-            "multiplicativeNotLetCS",
-            "multiplicativeWithLetCS",
-            "unaryNotLetCS",
-            "unaryWithLetCS",
-            "primaryNotNameCS",
-            "letVariablesCS",
-            "literalSimpleCS",
-            "dictLiteralPartCS",
-            "dictLiteralPartListCS",
-            "qvtErrorToken",
-            "ifExpBodyCS",
-            "imperativeIterateExpCS",
-            "imperativeIteratorExpCSToken12",
-            "imperativeIteratorExpCSToken3",
-            "imperativeIteratorExpCSToken",
-            "imperativeIterContents12",
-            "imperativeIterContents3",
-            "variableDeclarationListCS",
-            "defineOrAroundSeq",
-            "define",
-            "around",
-            "anImport",
-            "anExtensionImport",
-            "pointcut",
-            "sequence",
-            "parametersList",
-            "parameter",
-            "text",
-            "statement",
-            "definitionName"
-        };
-    };
-    public final static String name[] = Name.name;
-    public final String name(int index) { return name[index]; }
-
-    public final int originalState(int state) {
-        return -baseCheck[state];
-    }
-    public final int asi(int state) {
-        return asb[originalState(state)];
-    }
-    public final int nasi(int state) {
-        return nasb[originalState(state)];
-    }
-    public final int inSymbol(int state) {
-        return inSymb[originalState(state)];
-    }
-
-    /**
-     * assert(! goto_default);
-     */
-    public final int ntAction(int state, int sym) {
-        return baseAction[state + sym];
-    }
-
-    /**
-     * assert(! shift_default);
-     */
-    public final int tAction(int state, int sym) {
-        int i = baseAction[state],
-            k = i + sym;
-        return termAction[termCheck[k] == sym ? k : i];
-    }
-    public final int lookAhead(int la_state, int sym) {
-        int k = la_state + sym;
-        return termAction[termCheck[k] == sym ? k : la_state];
-    }
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParsersym.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParsersym.java
deleted file mode 100644
index 1eb62d16a04..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/parser/XpandParsersym.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     committers of openArchitectureWare - Xpand language syntax
- *     Artem Tikhomirov (Borland) - LALR grammar
- *                                - Migration to OCL expressions
- *     Aurelien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *****************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.parser;
-
-public interface XpandParsersym {
-    public final static int
-      TK_INTEGER_LITERAL = 25,
-      TK_REAL_LITERAL = 26,
-      TK_STRING_LITERAL = 6,
-      TK_PLUS = 37,
-      TK_MINUS = 5,
-      TK_MULTIPLY = 2,
-      TK_DIVIDE = 41,
-      TK_GREATER = 47,
-      TK_LESS = 48,
-      TK_EQUAL = 38,
-      TK_GREATER_EQUAL = 49,
-      TK_LESS_EQUAL = 50,
-      TK_NOT_EQUAL = 51,
-      TK_LPAREN = 1,
-      TK_RPAREN = 4,
-      TK_LBRACE = 58,
-      TK_RBRACE = 56,
-      TK_LBRACKET = 43,
-      TK_RBRACKET = 70,
-      TK_ARROW = 44,
-      TK_BAR = 39,
-      TK_COMMA = 21,
-      TK_COLON = 52,
-      TK_COLONCOLON = 40,
-      TK_SEMICOLON = 61,
-      TK_DOT = 45,
-      TK_DOTDOT = 71,
-      TK_RESET_ASSIGN = 62,
-      TK_ADD_ASSIGN = 103,
-      TK_EXCLAMATION_MARK = 46,
-      TK_COLONCOLONEQUAL = 104,
-      TK_QUESTIONMARK = 105,
-      TK_SINGLE_LINE_COMMENT = 106,
-      TK_MULTI_LINE_COMMENT = 107,
-      TK_IMPORT = 72,
-      TK_EXTENSION = 73,
-      TK_AROUND = 63,
-      TK_ENDAROUND = 59,
-      TK_DEFINE = 64,
-      TK_ENDDEFINE = 65,
-      TK_ERROR = 74,
-      TK_EXPAND = 75,
-      TK_FOR = 53,
-      TK_SEPARATOR = 76,
-      TK_AS = 66,
-      TK_ITERATOR = 77,
-      TK_FOREACH = 67,
-      TK_ENDFOREACH = 78,
-      TK_FILE = 79,
-      TK_ENDFILE = 80,
-      TK_IF = 81,
-      TK_ELSEIF = 82,
-      TK_ELSE = 83,
-      TK_ENDIF = 84,
-      TK_LET = 85,
-      TK_ENDLET = 86,
-      TK_PROTECT = 87,
-      TK_CSTART = 88,
-      TK_CEND = 89,
-      TK_ID = 90,
-      TK_DISABLE = 91,
-      TK_ENDPROTECT = 92,
-      TK_LG = 93,
-      TK_self = 32,
-      TK_if = 33,
-      TK_then = 94,
-      TK_else = 95,
-      TK_endif = 68,
-      TK_and = 54,
-      TK_or = 55,
-      TK_xor = 57,
-      TK_not = 31,
-      TK_implies = 60,
-      TK_let = 34,
-      TK_in = 96,
-      TK_true = 27,
-      TK_false = 28,
-      TK_null = 29,
-      TK_invalid = 30,
-      TK_Set = 7,
-      TK_Bag = 8,
-      TK_Sequence = 9,
-      TK_Collection = 10,
-      TK_OrderedSet = 11,
-      TK_String = 12,
-      TK_Integer = 13,
-      TK_UnlimitedNatural = 14,
-      TK_Real = 15,
-      TK_Boolean = 16,
-      TK_Tuple = 17,
-      TK_OclAny = 18,
-      TK_OclVoid = 19,
-      TK_OclInvalid = 20,
-      TK_Dict = 22,
-      TK_List = 23,
-      TK_break = 35,
-      TK_switch = 108,
-      TK_case = 109,
-      TK_xselect = 97,
-      TK_xcollect = 98,
-      TK_selectOne = 99,
-      TK_collectOne = 100,
-      TK_collectselect = 101,
-      TK_collectselectOne = 102,
-      TK_forEach = 110,
-      TK_forOne = 111,
-      TK_compute = 112,
-      TK_return = 113,
-      TK_var = 114,
-      TK_while = 115,
-      TK_continue = 36,
-      TK_log = 116,
-      TK_assert = 117,
-      TK_with = 118,
-      TK_new = 119,
-      TK_static = 120,
-      TK_init = 121,
-      TK_end = 122,
-      TK_out = 123,
-      TK_object = 124,
-      TK_transformation = 125,
-      TK_import = 126,
-      TK_library = 127,
-      TK_metamodel = 128,
-      TK_mapping = 129,
-      TK_query = 130,
-      TK_helper = 131,
-      TK_inout = 132,
-      TK_when = 133,
-      TK_configuration = 134,
-      TK_intermediate = 135,
-      TK_property = 136,
-      TK_opposites = 137,
-      TK_class = 138,
-      TK_population = 139,
-      TK_map = 140,
-      TK_xmap = 141,
-      TK_late = 142,
-      TK_resolve = 143,
-      TK_resolveone = 144,
-      TK_resolveIn = 145,
-      TK_resolveoneIn = 146,
-      TK_invresolve = 147,
-      TK_invresolveone = 148,
-      TK_invresolveIn = 149,
-      TK_invresolveoneIn = 150,
-      TK_modeltype = 151,
-      TK_uses = 152,
-      TK_where = 153,
-      TK_refines = 154,
-      TK_access = 155,
-      TK_extends = 156,
-      TK_blackbox = 157,
-      TK_abstract = 158,
-      TK_result = 159,
-      TK_main = 160,
-      TK_this = 161,
-      TK_rename = 162,
-      TK_disjuncts = 163,
-      TK_merges = 164,
-      TK_inherits = 165,
-      TK_composes = 166,
-      TK_constructor = 167,
-      TK_datatype = 168,
-      TK_default = 169,
-      TK_derived = 170,
-      TK_do = 171,
-      TK_elif = 172,
-      TK_enum = 173,
-      TK_except = 174,
-      TK_exception = 175,
-      TK_from = 176,
-      TK_literal = 177,
-      TK_ordered = 178,
-      TK_primitive = 179,
-      TK_raise = 180,
-      TK_readonly = 181,
-      TK_references = 182,
-      TK_tag = 183,
-      TK_try = 184,
-      TK_typedef = 185,
-      TK_unlimited = 186,
-      TK_EOF_TOKEN = 69,
-      TK_IDENTIFIER = 3,
-      TK_STEREOTYPE_QUALIFIER_OPEN = 187,
-      TK_STEREOTYPE_QUALIFIER_CLOSE = 188,
-      TK_MULTIPLICITY_RANGE = 189,
-      TK_TILDE_SIGN = 190,
-      TK_NOT_EQUAL_EXEQ = 191,
-      TK_AT_SIGN = 192,
-      TK_TEXT = 24,
-      TK_ERROR_TOKEN = 42;
-
-    public final static String orderedTerminalSymbols[] = {
-                 "",
-                 "LPAREN",
-                 "MULTIPLY",
-                 "IDENTIFIER",
-                 "RPAREN",
-                 "MINUS",
-                 "STRING_LITERAL",
-                 "Set",
-                 "Bag",
-                 "Sequence",
-                 "Collection",
-                 "OrderedSet",
-                 "String",
-                 "Integer",
-                 "UnlimitedNatural",
-                 "Real",
-                 "Boolean",
-                 "Tuple",
-                 "OclAny",
-                 "OclVoid",
-                 "OclInvalid",
-                 "COMMA",
-                 "Dict",
-                 "List",
-                 "TEXT",
-                 "INTEGER_LITERAL",
-                 "REAL_LITERAL",
-                 "true",
-                 "false",
-                 "null",
-                 "invalid",
-                 "not",
-                 "self",
-                 "if",
-                 "let",
-                 "break",
-                 "continue",
-                 "PLUS",
-                 "EQUAL",
-                 "BAR",
-                 "COLONCOLON",
-                 "DIVIDE",
-                 "ERROR_TOKEN",
-                 "LBRACKET",
-                 "ARROW",
-                 "DOT",
-                 "EXCLAMATION_MARK",
-                 "GREATER",
-                 "LESS",
-                 "GREATER_EQUAL",
-                 "LESS_EQUAL",
-                 "NOT_EQUAL",
-                 "COLON",
-                 "FOR",
-                 "and",
-                 "or",
-                 "RBRACE",
-                 "xor",
-                 "LBRACE",
-                 "ENDAROUND",
-                 "implies",
-                 "SEMICOLON",
-                 "RESET_ASSIGN",
-                 "AROUND",
-                 "DEFINE",
-                 "ENDDEFINE",
-                 "AS",
-                 "FOREACH",
-                 "endif",
-                 "EOF_TOKEN",
-                 "RBRACKET",
-                 "DOTDOT",
-                 "IMPORT",
-                 "EXTENSION",
-                 "ERROR",
-                 "EXPAND",
-                 "SEPARATOR",
-                 "ITERATOR",
-                 "ENDFOREACH",
-                 "FILE",
-                 "ENDFILE",
-                 "IF",
-                 "ELSEIF",
-                 "ELSE",
-                 "ENDIF",
-                 "LET",
-                 "ENDLET",
-                 "PROTECT",
-                 "CSTART",
-                 "CEND",
-                 "ID",
-                 "DISABLE",
-                 "ENDPROTECT",
-                 "LG",
-                 "then",
-                 "else",
-                 "in",
-                 "xselect",
-                 "xcollect",
-                 "selectOne",
-                 "collectOne",
-                 "collectselect",
-                 "collectselectOne",
-                 "ADD_ASSIGN",
-                 "COLONCOLONEQUAL",
-                 "QUESTIONMARK",
-                 "SINGLE_LINE_COMMENT",
-                 "MULTI_LINE_COMMENT",
-                 "switch",
-                 "case",
-                 "forEach",
-                 "forOne",
-                 "compute",
-                 "return",
-                 "var",
-                 "while",
-                 "log",
-                 "assert",
-                 "with",
-                 "new",
-                 "static",
-                 "init",
-                 "end",
-                 "out",
-                 "object",
-                 "transformation",
-                 "import",
-                 "library",
-                 "metamodel",
-                 "mapping",
-                 "query",
-                 "helper",
-                 "inout",
-                 "when",
-                 "configuration",
-                 "intermediate",
-                 "property",
-                 "opposites",
-                 "class",
-                 "population",
-                 "map",
-                 "xmap",
-                 "late",
-                 "resolve",
-                 "resolveone",
-                 "resolveIn",
-                 "resolveoneIn",
-                 "invresolve",
-                 "invresolveone",
-                 "invresolveIn",
-                 "invresolveoneIn",
-                 "modeltype",
-                 "uses",
-                 "where",
-                 "refines",
-                 "access",
-                 "extends",
-                 "blackbox",
-                 "abstract",
-                 "result",
-                 "main",
-                 "this",
-                 "rename",
-                 "disjuncts",
-                 "merges",
-                 "inherits",
-                 "composes",
-                 "constructor",
-                 "datatype",
-                 "default",
-                 "derived",
-                 "do",
-                 "elif",
-                 "enum",
-                 "except",
-                 "exception",
-                 "from",
-                 "literal",
-                 "ordered",
-                 "primitive",
-                 "raise",
-                 "readonly",
-                 "references",
-                 "tag",
-                 "try",
-                 "typedef",
-                 "unlimited",
-                 "STEREOTYPE_QUALIFIER_OPEN",
-                 "STEREOTYPE_QUALIFIER_CLOSE",
-                 "MULTIPLICITY_RANGE",
-                 "TILDE_SIGN",
-                 "NOT_EQUAL_EXEQ",
-                 "AT_SIGN"
-             };
-
-    public final static int numTokenKinds = orderedTerminalSymbols.length;
-    public final static boolean isValidForParser = true;
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/BundleResourceManager.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/BundleResourceManager.java
deleted file mode 100644
index 0bb3cf39de1..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/BundleResourceManager.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- *
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-
-import org.eclipse.m2m.internal.qvt.oml.compiler.UnitResolver;
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-import org.eclipse.papyrus.gmf.internal.xpand.inactive.StreamDecoder;
-import org.eclipse.papyrus.gmf.internal.xpand.model.EvaluationException;
-
-/**
- * Node: no support for relative paths (i.e. '..::templates::SomeTemplate.xpt')
- * @author artem
- */
-public class BundleResourceManager extends ResourceManagerImpl {
-	private final URL[] paths;
-
-	public BundleResourceManager(URL... paths) {
-		assert paths != null && paths.length > 0; 
-		this.paths = new URL[paths.length];
-		for (int i = 0; i < paths.length; i++) {
-			this.paths[i] = fixTrailingSlash(paths[i]);
-		}
-	}
-
-	/**
-	 * new URL("base:url/path1/withoutTrailingSlash", "path2/noLeadingSlash")
-	 * results in "base:url/path/path2/noLeadingSlash" - note lost "withoutTrailingSlash" part
-	 * XXX Perhaps, would be better for clients do this 'normalization'?
-	 */
-	private static URL fixTrailingSlash(URL u) {
-		try {
-			if (u.getPath() != null && !u.getPath().endsWith("/")) {
-				return new URL(u, u.getPath() + '/');
-			}
-		} catch (MalformedURLException ex) {
-			/*IGNORE*/
-		}
-		return u;
-	}
-
-	@Override
-	protected boolean shouldCache() {
-		return true;
-	}
-
-	@Override
-	protected void handleParserException(ParserException ex) {
-		throw new EvaluationException(ex.toString());
-	}
-
-	private Reader createReader(String urlPath, URL baseUrl) throws MalformedURLException, IOException {
-		URL u = new URL(baseUrl, urlPath);
-		InputStream is = u.openStream();
-		// XXX here we ignore the fact baseUrl may point to workspace location
-		// and hence charset can be derived from IFile
-		// FIXME for now, go with legacy encoding as a default
-		return new StreamDecoder(is, StreamDecoder.LEGACY_ENCODING).getReader();
-	}
-
-	@Override
-	protected Reader[] resolveMultiple(String fullyQualifiedName, String extension) throws IOException {
-		final String urlPath = fullyQualifiedName.replaceAll(TypeNameUtil.NS_DELIM, "/") + '.' + extension;
-		ArrayList<Reader> result = new ArrayList<Reader>(paths.length);
-		for (int i = 0; i < paths.length; i++) {
-			try {
-				result.add(createReader(urlPath, paths[i]));
-			} catch (MalformedURLException ex) {
-				/*IGNORE*/
-			} catch (IOException ex) {
-				// XXX perhaps, conditionally turn logging on to debug template loading issues?
-				/*IGNORE*/
-			} catch (Exception ex) {
-				// just in case
-				Activator.logError(ex);
-			}
-		}
-		if (result.isEmpty()) {
-			throw new FileNotFoundException(fullyQualifiedName);
-		}
-		return result.toArray(new Reader[result.size()]);
-	}
-
-	@Override
-	protected String resolveCFileFullPath(String fullyQualifiedName, String extension) {
-		final String urlPath = fullyQualifiedName.replaceAll(TypeNameUtil.NS_DELIM, "/") + '.' + extension;
-		if (paths.length > 0) {
-			try {
-				return new URL(paths[0], urlPath).toString();
-			} catch (MalformedURLException e) {
-				/* IGNORE */
-			}
-		}
-		return fullyQualifiedName + "." + extension;
-	}
-	
-	@Override
-	protected UnitResolver getQVTUnitResolver() {
-		return BundleUnitResolver.createResolver(Arrays.asList(paths), true);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/BundleUnitResolver.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/BundleUnitResolver.java
deleted file mode 100644
index cd266f12b9a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/BundleUnitResolver.java
+++ /dev/null
@@ -1,152 +0,0 @@
-/************************************************************************************************************************************************************
- * Copyright (c) 2009, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Borland Software Corporation - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.m2m.internal.qvt.oml.common.MDAConstants;
-import org.eclipse.m2m.internal.qvt.oml.compiler.BlackboxUnitResolver;
-import org.eclipse.m2m.internal.qvt.oml.compiler.DelegatingUnitResolver;
-import org.eclipse.m2m.internal.qvt.oml.compiler.ResolverUtils;
-import org.eclipse.m2m.internal.qvt.oml.compiler.UnitContents;
-import org.eclipse.m2m.internal.qvt.oml.compiler.UnitProxy;
-import org.eclipse.m2m.internal.qvt.oml.compiler.UnitResolver;
-
-
-public class BundleUnitResolver extends DelegatingUnitResolver {
-
-	private final class BundleUnit extends UnitProxy {
-
-		private final URL url;
-
-		private BundleUnit(String namespace, String unitName, URL unitURL) {
-			super(namespace, unitName, createUnitURI(unitURL));
-			this.url = unitURL;
-		}
-		
-		@Override
-		public int getContentType() {
-			return UnitProxy.TYPE_CST_STREAM;
-		}
-
-		@Override
-		public UnitContents getContents() throws IOException {
-			return new UnitContents.CSTContents() {				
-				public Reader getContents() throws IOException {
-					URLConnection connection = url.openConnection();
-					
-					String charset = connection.getContentEncoding();
-					if(charset == null) {
-						charset = "UTF-8"; //$NON-NLS-1$
-					}
-
-					return new InputStreamReader(connection.getInputStream(), charset);
-				}
-			};
-		}
-
-		@Override
-		public UnitResolver getResolver() {
-			return BundleUnitResolver.this;
-		}
-		
-	}
-	
-
-	private List<URL> fBaseURLs;	
-			
-	public BundleUnitResolver(List<URL> baseURL) {
-		if(baseURL == null || baseURL.contains(null)) {
-			throw new IllegalArgumentException();
-		}
-		
-		fBaseURLs = new ArrayList<URL>(baseURL);
-	}
-		
-	@Override
-	protected UnitProxy doResolveUnit(String qualifiedName) {
-		for (URL baseURL : fBaseURLs) {
-			UnitProxy unit = doResolveUnit(baseURL, qualifiedName);
-			if(unit != null) {
-				return unit;
-			}
-		}
-		
-		return null;
-	}
-	
-	private UnitProxy doResolveUnit(URL baseURL, String qualifiedName) {
-		String pathStr = qualifiedName.replace('.', '/');
-		IPath path = new Path(pathStr).addFileExtension(MDAConstants.QVTO_FILE_EXTENSION);
-		URL url;
-		try {
-			url = new URL(baseURL, path.toString());
-		} catch (MalformedURLException e1) {
-			return null;
-		}
-		
-		InputStream is = null;
-		try {
-			is = url.openStream();
-
-			String name = path.lastSegment();
-			String namespace = null;
-			if(path.segmentCount() > 1) {
-				IPath nameSpacePath = path.removeLastSegments(1);
-				namespace = ResolverUtils.getNamespace(nameSpacePath);
-			}
-
-			return new BundleUnit(namespace, name, url);
-			
-		} catch (IOException e) {
-			return null;
-		} finally {
-			if(is != null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					// do nothing
-				}
-			}
-		}
-	}
-	
-	private static URI createUnitURI(URL url) {
-		// TODO - we might not necessarily be passed a platform URL
-		// to do adjustments to produce a valid URI
-		return URI.createURI(url.toString());
-	}
-
-	public static UnitResolver createResolver(List<URL> bundleBaseURLs, boolean includeBlackboxUnits) {		
-		BundleUnitResolver bundleUnitResolver = new BundleUnitResolver(bundleBaseURLs);		
-		if(includeBlackboxUnits) {
-			bundleUnitResolver.setParent(BlackboxUnitResolver.DEFAULT);
-		}
-		
-		return bundleUnitResolver;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/CompositeXpandResource.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/CompositeXpandResource.java
deleted file mode 100644
index c55862b264a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/CompositeXpandResource.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     bblajer - initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Advice;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContextImpl;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Scope;
-import org.eclipse.papyrus.gmf.internal.xpand.model.StatefulResource;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAdvice;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandResource;
-
-/**
- * Composes several Xpand ast trees into a single resource. Definitions are merged: 
- * if definitions with duplicate signatures are found, the one that comes first (i.e., from a more recent source) wins. 
- * Advice declarations are aggregated: if several advice declarations have the same signature, all are returned in the order
- * in which they are declared.
- */
-class CompositeXpandResource implements XpandResource, StatefulResource {
-	private final XpandResource[] myDefinitions;
-	private final XpandResource[] myAdvices;
-	private XpandAdvice[] myCachedAdvices;
-	private XpandDefinition[] myCachedDefinitions;
-	private String[] myImportedNamespaces;
-	private String[] myImportedExtensions;
-
-	/**
-	 * Creates a composite resource from a non-empty array of definition resources and optional advice resources.
-	 * @param manager Resource manager used to create this resource. It will not be remembered by the resource.
-	 * @param definitions an array of definition resources. Must not be empty.
-	 * @param advices an array of advice resources or <code>null</code> if no advice resources are available.
-	 */
-	public CompositeXpandResource(ResourceManager manager, XpandResource[] definitions, XpandResource[] advices) {
-		myDefinitions = definitions;
-		myAdvices = advices == null ? NO_RESOURCES : advices;
-	}
-	
-	public void initialize(Scope scope) {
-		ArrayList<XpandDefinition> allDefinitions = new ArrayList<XpandDefinition>();
-		HashSet<DefinitionSignature> signatures = new HashSet<DefinitionSignature>();
-		ExecutionContext context = new ExecutionContextImpl(scope);
-		// Definitions are merged in the following order: first, all advice
-		// resources from newest to oldest, then all
-		// non-advice resources, from newest to oldest.
-		mergeDefinitions(context, myAdvices, allDefinitions, signatures);
-		mergeDefinitions(context, myDefinitions, allDefinitions, signatures);
-		myCachedDefinitions = allDefinitions.toArray(new XpandDefinition[allDefinitions.size()]);
-		// Advice declarations are collected (without merging) in the order from
-		// oldest to newest.
-		// Only advice resources are taken into consideration.
-		if (myAdvices.length > 0) {
-			ArrayList<XpandAdvice> allAdvices = new ArrayList<XpandAdvice>();
-			collectAdvices(myAdvices, allAdvices);
-			myCachedAdvices = allAdvices.toArray(new XpandAdvice[allAdvices.size()]);
-		} else {
-			myCachedAdvices = NO_ADVICE;
-		}
-	}
-	
-	public boolean isInitialized() {
-		return myCachedDefinitions != null && myCachedAdvices != null;
-	}
-
-	private void mergeDefinitions(ExecutionContext context, XpandResource[] resources, List<XpandDefinition> collector, Set<DefinitionSignature> usedSignatures) {
-		for (int i = 0; i < resources.length; i++) {
-			XpandResource nextResource = resources[i];
-			context = context.cloneWithResource(nextResource);
-			XpandDefinition[] definitions = nextResource.getDefinitions();
-			for (XpandDefinition nextDefinition : definitions) {
-				DefinitionSignature signature = DefinitionSignature.create(context, nextDefinition);
-				if (signature == null || usedSignatures.contains(signature)) {
-					continue;
-				}
-				usedSignatures.add(signature);
-				collector.add(nextDefinition);
-			}
-		}
-	}
-
-	private void collectAdvices(XpandResource[] resources, List<XpandAdvice> collector) {
-		for (int i = resources.length - 1; i >= 0; i--) {
-			XpandResource nextResource = resources[i];
-			XpandAdvice[] advices = nextResource.getAdvices();
-			for (XpandAdvice nextAdvice : advices) {
-				collector.add(nextAdvice);
-			}
-		}
-	}
-
-	public XpandAdvice[] getAdvices() {
-		if (!isInitialized()) {
-			throw new IllegalStateException("Stateful resource " + getFullyQualifiedName() + " was not initialized");
-		}
-		return myCachedAdvices;
-	}
-
-	public XpandDefinition[] getDefinitions() {
-		if (!isInitialized()) {
-			throw new IllegalStateException("Stateful resource " + getFullyQualifiedName() + " was not initialized");
-		}
-		return myCachedDefinitions;
-	}
-
-	public String getFullyQualifiedName() {
-		return myDefinitions[0].getFullyQualifiedName();
-	}
-
-	public String[] getImportedExtensions() {
-		if (myImportedExtensions == null) {
-			LinkedHashSet<String> result = new LinkedHashSet<String>();
-			for (XpandResource nextResource : myDefinitions) {
-				for (String nextImport : nextResource.getImportedExtensions()) {
-					result.add(nextImport);
-				}
-			}
-			for (XpandResource nextResource : myAdvices) {
-				for (String nextImport : nextResource.getImportedExtensions()) {
-					result.add(nextImport);
-				}
-			}
-			myImportedExtensions = result.toArray(new String[result.size()]);
-		}
-		return myImportedExtensions;
-	}
-
-	public String[] getImportedNamespaces() {
-		if (myImportedNamespaces == null) {
-			LinkedHashSet<String> result = new LinkedHashSet<String>();
-			for (XpandResource nextResource : myDefinitions) {
-				for (String nextImport : nextResource.getImportedNamespaces()) {
-					result.add(nextImport);
-				}
-			}
-			for (XpandResource nextResource : myAdvices) {
-				for (String nextImport : nextResource.getImportedNamespaces()) {
-					result.add(nextImport);
-				}
-			}
-			myImportedNamespaces = result.toArray(new String[result.size()]);
-		}
-		return myImportedNamespaces;
-	}
-
-	public void analyze(ExecutionContext ctx, Set<AnalysationIssue> issues) {
-		for (XpandResource next : myDefinitions) {
-			next.analyze(ctx, issues);
-		}
-		for (XpandResource next : myAdvices) {
-			next.analyze(ctx, issues);
-		}
-	}
-
-	private static final XpandResource[] NO_RESOURCES = new XpandResource[0];
-	private static final Advice[] NO_ADVICE = new Advice[0];
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ContextFactory.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ContextFactory.java
deleted file mode 100644
index ca2a5836a79..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ContextFactory.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Borland - initial API and implementation
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
- 
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.util.Collection;
-
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContextImpl;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Output;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Scope;
-import org.eclipse.papyrus.gmf.internal.xpand.model.Variable;
-
-/**
- * TODO remove?
- * @author artem
- */
-public class ContextFactory {
-	
-	public static ExecutionContext createXpandContext(ResourceManager resourceManager) {
-		return createXpandContext(resourceManager, null, null);
-	}
-
-	public static ExecutionContext createXpandContext(ResourceManager resourceManager, Output output, Collection<Variable> globalVars) {
-		Scope scope = new Scope(resourceManager, globalVars, output);
-		return new ExecutionContextImpl(scope);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/DefinitionSignature.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/DefinitionSignature.java
deleted file mode 100644
index 66e6e6a5585..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/DefinitionSignature.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2007, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    bblajer - initial API and implementation
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.util.Arrays;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.ocl.TypeResolver;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-
-final class DefinitionSignature {
-	private final String myName;
-	private final EClassifier myType;
-	private final EClassifier[] myArgs;
-	private TypeResolver<EClassifier, EOperation, EStructuralFeature> myTypeResolver;
-
-	public static DefinitionSignature create(ExecutionContext ctx, XpandDefinition def) {
-		if (def == null || ctx == null) {
-			return null;
-		}
-		EClassifier type = def.getTargetType().getTypeForName(ctx);
-		if (type == null) {
-			return null;
-		}
-		EClassifier[] args = new EClassifier[def.getParams().length];
-		for (int i = 0; i < def.getParams().length; i++) {
-			EClassifier nextArg = def.getParams()[i].getTypeForName(ctx);
-			if (nextArg == null) {
-				return null;
-			}
-			args[i] = nextArg;
-		}
-		return new DefinitionSignature(def.getName(), type, args, ctx.getOCLEnvironment().getTypeResolver());
-	}
-	
-	private DefinitionSignature(String name, EClassifier type, EClassifier[] args, TypeResolver<EClassifier, EOperation, EStructuralFeature> typeResolver) {
-		myName = name;
-		myType = type;
-		myArgs = args;
-		myTypeResolver = typeResolver;
-		assert myName != null;
-		assert myArgs != null;
-		for (EClassifier nextArg : myArgs) {
-			assert nextArg != null;
-		}
-		assert myTypeResolver != null;
-	}
-	
-	public boolean equals(Object o) {
-		if (o instanceof DefinitionSignature) {
-			DefinitionSignature that = (DefinitionSignature) o;
-			return this.myName.equals(that.myName) && ((this.myType == null && that.myType == null) || this.myType.equals(resolve(that.myType))) && Arrays.equals(this.myArgs, resolve(that.myArgs));
-		}
-		return false;
-	}
-	
-	private EClassifier resolve(EClassifier classifier) {
-		return myTypeResolver.resolve(classifier);
-	}
-
-	private EClassifier[] resolve(EClassifier[] classifiers) {
-		EClassifier[] result = new EClassifier[classifiers.length];
-		for (int i = 0; i < result.length; i++) {
-			result[i] = resolve(classifiers[i]);
-		}
-		return result;
-	}
-	
-	@Override
-	public int hashCode() {
-		return myName.hashCode();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ParserException.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ParserException.java
deleted file mode 100644
index 8baddad9371..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ParserException.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Artem Tikhomirov (Borland) - initial API and implementation
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.util.Collection;
-
-public class ParserException extends Exception {
-	private static final long serialVersionUID = 1L;
-
-	private final ErrorLocationInfo[] errors;
-	private final String qualifiedResourceName;
-
-	public ParserException(String qualifiedName, Collection<? extends ErrorLocationInfo> errors) {
-		this(qualifiedName, errors.toArray(new ErrorLocationInfo[errors.size()]));
-	}
-
-	public ParserException(String qualifiedName, ErrorLocationInfo... errors) {
-		assert errors != null && errors.length > 0;
-		this.errors = errors;
-		this.qualifiedResourceName = qualifiedName;
-	}
-
-	public ErrorLocationInfo[] getParsingErrors() {
-		return errors;
-	}
-	
-	public String getResourceName() {
-		return qualifiedResourceName;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(getClass().getName());
-		sb.append(", @");
-		sb.append(getResourceName());
-		for (ErrorLocationInfo l : getParsingErrors()) {
-			sb.append('\n');
-			sb.append('\t');
-			if (l.startLine == -1 || l.startOffset == -1) {
-				sb.append("[unspecified location]");
-			} else {
-				sb.append('[');
-				if (l.startLine != -1 && l.endLine != -1) {
-					sb.append(l.startLine);
-					sb.append(':');
-					sb.append(l.startColumn);
-					sb.append('-');
-					sb.append(l.endLine);
-					sb.append(':');
-					sb.append(l.endColumn);
-				} else {
-					sb.append(l.startOffset);
-					sb.append('-');
-					sb.append(l.endOffset);
-				}
-				sb.append(']');
-			}
-			sb.append(' ');
-			sb.append(l.message);
-		}
-		return sb.toString();
-	}
-
-	public static class ErrorLocationInfo {
-		public final int startLine;
-		public final int startColumn;
-		public final int endLine;
-		public final int endColumn;
-		public final String message;
-		public final int startOffset;
-		public final int endOffset;
-
-		public ErrorLocationInfo(String message) {
-			this(message, -1, -1, -1, -1, -1, -1);
-		}
-
-		public ErrorLocationInfo(String message, int startLine, int startColumn, int endLine, int endColumn) {
-			this(message, startLine, startColumn, endLine, endColumn, -1, -1);
-		}
-
-		public ErrorLocationInfo(String message, int startLine, int startColumn, int endLine, int endColumn, int startOffset, int endOffset) {
-			this.message = message;
-			this.startLine = startLine;
-			this.startColumn = startColumn;
-			this.endLine = endLine;
-			this.endColumn = endColumn;
-			this.startOffset = startOffset;
-			this.endOffset = endOffset;
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/PolymorphicResolver.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/PolymorphicResolver.java
deleted file mode 100644
index e69cf0c4b9d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/PolymorphicResolver.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AmbiguousDefinitionException;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandDefinition;
-
-/**
- * @author Sven Efftinge
- * @author Arno Haase
- */
-public class PolymorphicResolver {
-
-	public static XpandDefinition filterDefinition(final HashMap<XpandDefinition, List<EClassifier>> resolvedDefs, EClassifier targetType, List<EClassifier> paramTypes, EcoreEnvironment env) throws AmbiguousDefinitionException {
-        final List<EClassifier> allParams = new ArrayList<EClassifier>();
-        allParams.add(targetType);
-        allParams.addAll(paramTypes);
-
-        final TypesComparator typesComparator = new TypesComparator(env);
-        
-        final List<XpandDefinition> candidateDefinition = new ArrayList<XpandDefinition>();
-		for (XpandDefinition def : resolvedDefs.keySet()) {
-            final List<? extends EClassifier> featureParamTypes = resolvedDefs.get(def);
-            if ((featureParamTypes.size() == allParams.size())
-                    && (typesComparator .compare(featureParamTypes, allParams) >= 0)) {
-            	candidateDefinition.add(def);
-            }
-        }
-		final Comparator<XpandDefinition> comparator = new Comparator<XpandDefinition>() {
-	        public int compare(XpandDefinition d1, XpandDefinition d2) {
-	            return typesComparator.compare(resolvedDefs.get(d1), resolvedDefs.get(d2));
-	        }
-	    };
-	    try {
-	    	return filterWithComparator(candidateDefinition, comparator);
-	    } catch (IllegalStateException ex) {
-	    	throw new AmbiguousDefinitionException(candidateDefinition.get(0), candidateDefinition.get(1));
-	    }
-	}
-
-    /**
-     * @throws IllegalStateException when there are more than one candidates with same priority
-     */
-    private static <T> T filterWithComparator(List<T> candidates, Comparator<T> comparator) throws IllegalStateException {
-        if (candidates.size() == 1) {
-			return candidates.get(0);
-		} else if (candidates.isEmpty()) {
-			return null;
-		} else {
-            // sort features by specialization
-            Collections.sort(candidates, comparator);
-
-            if (comparator.compare(candidates.get(1), candidates.get(0)) > 0) {
-				return candidates.get(0);
-			} else {
-				throw new IllegalStateException();
-			}
-        }
-    }
-    
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ResourceManagerImpl.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ResourceManagerImpl.java
deleted file mode 100644
index 2c00584ea91..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/ResourceManagerImpl.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- * 
- * Contributors: 
- *     Artem Tikhomirov (Borland)
- *     Boris Blajer (Borland) - support for composite resources
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.m2m.internal.qvt.oml.common.MdaException;
-import org.eclipse.m2m.internal.qvt.oml.compiler.CompiledUnit;
-import org.eclipse.m2m.internal.qvt.oml.compiler.QVTOCompiler;
-import org.eclipse.m2m.internal.qvt.oml.compiler.QvtCompilerOptions;
-import org.eclipse.m2m.internal.qvt.oml.compiler.UnitProxy;
-import org.eclipse.m2m.internal.qvt.oml.compiler.UnitResolver;
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceManager;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandResource;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtFile;
-import org.eclipse.papyrus.gmf.internal.xpand.xtend.ast.QvtResource;
-
-// FIXME it's not a good idea to parse file on every proposal computation
-public abstract class ResourceManagerImpl implements ResourceManager {
-
-	private final Map<String, XpandResource> cachedXpand = new TreeMap<String, XpandResource>();
-
-	private final Map<String, QvtResource> cachedQvt = new TreeMap<String, QvtResource>();
-
-	private QVTOCompiler qvtCompiler;
-
-	private QvtCompilerOptions qvtCompilerOptions;
-
-	public QvtResource loadQvtResource(String fullyQualifiedName) {
-		try {
-			return loadQvtResourceThroughCache(fullyQualifiedName);
-		} catch (FileNotFoundException ex) {
-			return null; // Missing resource is an anticipated situation, not a
-			// error that should be handled
-		} catch (IOException e) {
-			Activator.logError(e);
-		} catch (ParserException e) {
-			// TODO: check if any exceptions present here at all..
-			handleParserException(e);
-		}
-		return null;
-	}
-
-	protected QvtResource loadQvtResourceThroughCache(String qualifiedName) throws IOException, ParserException {
-		if (hasCachedQvt(qualifiedName)) {
-			return cachedQvt.get(qualifiedName);
-		}
-		final QvtResource loaded = doLoadQvtResource(qualifiedName);
-		assert loaded != null; // this is the contract of loadXtendResource
-		if (shouldCache()) {
-			cachedQvt.put(qualifiedName, loaded);
-		}
-		return loaded;
-	}
-
-	private QvtResource doLoadQvtResource(String fullyQualifiedName) throws IOException, ParserException {
-		String compilationUnitQName = fullyQualifiedName.replace(TypeNameUtil.NS_DELIM, "."); //$NON-NLS-1$ 
-		CompiledUnit compiledUnit = null;
-		try {
-			UnitProxy unitProxy = getQVTUnitResolver().resolveUnit(compilationUnitQName);
-			if (unitProxy == null) {
-				throw new FileNotFoundException("Failed to resolve: " + fullyQualifiedName); //$NON-NLS-1$
-			}
-			compiledUnit = getQvtCompiler().compile(unitProxy, getQvtCompilerOptions(), new NullProgressMonitor());
-		} catch (MdaException e) {
-			throw new FileNotFoundException(fullyQualifiedName);
-		}
-
-		if (compiledUnit == null) {
-			throw new FileNotFoundException(fullyQualifiedName);
-		}
-		return new QvtFile(compiledUnit, fullyQualifiedName);
-	}
-
-	abstract protected String resolveCFileFullPath(String fullyQualifiedName, String fileExtension);
-
-	/**
-	 * Using singleton QvtCompiler instance with "history". To prevent same
-	 * (native) libraries from being loaded twice into if (indirectly)
-	 * references by two different XpandResources.
-	 */
-	private QVTOCompiler getQvtCompiler() {
-		if (qvtCompiler == null) {
-			// TODO: use different kind of ImportResolver being able to
-			// construct referenced CFiles using ResourceManagerImpl	
-			qvtCompiler = QVTOCompiler.createCompilerWithHistory(getMetamodelResourceSet());
-		}
-		return qvtCompiler;
-	}
-
-	protected ResourceSet getMetamodelResourceSet() {
-		return Activator.getWorkspaceMetamodelsResourceSet();
-	}
-
-	private QvtCompilerOptions getQvtCompilerOptions() {
-		if (qvtCompilerOptions == null) {
-			qvtCompilerOptions = new QvtCompilerOptions();
-			qvtCompilerOptions.setGenerateCompletionData(true);
-			qvtCompilerOptions.setShowAnnotations(false);
-		}
-		return qvtCompilerOptions;
-	}
-
-	public XpandResource loadXpandResource(String fullyQualifiedName) {
-		try {
-			return loadXpandThroughCache(fullyQualifiedName);
-		} catch (FileNotFoundException ex) {
-			// Missing resource is an anticipated situation, not a error that should be handled
-			return null;
-		} catch (IOException ex) {
-			// XXX come up with better handling
-			Activator.logWarn(ex.getMessage());
-		} catch (ParserException ex) {
-			handleParserException(ex);
-		}
-		return null;
-	}
-
-	protected XpandResource loadXpandThroughCache(String qualifiedName) throws IOException, ParserException {
-		if (hasCachedXpand(qualifiedName)) {
-			return cachedXpand.get(qualifiedName);
-		}
-		final XpandResource loaded = doLoadXpandResource(qualifiedName);
-		if (shouldCache()) {
-			cachedXpand.put(qualifiedName, loaded);
-		}
-		return loaded;
-	}
-
-	private XpandResource doLoadXpandResource(String fullyQualifiedName) throws IOException, ParserException {
-		Reader[] rs1 = resolveMultiple(fullyQualifiedName, XpandResource.TEMPLATE_EXTENSION);
-		assert rs1 != null && rs1.length > 0; // exception should be thrown to
-												// indicate issues with resolve
-		XpandResource[] unadvised = loadXpandResources(rs1, fullyQualifiedName);
-		XpandResource[] advices = null;
-		try {
-			String aspectsTemplateName = getAspectsTemplateName(fullyQualifiedName);
-			Reader[] rs2 = resolveMultiple(aspectsTemplateName, XpandResource.TEMPLATE_EXTENSION);
-			// XXX relax resolveMultiple to return empty array and use length==0
-			// here instead of exception
-			advices = loadXpandResources(rs2, aspectsTemplateName);
-		} catch (FileNotFoundException e) {
-		} catch (IOException ex) {
-			// XXX come up with better handling
-			Activator.logWarn(ex.getMessage());
-		} catch (ParserException ex) {
-			handleParserException(ex);
-		}
-		if (advices == null && unadvised.length == 1) {
-			return unadvised[0];
-		}
-		return new CompositeXpandResource(this, unadvised, advices);
-	}
-
-	/**
-	 * XXX: only to simplify tests, should be private or inlined
-	 */
-	protected String getAspectsTemplateName(String fullyQualifiedName) {
-		return ASPECT_PREFIX + fullyQualifiedName;
-	}
-
-	/**
-	 * If the given fully-qualified name is an aspect, transforms it to its
-	 * "host" fully-qualified name. Otherwise, returns the given fully-qualified
-	 * name.
-	 */
-	protected String getNonAspectsTemplateName(String possiblyAspectedFullyQualifiedName) {
-		if (possiblyAspectedFullyQualifiedName == null) {
-			return null;
-		}
-		if (possiblyAspectedFullyQualifiedName.startsWith(ASPECT_PREFIX)) {
-			return possiblyAspectedFullyQualifiedName.substring(ASPECT_PREFIX.length());
-		}
-		return possiblyAspectedFullyQualifiedName;
-	}
-
-	protected abstract void handleParserException(ParserException ex);
-
-	/**
-	 * Returns an array of resolutions, in the order from newest to oldest. This
-	 * is to enable one template to partially override only a subset of parent
-	 * templates.
-	 * 
-	 * @return never return <code>null</code> or an empty array, throw exception
-	 *         instead
-	 * @throws IOException
-	 *             in case resource can't be read. Throw
-	 *             {@link java.io.FileNotFoundException} to indicate resource
-	 *             was not found.
-	 */
-	protected abstract Reader[] resolveMultiple(String fullyQualifiedName, String extension) throws IOException;
-
-	/**
-	 * Readers get closed after parse attempt.
-	 */
-	protected XpandResource[] loadXpandResources(Reader[] readers, String fullyQualifiedName) throws IOException, ParserException {
-		XpandResource[] result = new XpandResource[readers.length];
-		for (int i = 0; i < readers.length; i++) {
-			assert readers[i] != null;
-			try {
-				result[i] = new XpandResourceParser().parse(readers[i], fullyQualifiedName);
-				assert result[i] != null; // this is the contract of parse
-			} finally {
-				try {
-					readers[i].close();
-				} catch (Exception ex) {/* IGNORE */
-				}
-			}
-		}
-		return result;
-	}
-
-	protected abstract boolean shouldCache();
-
-	protected final boolean hasCachedXpand(String fullyQualifiedName) {
-		return shouldCache() && cachedXpand.containsKey(fullyQualifiedName);
-	}
-
-	protected final boolean hasCachedQvt(String fullyQualifiedName) {
-		return shouldCache() && cachedQvt.containsKey(fullyQualifiedName);
-	}
-
-	protected final void forgetCachedXpand(String fullyQualifiedName) {
-		cachedXpand.remove(fullyQualifiedName);
-	}
-
-	protected final void forgetCachedQvt(String fullyQualifiedName) {
-		cachedQvt.remove(fullyQualifiedName);
-	}
-
-	protected final void forgetAll() {
-		cachedXpand.clear();
-		cachedQvt.clear();
-		qvtCompiler = null;
-	}
-
-	protected abstract UnitResolver getQVTUnitResolver();
-
-	private static final String ASPECT_PREFIX = "aspects" + TypeNameUtil.NS_DELIM; //$NON-NLS-1$
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/StreamConverter.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/StreamConverter.java
deleted file mode 100644
index 4141b593af2..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/StreamConverter.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/************************************************************************************************************************************************************
- * Copyright (c) 2006, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Borland - Initial API and implementation
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.UnsupportedEncodingException;
-import java.nio.charset.Charset;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-
-/**
- * @author artem
- */
-public class StreamConverter {
-
-	/**
-	 * If this method completes successfully, whole input will be consumed, however, it won't be
-	 * 'closed', so it's up to invoker to close the input
-	 * @throws IOException
-	 */
-	public char[] toCharArray(Reader input) throws IOException {
-		return toCharWriter(input).toCharArray();
-	}
-
-	/**
-	 * @throws CoreException
-	 * @throws UnsupportedEncodingException
-	 * @throws IOException
-	 */
-	public char[] toCharArray(IFile file) throws CoreException, UnsupportedEncodingException, IOException {
-		Reader r = null;
-		try {
-			r = toContentsReader(file);
-			return toCharArray(r);
-		} finally {
-			if (r != null) {
-				try {
-					r.close();
-				} catch (IOException ex) {
-					Activator.logError(ex);
-				}
-			}
-		}
-	}
-
-	/**
-	 * It's caller's responsibility to close reader once it's no longer needed
-	 * @throws CoreException
-	 * @throws UnsupportedEncodingException
-	 */
-	public Reader toContentsReader(IFile file) throws CoreException, UnsupportedEncodingException {
-		InputStream is = file.getContents();
-		return new InputStreamReader(is, Charset.forName(file.getCharset(true)));
-	}
-
-	/**
-	 * @param input it's invoker's responsibility to close input
-	 * @return writer full of data taken from input
-	 * @throws IOException
-	 */
-	public CharArrayWriter toCharWriter(Reader input) throws IOException {
-		CharArrayWriter buffer = new CharArrayWriter(4096);
-		int r;
-		char[] cbuf = new char[4096];
-		while ((r = input.read(cbuf)) != -1) {
-			buffer.write(cbuf, 0, r);
-		}
-		return buffer;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/TypeNameUtil.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/TypeNameUtil.java
deleted file mode 100644
index 394fcf3d19b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/TypeNameUtil.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-/**
- * @author Sven Efftinge
- * @author Arno Haase
- */
-public class TypeNameUtil {
-
-	public final static String NS_DELIM = "::";
-
-	public static String withoutLastSegment(final String fqn) {
-		if (fqn.lastIndexOf(TypeNameUtil.NS_DELIM) == -1) {
-			return null;
-		}
-		return fqn.substring(0, fqn.lastIndexOf(TypeNameUtil.NS_DELIM));
-	}
-
-	public static boolean isQualifiedName(String name) {
-		assert name != null;
-		return name.indexOf(TypeNameUtil.NS_DELIM) != -1;
-	}
-
-	public static String getLastSegment(final String fqn) {
-		if (fqn.lastIndexOf(TypeNameUtil.NS_DELIM) == -1) {
-			return fqn;
-		}
-		return fqn.substring(fqn.lastIndexOf(TypeNameUtil.NS_DELIM) + TypeNameUtil.NS_DELIM.length());
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/TypesComparator.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/TypesComparator.java
deleted file mode 100644
index 181a349be0a..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/TypesComparator.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - Migration to OCL expressions
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.util.Comparator;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.ocl.ecore.EcoreEnvironment;
-import org.eclipse.ocl.util.TypeUtil;
-import org.eclipse.ocl.utilities.UMLReflection;
-import org.eclipse.papyrus.gmf.internal.xpand.BuiltinMetaModel;
-
-public final class TypesComparator implements Comparator<List<? extends EClassifier>> {
-
-	private final EcoreEnvironment env;
-
-	public TypesComparator(EcoreEnvironment env) {
-		this.env = env;
-	}
-	
-	/**
-     * 
-     * returns -1 if the second list of types is not assignable to the first
-     * list of types returns 0 if the second list of types exactly matches the
-     * first list of types returns 1 if the second list of types is assignable
-     * to the first list of types
-     */
-    public int compare(final List<? extends EClassifier> types1, final List<? extends EClassifier> types2) {
-        if ((types1 == null) || (types2 == null)) {
-			throw new NullPointerException();
-		}
-        if (types1.size() != types2.size()) {
-			return -1;
-		}
-        boolean directMatch = true;
-        for (int i = 0, x = types1.size(); i < x; i++) {
-            final EClassifier type1 = TypeUtil.resolveType(env, types1.get(i));
-            final EClassifier type2 = TypeUtil.resolveType(env, types2.get(i));
-            int rel = BuiltinMetaModel.getRelationship(env, type1, type2);
-            if ((rel & UMLReflection.SUBTYPE) != 0) {
-            	if (rel != UMLReflection.SAME_TYPE) {
-            		 // sic! Update directMatch *conditionally*
-            		directMatch = false;
-            	}
-            } else {
-				return -1;
-			}
-        }
-        if (directMatch) {
-			return 0;
-		} else {
-			return 1;
-		}
-    }
-
-}
\ No newline at end of file
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandMarkerManager.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandMarkerManager.java
deleted file mode 100644
index 4895c6f7a85..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandMarkerManager.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov (Borland) - LPG migration
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.papyrus.gmf.internal.xpand.Activator;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException.ErrorLocationInfo;
-
-/**
- */
-public class XpandMarkerManager {
-
-	public static void addMarkers(final IFile file, AnalysationIssue... issues) {
-		MarkerData[] data = new MarkerData[issues.length];
-		int i = 0;
-		for (AnalysationIssue issue : issues) {
-			data[i++] = createMarkerData(issue);
-		}
-		internalAddMarker(file, data);
-	}
-
-	public static void addMarkers(IFile file, ErrorLocationInfo... issues) {
-		MarkerData[] data = new MarkerData[issues.length];
-		int i = 0;
-		for (ErrorLocationInfo iss : issues) {
-			data[i++] = new MarkerData(iss.message, IMarker.SEVERITY_ERROR, iss.startOffset, iss.endOffset, iss.startLine);
-		}
-		internalAddMarker(file, data);
-	}
-
-	public static void addErrorMarker(final IFile file, final String message, final int start, final int end) {
-		internalAddMarker(file, new MarkerData(message, IMarker.SEVERITY_ERROR, start, end));
-	}
-
-	private static MarkerData createMarkerData(AnalysationIssue issue) {
-		int start = -1, end = -1, line = -1;
-		start = issue.getStart();
-		end = issue.getEnd();
-		line = issue.getLine();
-		int severity = issue.isWarningNotError() ? IMarker.SEVERITY_WARNING : IMarker.SEVERITY_ERROR;
-		return new MarkerData(issue.getMessage(), severity, start, end, line);
-	}
-
-	private static class MarkerData {
-		final String message;
-		final int severity;
-		// zero-relative global file/buffer index, or -1
-		final int start;
-		final int end;
-		final int line;
-
-		MarkerData(String message, int severity, int start, int end) {
-			this(message, severity, start, end, -1);
-		}
-
-		MarkerData(String message, int severity, int start, int end, int line) {
-			this.message = message;
-			this.severity = severity;
-			this.start = start;
-			this.end = end == -1 ? -1 : end + 1;
-			this.line = line;
-		}
-
-		void createMarker(IFile file) throws CoreException {
-			final IMarker marker = file.createMarker(getMARKER_TYPE());
-            marker.setAttribute(IMarker.MESSAGE, message);
-            marker.setAttribute(IMarker.SEVERITY, severity);
-            marker.setAttribute(IMarker.LOCATION, toLocationString());
-        	if (start != -1 && end != -1) {
-        		// Could use MarkerUtilities#setCharStart(), etc.
-        		// although MarkerUtilities takes texteditor dependency
-        		marker.setAttribute(IMarker.CHAR_START, start);
-        		marker.setAttribute(IMarker.CHAR_END, end);
-        	}
-            if (line != -1) {
-            	marker.setAttribute(IMarker.LINE_NUMBER, line);
-            }
-		}
-
-		private String toLocationString() {
-			StringBuilder sb = new StringBuilder();
-			if (line != -1) {
-				sb.append("line: ");
-				sb.append(line);
-			}
-			if (start != -1 && end != -1) {
-				boolean theOnlyData = sb.length() == 0;
-				if (!theOnlyData) {
-					sb.append(" (");
-				}
-				sb.append(start);
-				sb.append(" .. ");
-				sb.append(end);
-				if (!theOnlyData) {
-					sb.append(")");
-				}
-			}
-			return sb.toString();
-		}
-	}
-
-	private static final String getMARKER_TYPE() {
-		return Activator.getId() + ".xpandProblem";
-	}
-
-	private final static void internalAddMarker(final IFile file, final MarkerData... markerData) {
-        try {
-            file.getWorkspace().run(new IWorkspaceRunnable() {
-
-            	public void run(IProgressMonitor monitor) throws CoreException {
-					for (MarkerData d : markerData) {
-						d.createMarker(file);
-					}
-                }
-            }, file.getWorkspace().getRuleFactory().markerRule(file), 0, new NullProgressMonitor());
-        } catch (final CoreException e) {
-            Activator.log(e.getStatus());
-        }
-    }
-
-	public static void deleteMarkers(final IResource file) {
-		try {
-			if (!file.exists()) {
-				return;
-			}
-			file.getWorkspace().run(new IWorkspaceRunnable() {
-
-				public void run(final IProgressMonitor monitor) throws CoreException {
-					file.deleteMarkers(getMARKER_TYPE(), true, IResource.DEPTH_INFINITE);
-				}
-
-			}, file.getWorkspace().getRuleFactory().markerRule(file), 0, new NullProgressMonitor());
-		} catch (CoreException ce) {
-			Activator.log(ce.getStatus());
-		}
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandResourceParser.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandResourceParser.java
deleted file mode 100644
index 9899b75d613..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandResourceParser.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2005, 2020 Sven Efftinge, CEA LIST, Artal and others.
- * All rights reserved.   This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *     Sven Efftinge - Initial API and implementation
- *     Artem Tikhomirov - LPG lexer/parser and error reporting
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.io.IOException;
-import java.io.Reader;
-
-import org.eclipse.papyrus.gmf.internal.xpand.ast.Template;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandResource;
-import org.eclipse.papyrus.gmf.internal.xpand.parser.XpandLexer;
-import org.eclipse.papyrus.gmf.internal.xpand.parser.XpandParser;
-import org.eclipse.papyrus.gmf.internal.xpand.util.ParserException.ErrorLocationInfo;
-
-public class XpandResourceParser {
-
-	// XXX everything except exact lexer and parser instances are the same as n XtendResourceParser
-	public XpandResource parse(final Reader source, final String qualifiedTemplateName) throws IOException, ParserException {
-		Template tpl = null;
-		XpandParser parser = null;
-		XpandLexer scanner = null;
-		final char[] buffer = new StreamConverter().toCharArray(source);
-		if (buffer.length > 0 && buffer[0] == '\uFEFF') {
-			System.arraycopy(buffer, 1, buffer, 0, buffer.length-1);
-		}
-		try {
-			scanner = new XpandLexer(buffer, qualifiedTemplateName);
-			parser = new XpandParser(scanner);
-			scanner.lexer(parser);
-			tpl = parser.parser();
-			// FIXME handle errors if find out how to force generated parser to throw exception instead of consuming it
-		} catch (final Exception e) {
-			ErrorLocationInfo[] errors = extractErrors(scanner, parser);
-        	if (errors.length == 0) {
-        		throw new IOException("Unexpected exception while parsing:" + e.toString());
-        	} else {
-        		throw new ParserException(qualifiedTemplateName, errors);
-        	}
-		}
-		ErrorLocationInfo[] errors = extractErrors(scanner, parser);
-		if (errors.length > 0) {
-			// TODO: instead of throwing an exception all errors should be added
-			// into the parsed template and processed later. This will allow us
-			// executing partially parsed template.
-			throw new ParserException(qualifiedTemplateName, errors);	
-		}
-		if (tpl != null) {
-			// XXX two choices here - 
-			// (1) pass any name into parse method, do not assume it's fqn and move setFQN outside of this method
-			// (2) assume fqn is passed into parse() as it's now.
-			tpl.setFullyQualifiedName(qualifiedTemplateName);
-			return tpl;
-		}
-		assert false : "no reason not to get template";
-		throw new ParserException(qualifiedTemplateName, errors);
-	}
-
-	// FIXME do it in the parser itself, though keeping errors separate may help
-	// those willing to report them separately
-	private static ErrorLocationInfo[] extractErrors(XpandLexer scanner, XpandParser parser) {
-		ErrorLocationInfo[] e1 = scanner.getErrors();
-		ErrorLocationInfo[] e2 = parser.getErrors();
-		ErrorLocationInfo[] res = new ErrorLocationInfo[e1.length + e2.length];
-		System.arraycopy(e1, 0, res, 0, e1.length);
-		System.arraycopy(e2, 0, res, e1.length, e2.length);
-		return res;
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandStreamOperations.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandStreamOperations.java
deleted file mode 100644
index efc37ba183b..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/util/XpandStreamOperations.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corporation, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Boris Blajer (Borland) - initial API and implementation
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-
-package org.eclipse.papyrus.gmf.internal.xpand.util;
-
-import java.util.List;
-
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation;
-import org.eclipse.m2m.qvt.oml.blackbox.java.Operation.Kind;
-import org.eclipse.ocl.util.CollectionUtil;
-import org.eclipse.papyrus.gmf.internal.xpand.StreamsHolder;
-
-/**
- * Stream-related operations that should be accessible from within QVT environment.
- */
-public class XpandStreamOperations {
-	public StreamsHolder streamsHolder;
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public List<String> xpandGetStreamNames() {
-		List<String> result = CollectionUtil.<String> createNewSequence();
-		if (streamsHolder != null) {
-			result.addAll(streamsHolder.getSlotNames());
-		}
-		return result;
-	}
-
-	@Operation(contextual = false, kind = Kind.HELPER)
-	public String xpandGetStreamContents(String streamName) {
-		if (streamsHolder == null) {
-			return null;
-		}
-		return streamsHolder.getStreamContents(streamName);
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/GenericExtension.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/GenericExtension.java
deleted file mode 100644
index a8fb88e9a4d..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/GenericExtension.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corp, CEA LIST and Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.xtend.ast;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-
-public interface GenericExtension {
-
-	String getName();
-	
-	String getFileName();
-	
-	EClassifier getContext();
-	EOperation getOperation();
-
-	// XXX odd parameters param, as if return type may depend from them?
-	EClassifier getReturnType(final EClassifier[] parameters, ExecutionContext ctx, final Set<AnalysationIssue> issues);
-
-	List<EClassifier> getParameterTypes();
-	
-	List<String> getParameterNames();
-
-	void init(final ExecutionContext ctx);
-	
-	Object evaluate(final Object[] parameters, ExecutionContext ctx);
-
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtExtension.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtExtension.java
deleted file mode 100644
index a5f01dd0285..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtExtension.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.xtend.ast;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EParameter;
-import org.eclipse.m2m.internal.qvt.oml.expressions.Helper;
-import org.eclipse.m2m.internal.qvt.oml.runtime.util.HelperOperationCall;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-
-public class QvtExtension implements GenericExtension {
-
-	private QvtResource qvtResource;
-
-	private List<String> parameterNames;
-
-	private List<EClassifier> parameterTypes;
-
-	private String fileName;
-
-	private HelperOperationCall helperCall;
-
-	public QvtExtension(HelperOperationCall helperOperationCall, QvtFile qvtFile, String fileName) {
-		this.helperCall = helperOperationCall;
-		qvtResource = qvtFile;
-		this.fileName = fileName;
-	}
-
-	public void setQvtResource(QvtResource resource) {
-		qvtResource = resource;
-	}
-
-	public QvtResource getQvtResource() {
-		return qvtResource;
-	}
-
-	public Object evaluate(Object[] parameters, ExecutionContext ctx) {
-		try {
-			if (helperCall.isContextual()) {
-				// TODO: this is a proper way to get context variable (self) for
-				// now
-				// getting this variable from the parameters array in accordance
-				// with OperationCall.evaluateInternal() implementation
-				// Variable selfVariable =
-				// ctx.getVariable(ExecutionContext.IMPLICIT_VARIABLE);
-				assert parameters.length > 0;
-				Object self = parameters[0];
-				Object[] actualParameters = new Object[parameters.length - 1];
-				System.arraycopy(parameters, 1, actualParameters, 0, parameters.length - 1);
-				return helperCall.invoke(self, actualParameters);
-			} else {
-				return helperCall.invoke(parameters);
-			}
-		} catch (IllegalArgumentException e) {
-			throw new RuntimeException("Illigal arguments in QVT helper (" + getSignature(helperCall.getOperation()) + ") call: " + e.getMessage());
-		} catch (InvocationTargetException e) {
-			throw new RuntimeException("Invocation target exception in QVT helper (" + getSignature(helperCall.getOperation()) + ") call: " + e.getMessage());
-		}
-	}
-
-	private String getSignature(Helper operation) {
-		StringBuilder sb = new StringBuilder();
-		if (operation.getContext() != null) {
-			sb.append(operation.getContext().getEType().getName());
-			sb.append("::");
-		}
-		sb.append(operation.getName());
-		sb.append("(");
-		for (EParameter parameter : operation.getEParameters()) {
-			if (sb.lastIndexOf("(") != sb.length() - 1) {
-				sb.append(",");
-			}
-			sb.append(parameter.getName());
-			sb.append(":");
-			sb.append(parameter.getEType().getName());
-		}
-		sb.append(")");
-		sb.append(":");
-		sb.append(operation.getEType().getName());
-		return sb.toString();
-	}
-
-	public String getName() {
-		return getHelper().getName();
-	}
-
-	public List<EClassifier> getParameterTypes() {
-		if (parameterTypes == null) {
-			parameterTypes = new ArrayList<EClassifier>();
-			// TODO: we should be able to distinguish between static and
-			// context-specific queries
-			if (getHelper().getContext() != null) {
-				parameterTypes.add(getHelper().getContext().getEType());
-			}
-			for (EParameter parameter : getHelper().getEParameters()) {
-				parameterTypes.add(parameter.getEType());
-			}
-			parameterTypes = Collections.unmodifiableList(parameterTypes);
-		}
-		return parameterTypes;
-	}
-
-	public List<String> getParameterNames() {
-		if (parameterNames == null) {
-			parameterNames = new ArrayList<String>();
-			for (EParameter parameter : getHelper().getEParameters()) {
-				parameterNames.add(parameter.getName());
-			}
-			parameterNames = Collections.unmodifiableList(parameterNames);
-		}
-		return parameterNames;
-	}
-
-	// FIXME what's this method for? can't find a use...
-	public EClassifier getReturnType(EClassifier[] parameters, ExecutionContext ctx, Set<AnalysationIssue> issues) {
-		// TODO: deduce return type here? (need another visitor?)
-		return getHelper().getEType();
-	}
-
-	public void init(ExecutionContext ctx) {
-		// TODO nothing to do here? Call QVT to preparse AST?..
-	}
-
-	public String getFileName() {
-		return fileName;
-	}
-
-	private Helper getHelper() {
-		return helperCall.getOperation();
-	}
-
-	public EClassifier getContext() {
-		return helperCall.getContextType();
-	}
-
-	public EOperation getOperation() {
-		return helperCall.getOperation();
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtFile.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtFile.java
deleted file mode 100644
index 962716fd151..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtFile.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *    Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.xtend.ast;
-
-import java.util.ArrayList;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.m2m.internal.qvt.oml.QvtMessage;
-import org.eclipse.m2m.internal.qvt.oml.compiler.CompiledUnit;
-import org.eclipse.m2m.internal.qvt.oml.expressions.Helper;
-import org.eclipse.m2m.internal.qvt.oml.expressions.Module;
-import org.eclipse.m2m.internal.qvt.oml.runtime.util.NonTransformationExecutionContext;
-import org.eclipse.papyrus.gmf.internal.xpand.expression.ast.SyntaxElement;
-import org.eclipse.papyrus.gmf.internal.xpand.model.AnalysationIssue;
-import org.eclipse.papyrus.gmf.internal.xpand.model.ExecutionContext;
-
-public class QvtFile implements QvtResource {
-
-	private List<QvtExtension> extensions;
-
-	private final String fileName;
-
-	private final Set<Module> modules;
-
-	private QvtMessage[] errors = new QvtMessage[0];
-
-	/**
-	 * Can be used for creating QvtFile around modules came from BlackBox
-	 * extension point. In this case modules has no errors if they was loaded
-	 * successfully.
-	 */
-	public QvtFile(List<Module> modules, String fullyQualifiedName) {
-		this.modules = new LinkedHashSet<Module>(modules);
-		fileName = fullyQualifiedName;
-	}
-	public QvtFile(CompiledUnit cu, String fullyQualifiedName) {
-		this(cu.getModules(), fullyQualifiedName);
-		List<QvtMessage> allErrors = cu.getErrors();
-		errors = allErrors.toArray(new QvtMessage[allErrors.size()]);
-	}
-
-	public Set<Module> getModules() {
-		return modules;
-	}
-
-	public List<QvtExtension> getExtensions() {
-		if (extensions == null && errors.length == 0) {
-			extensions = new ArrayList<QvtExtension>();
-			if (getModules() != null) {
-				NonTransformationExecutionContext context = new NonTransformationExecutionContext(getModules());
-				for (Module module : getModules()) {
-					for (EOperation operation : module.getEOperations()) {
-						if (operation instanceof Helper) {
-							extensions.add(new QvtExtension(context.createHelperCall((Helper) operation), this, fileName));
-						}
-					}
-				}
-			}
-		}
-		return extensions;
-	}
-
-	public void analyze(ExecutionContext ctx, Set<AnalysationIssue> issues) {
-		if (errors.length > 0) {
-			for (int i = 0; i < errors.length; i++) {
-				QvtMessage qvtMessage = errors[i];
-				if (qvtMessage.getSeverity() == QvtMessage.SEVERITY_ERROR) {
-					issues.add(new AnalysationIssue(AnalysationIssue.Type.SYNTAX_ERROR, qvtMessage.toString(), (SyntaxElement) null));
-				}
-			}
-		}
-	}
-
-	public String[] getImportedExtensions() {
-		// no-op now, not sure it's possible to use this data
-		return new String[0];
-	}
-
-	public String[] getImportedNamespaces() {
-		// no-op now, not sure it's possible to use this data
-		return new String[0];
-	}
-}
diff --git a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtResource.java b/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtResource.java
deleted file mode 100644
index 7d807efaafd..00000000000
--- a/plugins/toolsmiths/gmf-tooling/org.eclipse.papyrus.gmf.xpand/src/org/eclipse/papyrus/gmf/internal/xpand/xtend/ast/QvtResource.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2008, 2020 Borland Software Corp, CEA LIST, Artal
- * 
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License 2.0
- * which accompanies this distribution, and is available at
- * https://www.eclipse.org/legal/epl-2.0/ 
- * 
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors: 
- *    Alexander Shatalin (Borland) - initial API and implementation
- *     Aurélien Didier (ARTAL) - aurelien.didier51@gmail.com - Bug 569174
- *******************************************************************************/
-package org.eclipse.papyrus.gmf.internal.xpand.xtend.ast;
-
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.m2m.internal.qvt.oml.common.MDAConstants;
-import org.eclipse.m2m.internal.qvt.oml.expressions.Module;
-import org.eclipse.papyrus.gmf.internal.xpand.ResourceMarker;
-import org.eclipse.papyrus.gmf.internal.xpand.model.XpandAnalyzable;
-
-public interface QvtResource extends XpandAnalyzable, ResourceMarker {
-
-	public static final String FILE_EXTENSION = MDAConstants.QVTO_FILE_EXTENSION;
-
-	/**
-	 * @return {@link QvtExtension}s declared in this {@link QvtResource} or
-	 *         null in case of loading errors
-	 */
-	List<QvtExtension> getExtensions();
-	
-	Set<Module> getModules();
-}
diff --git a/plugins/toolsmiths/gmf-tooling/pom.xml b/plugins/toolsmiths/gmf-tooling/pom.xml
index 9f675182aab..43e26d9864b 100644
--- a/plugins/toolsmiths/gmf-tooling/pom.xml
+++ b/plugins/toolsmiths/gmf-tooling/pom.xml
@@ -24,18 +24,6 @@
 
 	<modules>
 		<!-- plugins -->
-		<module>org.eclipse.papyrus.gmf.graphdef</module>
-		<module>org.eclipse.papyrus.gmf.graphdef.codegen</module>
-		<module>org.eclipse.papyrus.gmf.graphdef.codegen.ui</module>
-		<module>org.eclipse.papyrus.gmf.graphdef.edit</module>
-		<module>org.eclipse.papyrus.gmf.tooldef</module>
-		<module>org.eclipse.papyrus.gmf.tooldef.edit</module>
-		<module>org.eclipse.papyrus.gmf.map</module>
-		<module>org.eclipse.papyrus.gmf.map.edit</module>
-		<module>org.eclipse.papyrus.gmf.bridge</module>
-		<module>org.eclipse.papyrus.gmf.bridge.trace</module>
-		<module>org.eclipse.papyrus.gmf.bridge.ui</module>
-		<module>org.eclipse.papyrus.gmf.bridge.ui.dashboard</module>
 		<module>org.eclipse.papyrus.gmf.codegen</module>
 		<module>org.eclipse.papyrus.gmf.codegen.edit</module>
 		<module>org.eclipse.papyrus.gmf.codegen.ui</module>
@@ -43,9 +31,6 @@
 	    <module>org.eclipse.papyrus.gmf.codegen.xtend.ui</module>
 		<module>org.eclipse.papyrus.gmf.common</module>
 		<module>org.eclipse.papyrus.gmf.validate</module>
-		<module>org.eclipse.papyrus.gmf.xpand</module>
-		<module>org.eclipse.papyrus.gmf.xpand.qvtlibrary</module>
-
 	</modules>
 
 </project>
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
index 8c696c07212..8f859f77937 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/META-INF/MANIFEST.MF
@@ -1,13 +1,16 @@
 Manifest-Version: 1.0
 Export-Package: org.eclipse.papyrus.codegen;x-internal:=true,
  org.eclipse.papyrus.codegen.actions;x-internal:=true
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.18.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
  org.eclipse.papyrus.gmf.codegen;bundle-version="[2.11.0,3.0.0)",
+ org.eclipse.papyrus.gmf.common;bundle-version="[1.3.0,2.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.16.0,3.0.0)",
+ org.eclipse.emf.common;bundle-version="[2.16.0,3.0.0)",
  org.eclipse.papyrus.gmf.codegen.ui;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.papyrus.gmf.codegen.xtend;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.gmf.codegen.xtend.ui;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.papyrus.infra.core.log;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.ui;bundle-version="[3.117.0,4.0.0)"
+ org.eclipse.ui;bundle-version="[3.3.0,4.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.0.0.qualifier
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
index 04e8d0a3e70..c731a21981c 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusCodegenEmitters.java
@@ -11,11 +11,13 @@
  * Contributors:
  *		Thibault Landre (Atos Origin) - Initial API and implementation
  *		Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 510587: the palette must not be generated by using GMF gen
- *
+ *		Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand/qvto
  *****************************************************************************/
 package org.eclipse.papyrus.codegen;
 
-import org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers.CodegenEmittersWithXtend2;
+import java.net.URL;
+
+import org.eclipse.papyrus.gmf.codegen.util.CodegenEmittersWithXtend2;
 import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
 import org.eclipse.papyrus.gmf.internal.common.codegen.JavaClassEmitter;
 import org.eclipse.papyrus.gmf.internal.common.codegen.TextEmitter;
@@ -23,8 +25,8 @@ import org.eclipse.papyrus.gmf.internal.common.codegen.TextEmitter;
 @SuppressWarnings("restriction")
 public class PapyrusCodegenEmitters extends CodegenEmittersWithXtend2 {
 
-	public PapyrusCodegenEmitters(boolean useBaseTemplatesOnly, String templateDirectory, boolean includeDynamicModelTemplates) {
-		super(useBaseTemplatesOnly, templateDirectory, includeDynamicModelTemplates);
+	public PapyrusCodegenEmitters(boolean useBaseTemplatesOnly, String templateDirectory) {
+		super(useBaseTemplatesOnly, templateDirectory);
 	}
 
 	@Override
@@ -101,7 +103,7 @@ public class PapyrusCodegenEmitters extends CodegenEmittersWithXtend2 {
 	/**
 	 * {@inheritDoc}
 	 * Overridden to disable code generation of old palette framework.
-	 * 
+	 *
 	 * @see org.eclipse.papyrus.gmf.codegen.util.CodegenEmitters#getPaletteEmitter()
 	 */
 	@Override
@@ -113,6 +115,17 @@ public class PapyrusCodegenEmitters extends CodegenEmittersWithXtend2 {
 	 * Get the {@link TextEmitter} to generate palette configuration model for papyrus diagrams.
 	 */
 	public TextEmitter getPaletteConfigurationEmitter() {
-		return createJavaClassEmitter("aspects::xpt::editor::palette::PaletteConfiguration", "PaletteConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
+		return createJavaClassEmitter("xpt::editor::palette::PaletteConfiguration", "PaletteConfiguration"); //$NON-NLS-1$ //$NON-NLS-2$
+	}
+
+	/**
+	 * @see org.eclipse.papyrus.gmf.codegen.util.CodegenEmitters#getJMergeControlFile()
+	 *
+	 * @return
+	 */
+	@Override
+	public URL getJMergeControlFile() {
+		// TODO Auto-generated method stub
+		return null;
 	}
 }
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusExecuteTemplatesOperation.java b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusExecuteTemplatesOperation.java
index 2780ad59dce..5eb6ef3a148 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusExecuteTemplatesOperation.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusExecuteTemplatesOperation.java
@@ -11,7 +11,7 @@
  * Contributors:
  *		Thibault Landre (Atos Origin) - Initial API and implementation
  *		Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Bug 510587: the palette must not be generated by using GMF gen
- *
+ *		Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand/qvto
  *****************************************************************************/
 package org.eclipse.papyrus.codegen;
 
@@ -33,7 +33,7 @@ public class PapyrusExecuteTemplatesOperation extends ExecuteTemplatesOperation
 	@Override
 	protected Generator createGenerator() {
 		GenEditorGenerator genModel = getGenModel();
-		return (Generator) new PapyrusGenerator(genModel, new PapyrusCodegenEmitters(!genModel.isDynamicTemplates(), genModel.getTemplateDirectory(), genModel.getModelAccess() != null));
+		return new PapyrusGenerator(genModel, new PapyrusCodegenEmitters(!genModel.isDynamicTemplates(), genModel.getTemplateDirectory()));
 	}
 
 }
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusGenerator.java b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusGenerator.java
index 94547f334be..05cbcd2f220 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusGenerator.java
+++ b/plugins/toolsmiths/org.eclipse.papyrus.codegen/src/org/eclipse/papyrus/codegen/PapyrusGenerator.java
@@ -1,6 +1,6 @@
 /*****************************************************************************
  * Copyright (c) 2017 CEA LIST,ALL4TEC and others.
- * 
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -10,6 +10,7 @@
  *
  * Contributors:
  *   Mickaël ADAM (ALL4TEC) mickael.adam@all4tec.net - Initial API and implementation
+ *   Etienne Allogo (ARTAL) - etienne.allogo@artal.fr - Bug 569174 : Remove reference to xpand/qvto
  *****************************************************************************/
 
 package org.eclipse.papyrus.codegen;
@@ -20,7 +21,7 @@ import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.papyrus.gmf.codegen.gmfgen.GenEditorGenerator;
-import org.eclipse.papyrus.gmf.codegen.xtend.ui.handlers.GeneratorWithXtend2;
+import org.eclipse.papyrus.gmf.codegen.util.GeneratorWithXtend2;
 import org.eclipse.papyrus.gmf.common.UnexpectedBehaviourException;
 
 /**
@@ -61,7 +62,7 @@ public class PapyrusGenerator extends GeneratorWithXtend2 {
 
 	/**
 	 * Generate palette configuration model.
-	 * 
+	 *
 	 * @throws UnexpectedBehaviourException
 	 * @throws InterruptedException
 	 */
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
index a6cbf829bd1..30d5e5f5ab7 100644
--- a/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
+++ b/plugins/toolsmiths/org.eclipse.papyrus.dev.assistants.codegen/META-INF/MANIFEST.MF
@@ -13,8 +13,9 @@ Require-Bundle: com.google.inject;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.papyrus.uml.profile.assistants.generator;bundle-version="[5.0.0,6.0.0)",
  org.eclipse.papyrus.uml.profile.types.generator;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.uml2.uml.editor;bundle-version="[5.5.0,6.0.0)",
- org.eclipse.xtend.lib;bundle-version="[2.22.0,3.0.0)",
- org.eclipse.papyrus.gmf.codegen;bundle-version="[2.11.0,3.0.0)"
+ org.eclipse.xtend.lib;bundle-version="[2.24.0,3.0.0)",
+ org.eclipse.papyrus.gmf.codegen;bundle-version="[2.11.0,3.0.0)",
+ org.eclipse.emf.codegen.ecore;bundle-version="[2.16.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
 Bundle-Version: 2.0.100.qualifier
diff --git a/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.xml b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.xml
index 34f545d24e1..6120467ffd6 100755
--- a/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.xml
+++ b/plugins/toolsmiths/org.eclipse.papyrus.releng.dev.release/release.xml
@@ -13,9 +13,15 @@
 		<plugin name="org.eclipse.papyrus.dev.types" version="3.0.100"/>
 		<plugin name="org.eclipse.papyrus.dev.pluginexplorer" version="1.2.0"/>
 	</feature>
-	<feature name="org.eclipse.papyrus.diagramgen.feature" version="1.1.0">
+	<feature name="org.eclipse.papyrus.diagramgen.feature" version="1.2.0">
 		<feature name="org.eclipse.license" version="2.0.2" license="true"/>
-		<feature name="org.eclipse.papyrus.gmf.tooling.feature" version="3.3.0"/>
+		<plugin name="org.eclipse.papyrus.gmf.common" version="1.3.0"/>
+		<plugin name="org.eclipse.papyrus.gmf.codegen" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.gmf.codegen.edit" version="2.9.0"/>
+		<plugin name="org.eclipse.papyrus.gmf.codegen.ui" version="1.3.0"/>
+		<plugin name="org.eclipse.papyrus.gmf.validate" version="1.2.0"/>
+		<plugin name="org.eclipse.papyrus.gmf.codegen.xtend" version="1.0.0"/>
+		<plugin name="org.eclipse.papyrus.gmf.codegen.xtend.ui" version="1.0.0"/>
 		<plugin name="org.eclipse.papyrus.codegen" version="1.2.0"/>
 		<plugin name="org.eclipse.papyrus.gmfgenextension" version="2.0.0"/>
 		<plugin name="org.eclipse.papyrus.dev.assistants.codegen" version="1.2.100"/>
diff --git a/releng/toolsmiths/site/category.xml b/releng/toolsmiths/site/category.xml
index fadd69bcbf8..eef1fa9d298 100644
--- a/releng/toolsmiths/site/category.xml
+++ b/releng/toolsmiths/site/category.xml
@@ -12,10 +12,10 @@
    <feature url="features/org.eclipse.papyrus.uml.assistants.feature.source_4.0.0.qualifier.jar" id="org.eclipse.papyrus.uml.assistants.feature.source" version="4.0.0.qualifier">
       <category name="org.eclipse.papyrus.toolsmiths.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.diagramgen.feature_1.1.0.qualifier.jar" id="org.eclipse.papyrus.diagramgen.feature" version="1.1.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.diagramgen.feature_1.2.0.qualifier.jar" id="org.eclipse.papyrus.diagramgen.feature" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.toolsmiths.category"/>
    </feature>
-   <feature url="features/org.eclipse.papyrus.diagramgen.feature.source_1.1.0.qualifier.jar" id="org.eclipse.papyrus.diagramgen.feature.source" version="1.1.0.qualifier">
+   <feature url="features/org.eclipse.papyrus.diagramgen.feature.source_1.2.0.qualifier.jar" id="org.eclipse.papyrus.diagramgen.feature.source" version="1.2.0.qualifier">
       <category name="org.eclipse.papyrus.toolsmiths.category"/>
    </feature>
    <feature url="features/org.eclipse.papyrus.debug.feature_1.0.0.qualifier.jar" id="org.eclipse.papyrus.debug.feature" version="1.0.0.qualifier">